Changeset 33125 for main/trunk/greenstone3/web/interfaces/default/transform/map-tools.xsl

Timestamp:

2019-05-31T20:02:40+12:00 (5 years ago)

Author:

wy59

Message:

First commit to do with adding support for the Coordinate metadata newly introduced. It doesn't yet replace Latitude and Longitude meta, but coexists with that. For docs that only contain lat and lng meta, the code will still behave as before. For docs that contain the new coord meta, the changes in this commit will be able to display markers on the map based on this. Updates include: doc.pm perl code now stores Coordinate and Coordshort meta when it encounters GPS.mapOverlay metadata created by the doc editor. Update to JS code: update to the rawquery search performed to get all docs whose coord info occur within the bounds of the displayed map, and updates to all the js and xsl code that used to only work with lat and lng before now ADDITIONALLY work with coord meta.

File:

• main/trunk/greenstone3/web/interfaces/default/transform/map-tools.xsl (modified) (4 diffs)

main/trunk/greenstone3/web/interfaces/default/transform/map-tools.xsl

@@ -12 +12 @@
     <td style="padding-left:5px; padding-right:5px;" valign="top">
       <a href="javascript:focusDocument('{@nodeID}');">
-    <img src="interfaces/default/images/map_marker.png"/>
+    <img src="interfaces/{$interface_name}/images/map_marker.png"/>
       </a>
     </td>
@@ -21 +21 @@
       <xsl:text>[</xsl:text>
       <xsl:for-each select="//documentNode">
-    <xsl:if test="metadataList/metadata[@name = 'Latitude'] and metadataList/metadata[@name = 'Longitude']">
+    <xsl:if test="(metadataList/metadata[@name = 'Latitude'] and metadataList/metadata[@name = 'Longitude']) or metadataList/metadata[@name = 'Coordinate']">
       <xsl:text>{</xsl:text>
       <xsl:text disable-output-escaping="yes">"nodeID":"</xsl:text>
@@ -29 +29 @@
       <xsl:value-of disable-output-escaping="yes" select="metadataList/metadata[@name = 'Title']"/>
       <xsl:text disable-output-escaping="yes">",</xsl:text>
-      <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>
-      <xsl:text disable-output-escaping="yes">"lng":</xsl:text>
-      <xsl:value-of disable-output-escaping="yes" select="metadataList/metadata[@name = 'Longitude']"/>
+      <xsl:if test="metadataList/metadata[@name = 'Latitude'] and metadataList/metadata[@name = 'Longitude']">
+          <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>
+          <xsl:text disable-output-escaping="yes">"lng":</xsl:text>
+          <xsl:value-of disable-output-escaping="yes" select="metadataList/metadata[@name = 'Longitude']"/>
+      </xsl:if>
+      <xsl:if test="metadataList/metadata[@name = 'Coordinate']">
+        <xsl:text disable-output-escaping="yes">"coord":"</xsl:text>        
+        <xsl:value-of disable-output-escaping="yes" select="metadataList/metadata[@name = 'Coordinate']"/>
+        <xsl:text disable-output-escaping="yes">"</xsl:text>
+      </xsl:if>
       <xsl:text>}</xsl:text>
       <xsl:if test="not(position() = count(//documentNode))">
@@ -46 +53 @@
     <gsf:metadata name="Latitude" hidden="true"/>
     <gsf:metadata name="Longitude" hidden="true"/>
+    <gsf:metadata name="Coordinate" hidden="true"/>
+    <gsf:metadata name="GPS.mapOverlay" hidden="true"/>
 <!--  these were included in version in query. don't think we need them...
     <gsf:metadata name="Image" hidden="true"/>