Changeset 33348 for main/trunk/greenstone3
- Timestamp:
- 2019-07-23T16:33:07+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
r33323 r33348 264 264 query += ")"; 265 265 266 if(i != iMax || j != jMax){ query += " +OR+"; } //if(i != (Math.floor(latDistance / latDelta) + 1) || j != (Math.floor(lngDistance / lngDelta) + 1)){ query += "+OR+"; }266 if(i != iMax || j != jMax){ query += " OR "; } //if(i != (Math.floor(latDistance / latDelta) + 1) || j != (Math.floor(lngDistance / lngDelta) + 1)){ query += " OR "; } 267 267 } 268 268 } … … 699 699 for(var x = 0; x < doc.shapes.length; x++) { 700 700 var shape = doc.shapes[i]; 701 if(typeof shape === 'undefined') { // happens just after map page has loaded when scrolling through markers. Why does this happen 702 console.log("shape at " + x + " not defined"); 703 continue; 704 } 701 705 if(shape.type === google.maps.drawing.OverlayType.MARKER) { 702 706 shape.markerInfo.open(_map, shape); … … 769 773 function createOverlayItems(doc, options) { 770 774 var loopCounter = 0; 771 if(doc.mapoverlay || doc. childrenMapoverlays) {775 if(doc.mapoverlay || doc.descendantsMapoverlays) { 772 776 if(doc.mapoverlay) { 773 // append any childsection's mapoverlays onto doc.mapoverlay774 if(doc. childrenMapoverlays) {775 for(loopCounter = 0; loopCounter < doc. childrenMapoverlays.length; loopCounter++) {776 //console.log("Pushing next child mapoverlay onto doc.mapoverlay: ", doc.childrenMapoverlays[loopCounter]);777 Array.prototype.push.apply(doc.mapoverlay, doc. childrenMapoverlays[loopCounter]);777 // append any descendant section's mapoverlays onto doc.mapoverlay 778 if(doc.descendantsMapoverlays) { 779 for(loopCounter = 0; loopCounter < doc.descendantsMapoverlays.length; loopCounter++) { 780 //console.log("Pushing next descendant mapoverlay onto doc.mapoverlay: ", doc.descendantsMapoverlays[loopCounter]); 781 Array.prototype.push.apply(doc.mapoverlay, doc.descendantsMapoverlays[loopCounter]); 778 782 } 779 delete doc. childrenMapoverlays; // served its purpose780 } 781 } else if (doc. childrenMapoverlays) { // no doc.mapoverlay782 // construct doc.mapoverlay to contain each childsection's mapoverlay783 delete doc.descendantsMapoverlays; // served its purpose 784 } 785 } else if (doc.descendantsMapoverlays) { // no doc.mapoverlay 786 // construct doc.mapoverlay to contain each descendant section's mapoverlay 783 787 doc.mapoverlay = []; 784 for(loopCounter = 0; loopCounter < doc. childrenMapoverlays.length; loopCounter++) {785 //console.log("Pushing next child mapoverlay onto originally empty doc.mapoverlay: ", doc.childrenMapoverlays[loopCounter]);786 Array.prototype.push.apply(doc.mapoverlay, doc. childrenMapoverlays[loopCounter]);788 for(loopCounter = 0; loopCounter < doc.descendantsMapoverlays.length; loopCounter++) { 789 //console.log("Pushing next descendant mapoverlay onto originally empty doc.mapoverlay: ", doc.descendantsMapoverlays[loopCounter]); 790 Array.prototype.push.apply(doc.mapoverlay, doc.descendantsMapoverlays[loopCounter]); 787 791 } 788 delete doc. childrenMapoverlays; // no more use for this792 delete doc.descendantsMapoverlays; // no more use for this 789 793 } 790 794 //console.log("@@@@ Have shapes: ", doc.mapoverlay); … … 1065 1069 query += "(" + getDistanceQueryStringTerm(lat, lng, latDelta, lngDelta, 2, "CS") + ")"; 1066 1070 1067 if(i != ((degrees * 2) - 1) || j != ((degrees * 2) - 1)){ query += " +OR+"; }1071 if(i != ((degrees * 2) - 1) || j != ((degrees * 2) - 1)){ query += " OR "; } 1068 1072 } 1069 1073 } … … 1294 1298 function _debugPrintBounds(bounds, message) { 1295 1299 if(!_DEBUGGING_) return; 1300 if(typeof bounds === 'undefined') { 1301 console.log("Bounds undefined"); 1302 return; 1303 } 1296 1304 var ne = bounds.getNorthEast(); 1297 1305 var sw = bounds.getSouthWest(); -
main/trunk/greenstone3/web/interfaces/default/transform/map-tools.xsl
r33317 r33348 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'] or metadataList/metadata[@name = ' children_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 = 'descendants_GPS.mapOverlay']"> 24 24 <xsl:text>{</xsl:text> 25 25 <xsl:text disable-output-escaping="yes">"nodeID":"</xsl:text> … … 57 57 </xsl:if> 58 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>59 <xsl:if test="metadataList/metadata[@name = 'descendants_GPS.mapOverlay']"> 60 <xsl:variable name="count"><xsl:value-of select="count(metadataList/metadata[@name = 'descendants_GPS.mapOverlay'])"/></xsl:variable> 61 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']">62 <xsl:text disable-output-escaping="yes">"descendantsMapoverlays":[</xsl:text> 63 <xsl:for-each select="metadataList/metadata[@name = 'descendants_GPS.mapOverlay']"> 64 64 <xsl:value-of disable-output-escaping="yes" select="current()"/> 65 65 <xsl:if test="not(position() = $count)"> … … 84 84 <gsf:metadata name="Coordinate" hidden="true"/> 85 85 <gsf:metadata name="GPS.mapOverlay" hidden="true"/> 86 <gsf:metadata name="GPS.mapOverlay" select=" children" hidden="true"/>86 <gsf:metadata name="GPS.mapOverlay" select="descendants" hidden="true"/> 87 87 <!-- these were included in version in query. don't think we need them... 88 88 <gsf:metadata name="Image" hidden="true"/> -
main/trunk/greenstone3/web/interfaces/default/transform/pages/document.xsl
r33321 r33348 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'] or metadataList/metadata[@name = ' children_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 = 'descendants_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>876 <xsl:if test="metadataList/metadata[@name = 'descendants_GPS.mapOverlay']"> 877 <xsl:variable name="count"><xsl:value-of select="count(metadataList/metadata[@name = 'descendants_GPS.mapOverlay'])"/></xsl:variable> 878 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']">879 <xsl:text disable-output-escaping="yes">"descendantsMapoverlays":[</xsl:text> 880 <xsl:for-each select="metadataList/metadata[@name = 'descendants_GPS.mapOverlay']"> 881 881 <xsl:value-of disable-output-escaping="yes" select="current()"/> 882 882 <xsl:if test="not(position() = $count)"> … … 899 899 <xsl:otherwise> 900 900 <xsl:for-each select="/page/pageResponse/document"> 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']">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 = 'descendants_GPS.mapOverlay']"> 902 902 <xsl:text>{</xsl:text> 903 903 <xsl:text disable-output-escaping="yes">"nodeID":"</xsl:text><xsl:value-of select="@selectedNode"/><xsl:text disable-output-escaping="yes">",</xsl:text> … … 929 929 </xsl:if> 930 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>931 <xsl:if test="metadataList/metadata[@name = 'descendants_GPS.mapOverlay']"> 932 <xsl:variable name="count"><xsl:value-of select="count(metadataList/metadata[@name = 'descendants_GPS.mapOverlay'])"/></xsl:variable> 933 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']">934 <xsl:text disable-output-escaping="yes">"descendantsMapoverlays":[</xsl:text> 935 <xsl:for-each select="metadataList/metadata[@name = 'descendants_GPS.mapOverlay']"> 936 936 <xsl:value-of disable-output-escaping="yes" select="current()"/> 937 937 <xsl:if test="not(position() = $count)"> … … 955 955 <gsf:metadata name="Coordinate" hidden="true"/> 956 956 <gsf:metadata name="GPS.mapOverlay" hidden="true"/> 957 <gsf:metadata name="GPS.mapOverlay" select=" children" hidden="true"/>957 <gsf:metadata name="GPS.mapOverlay" select="descendants" hidden="true"/> 958 958 </xsl:template> 959 959
Note:
See TracChangeset
for help on using the changeset viewer.