Ignore:
Timestamp:
2019-06-11T20:20:04+12:00 (5 years ago)
Author:
wy59
Message:
  1. Untested changes to Panorama viewer related xsl and js files to incorporate Coordinate meta wherever Latitude and Longitude meta was referred to. There's no way to test as we have no existing or tutorial collection making use of the Panorama Viewer to hand, however, a lot of the code added to deal with Coordinates is identical to other Coordinate insertions where Lat Long was used in classifier.xsl, document.xsl and map-tools.xsl and map-scripts.js. 2. Added new and removed finished TODOs.
File:
1 edited

Legend:

Unmodified
Added
Removed

  • main/trunk/greenstone3/web/interfaces/default/transform/panorama-viewer-tools.xsl

    r31550 r33148  
    1212      <xsl:text>[</xsl:text>
    1313      <xsl:for-each select="//documentNode">
    14     <xsl:if test="metadataList/metadata[@name = 'Latitude'] and metadataList/metadata[@name = 'Longitude'] and metadataList/metadata[@name = 'PhotoType']='Panorama'">
     14    <xsl:if test="metadataList/metadata[@name = 'PhotoType']='Panorama' and (metadataList/metadata[@name = 'Coordinate'] or (metadataList/metadata[@name = 'Latitude'] and metadataList/metadata[@name = 'Longitude']))">
    1515      <xsl:text>{</xsl:text>
    1616      <xsl:text disable-output-escaping="yes">"nodeID":"</xsl:text><xsl:value-of select="@nodeID"/><xsl:text disable-output-escaping="yes">",</xsl:text>
    17       <xsl:text disable-output-escaping="yes">"source":"</xsl:text><xsl:value-of disable-output-escaping="yes" select="metadataList/metadata[@name = 'Source']"/>"<xsl:text>,</xsl:text>
    18       <xsl:text disable-output-escaping="yes">"lat":</xsl:text><xsl:value-of disable-output-escaping="yes" select="metadataList/metadata[@name = 'Latitude']"/><xsl:text>,</xsl:text>
    19       <xsl:text disable-output-escaping="yes">"lng":</xsl:text><xsl:value-of disable-output-escaping="yes" select="metadataList/metadata[@name = 'Longitude']"/>
     17      <xsl:text disable-output-escaping="yes">"source":"</xsl:text><xsl:value-of disable-output-escaping="yes" select="metadataList/metadata[@name = 'Source']"/>"
     18      <xsl:if test="metadataList/metadata[@name = 'Latitude'] and metadataList/metadata[@name = 'Longitude']">
     19        <xsl:text disable-output-escaping="yes">,</xsl:text>
     20        <xsl:text disable-output-escaping="yes">"lat":</xsl:text><xsl:value-of disable-output-escaping="yes" select="metadataList/metadata[@name = 'Latitude']"/><xsl:text>,</xsl:text>
     21        <xsl:text disable-output-escaping="yes">"lng":</xsl:text><xsl:value-of disable-output-escaping="yes" select="metadataList/metadata[@name = 'Longitude']"/>
     22      </xsl:if>
     23      <xsl:if test="metadataList/metadata[@name = 'Coordinate']">
     24        <xsl:text disable-output-escaping="yes">,</xsl:text>
     25        <xsl:text disable-output-escaping="yes">"coords":</xsl:text>
     26        <xsl:text>[</xsl:text>
     27        <xsl:for-each select="metadataList/metadata[@name = 'Coordinate']">
     28            <xsl:text disable-output-escaping="yes">"</xsl:text>
     29            <xsl:value-of disable-output-escaping="yes" select="current()"/>
     30            <xsl:text disable-output-escaping="yes">"</xsl:text>           
     31            <xsl:text disable-output-escaping="yes">,</xsl:text>
     32        </xsl:for-each>
     33        <xsl:text>]</xsl:text>
     34      </xsl:if>
    2035      <xsl:text>}</xsl:text>
    2136      <xsl:if test="not(position() = count(//documentNode))">
    … …  
    2944    <gsf:metadata name="Latitude" hidden="true"/>
    3045    <gsf:metadata name="Longitude" hidden="true"/>
     46    <gsf:metadata name="Coordinate" hidden="true"/>
    3147    <gsf:metadata name="Image" hidden="true"/>
    3248    <gsf:metadata name="SourceFile" hidden="true"/>
Note: See TracChangeset for help on using the changeset viewer.