- Timestamp:
- 2019-07-09T21:42:14+12:00 (5 years ago)
- Location:
- main/trunk/greenstone3/web/interfaces/default
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/web/interfaces/default/js/map-scripts.js
r33303 r33317 357 357 function toggleMapSection(options) 358 358 { 359 360 359 var sectionID = options["nodeID"]; 361 360 362 361 var titleClassifierEl = document.getElementById("title"+sectionID); 363 362 var jsonNodesStr = titleClassifierEl.getAttribute("data-gps-map-json"); 363 //alert("@@@@ got jsonNodesStr |" + jsonNodesStr + "|"); 364 364 var jsonNodes = JSON.parse(jsonNodesStr); 365 365 … … 703 703 704 704 function createOverlayItems(doc, options) { 705 if(doc.mapoverlay) { 706 //console.log("Have shapes: " + doc.mapoverlay.toString()); 705 var loopCounter = 0; 706 if(doc.mapoverlay || doc.childrenMapoverlays) { 707 if(doc.mapoverlay) { 708 // append any child section's mapoverlays onto doc.mapoverlay 709 if(doc.childrenMapoverlays) { 710 for(loopCounter = 0; loopCounter < doc.childrenMapoverlays.length; loopCounter++) { 711 //console.log("Pushing next child mapoverlay onto doc.mapoverlay: ", doc.childrenMapoverlays[loopCounter]); 712 Array.prototype.push.apply(doc.mapoverlay, doc.childrenMapoverlays[loopCounter]); 713 } 714 delete doc.childrenMapoverlays; // served its purpose 715 } 716 } else if (doc.childrenMapoverlays) { // no doc.mapoverlay 717 // construct doc.mapoverlay to contain each child section's mapoverlay 718 doc.mapoverlay = []; 719 for(loopCounter = 0; loopCounter < doc.childrenMapoverlays.length; loopCounter++) { 720 //console.log("Pushing next child mapoverlay onto originally empty doc.mapoverlay: ", doc.childrenMapoverlays[loopCounter]); 721 Array.prototype.push.apply(doc.mapoverlay, doc.childrenMapoverlays[loopCounter]); 722 } 723 delete doc.childrenMapoverlays; // no more use for this 724 } 725 //console.log("@@@@ Have shapes: ", doc.mapoverlay); 707 726 createShapes(doc, options); 708 727 } else { // backwards compatible to deal with Lat and Lng meta stored for doc -
main/trunk/greenstone3/web/interfaces/default/transform/map-tools.xsl
r33216 r33317 21 21 <xsl:text>[</xsl:text> 22 22 <xsl:for-each select="//documentNode"> 23 <xsl:if test="(metadataList/metadata[@name = 'Latitude'] and metadataList/metadata[@name = 'Longitude']) or metadataList/metadata[@name = 'Coordinate'] or metadataList/metadata[@name = 'GPS.mapOverlay'] ">23 <xsl:if test="(metadataList/metadata[@name = 'Latitude'] and metadataList/metadata[@name = 'Longitude']) or metadataList/metadata[@name = 'Coordinate'] or metadataList/metadata[@name = 'GPS.mapOverlay'] or metadataList/metadata[@name = 'children_GPS.mapOverlay']"> 24 24 <xsl:text>{</xsl:text> 25 25 <xsl:text disable-output-escaping="yes">"nodeID":"</xsl:text> … … 56 56 <xsl:value-of disable-output-escaping="yes" select="metadataList/metadata[@name = 'GPS.mapOverlay']"/> 57 57 </xsl:if> 58 59 <xsl:if test="metadataList/metadata[@name = 'children_GPS.mapOverlay']"> 60 <xsl:variable name="count"><xsl:value-of select="count(metadataList/metadata[@name = 'children_GPS.mapOverlay'])"/></xsl:variable> 61 <xsl:text disable-output-escaping="yes">,</xsl:text> 62 <xsl:text disable-output-escaping="yes">"childrenMapoverlays":[</xsl:text> 63 <xsl:for-each select="metadataList/metadata[@name = 'children_GPS.mapOverlay']"> 64 <xsl:value-of disable-output-escaping="yes" select="current()"/> 65 <xsl:if test="not(position() = $count)"> 66 <xsl:text disable-output-escaping="yes">,</xsl:text> 67 </xsl:if> 68 </xsl:for-each> 69 <xsl:text disable-output-escaping="yes">]</xsl:text> 70 </xsl:if> 58 71 59 72 <xsl:text>}</xsl:text> … … 71 84 <gsf:metadata name="Coordinate" hidden="true"/> 72 85 <gsf:metadata name="GPS.mapOverlay" hidden="true"/> 86 <gsf:metadata name="GPS.mapOverlay" select="children" hidden="true"/> 73 87 <!-- these were included in version in query. don't think we need them... 74 88 <gsf:metadata name="Image" hidden="true"/> -
main/trunk/greenstone3/web/interfaces/default/transform/pages/document.xsl
r33172 r33317 844 844 <xsl:when test="count(//documentNode) > 0"> 845 845 <xsl:for-each select="//documentNode"> 846 <xsl:if test="(metadataList/metadata[@name = 'Latitude'] and metadataList/metadata[@name = 'Longitude']) or metadataList/metadata[@name = 'Coordinate'] or metadataList/metadata[@name = 'GPS.mapOverlay'] ">846 <xsl:if test="(metadataList/metadata[@name = 'Latitude'] and metadataList/metadata[@name = 'Longitude']) or metadataList/metadata[@name = 'Coordinate'] or metadataList/metadata[@name = 'GPS.mapOverlay'] or metadataList/metadata[@name = 'children_GPS.mapOverlay']"> 847 847 <xsl:text>{</xsl:text> 848 848 <xsl:text disable-output-escaping="yes">"nodeID":"</xsl:text><xsl:value-of select="@nodeID"/><xsl:text disable-output-escaping="yes">",</xsl:text> … … 874 874 </xsl:if> 875 875 876 <xsl:if test="metadataList/metadata[@name = 'children_GPS.mapOverlay']"> 877 <xsl:variable name="count"><xsl:value-of select="count(metadataList/metadata[@name = 'children_GPS.mapOverlay'])"/></xsl:variable> 878 <xsl:text disable-output-escaping="yes">,</xsl:text> 879 <xsl:text disable-output-escaping="yes">"childrenMapoverlays":[</xsl:text> 880 <xsl:for-each select="metadataList/metadata[@name = 'children_GPS.mapOverlay']"> 881 <xsl:value-of disable-output-escaping="yes" select="current()"/> 882 <xsl:if test="not(position() = $count)"> 883 <xsl:text disable-output-escaping="yes">,</xsl:text> 884 </xsl:if> 885 </xsl:for-each> 886 <xsl:text disable-output-escaping="yes">]</xsl:text> 887 </xsl:if> 888 876 889 <xsl:text>}</xsl:text> 877 890 … … 886 899 <xsl:otherwise> 887 900 <xsl:for-each select="/page/pageResponse/document"> 888 <xsl:if test="(metadataList/metadata[@name = 'Latitude'] and metadataList/metadata[@name = 'Longitude']) or metadataList/metadata[@name = 'Coordinate'] or metadataList/metadata[@name = 'GPS.mapOverlay'] ">901 <xsl:if test="(metadataList/metadata[@name = 'Latitude'] and metadataList/metadata[@name = 'Longitude']) or metadataList/metadata[@name = 'Coordinate'] or metadataList/metadata[@name = 'GPS.mapOverlay'] or metadataList/metadata[@name = 'children_GPS.mapOverlay']"> 889 902 <xsl:text>{</xsl:text> 890 903 <xsl:text disable-output-escaping="yes">"nodeID":"</xsl:text><xsl:value-of select="@selectedNode"/><xsl:text disable-output-escaping="yes">",</xsl:text> … … 916 929 </xsl:if> 917 930 931 <xsl:if test="metadataList/metadata[@name = 'children_GPS.mapOverlay']"> 932 <xsl:variable name="count"><xsl:value-of select="count(metadataList/metadata[@name = 'children_GPS.mapOverlay'])"/></xsl:variable> 933 <xsl:text disable-output-escaping="yes">,</xsl:text> 934 <xsl:text disable-output-escaping="yes">"childrenMapoverlays":[</xsl:text> 935 <xsl:for-each select="metadataList/metadata[@name = 'children_GPS.mapOverlay']"> 936 <xsl:value-of disable-output-escaping="yes" select="current()"/> 937 <xsl:if test="not(position() = $count)"> 938 <xsl:text disable-output-escaping="yes">,</xsl:text> 939 </xsl:if> 940 </xsl:for-each> 941 <xsl:text disable-output-escaping="yes">]</xsl:text> 942 </xsl:if> 943 918 944 <xsl:text>}</xsl:text> 919 945 </xsl:if> … … 928 954 search|browse|doc display view has mapEnabled=true --> 929 955 <gsf:metadata name="Coordinate" hidden="true"/> 930 <gsf:metadata name="GPS.mapOverlay" hidden="true"/> 956 <gsf:metadata name="GPS.mapOverlay" hidden="true"/> 957 <gsf:metadata name="GPS.mapOverlay" select="true" hidden="true"/> 931 958 </xsl:template> 932 959
Note:
See TracChangeset
for help on using the changeset viewer.