Changeset 33126
- Timestamp:
- 2019-05-31T21:35:03+12:00 (5 years ago)
- Location:
- main/trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/perllib/doc.pm
r33125 r33126 1136 1136 my $metaMap = $self->get_metadata_hashmap($section); ### TODO: metaMap not used. Unnecesssary step? (Called function has no side-effects.) 1137 1137 } 1138 1139 if($field =~ m/^(.+\.)?Longitude$/) { 1140 # if we are dealing with Longitude meta, we should 1. have Latitude meta; 2. already have processed Latitude meta 1141 # in that case, add both Lat and Lng of this section as a Coordinate meta 1142 my $latitude = $self->get_metadata_element ($section, "Latitude"); 1143 # TODO: would like all Longitude info together followed by all Coordinate info, but the following will add all coord info meta and end of this function will add Longitude meta 1144 $self->processCoordinate($section_ptr, $latitude, $value); # value is Longitude 1145 } 1138 1146 } 1139 1147 … … 1206 1214 print STDERR "cos $centre_lat is $cos_lat\n"; 1207 1215 1208 $self->processCoordinate($section_ptr, $lat_north, $lng_east); 1216 $self->processCoordinate($section_ptr, $lat_north, $lng_east); 1209 1217 $self->processCoordinate($section_ptr, $lat_south, $lng_east); 1210 1218 $self->processCoordinate($section_ptr, $lat_south, $lng_west); -
main/trunk/greenstone3/web/interfaces/default/js/map-scripts.js
r33125 r33126 25 25 { 26 26 console.log("@@@ JSON node div html: " + jsonNodeDiv.html()); 27 28 27 var jsonNodes = eval(jsonNodeDiv.html()); 28 29 29 if(jsonNodes && jsonNodes.length > 0) 30 30 { … … 337 337 } 338 338 339 if( !doc.lat) {339 if(doc.coord) { 340 340 var coordInfo = getLatLngForCoord(doc.coord); 341 341 bounds.extend(new google.maps.LatLng(coordInfo.lat, coordInfo.lng)); … … 463 463 clearInterval(_intervalHandle); 464 464 _intervalHandle = null; 465 if( !doc.lat) {465 if(doc.coord) { 466 466 var coordInfo = getLatLngForCoord(doc.coord); 467 467 _map.panTo(new google.maps.LatLng(coordInfo.lat, coordInfo.lng)); … … 491 491 { 492 492 var pos; 493 if(doc.lat) { 493 if(doc.coord) { 494 var coordInfo = getLatLngForCoord(doc.coord); 495 pos = new google.maps.LatLng(coordInfo.lat,coordInfo.lng); 496 } else { 494 497 pos = new google.maps.LatLng(doc.lat,doc.lng); 495 } else {496 var coordInfo = getLatLngForCoord(doc.coord);497 pos = new google.maps.LatLng(coordInfo.lat,coordInfo.lng);498 498 } 499 499 -
main/trunk/greenstone3/web/interfaces/default/transform/map-tools.xsl
r33125 r33126 28 28 <xsl:text disable-output-escaping="yes">"title":"</xsl:text> 29 29 <xsl:value-of disable-output-escaping="yes" select="metadataList/metadata[@name = 'Title']"/> 30 <xsl:text disable-output-escaping="yes">" ,</xsl:text>30 <xsl:text disable-output-escaping="yes">"</xsl:text> 31 31 <xsl:if test="metadataList/metadata[@name = 'Latitude'] and metadataList/metadata[@name = 'Longitude']"> 32 <xsl:text disable-output-escaping="yes">,</xsl:text> 32 33 <xsl:text disable-output-escaping="yes">"lat":</xsl:text> 33 34 <xsl:value-of disable-output-escaping="yes" select="metadataList/metadata[@name = 'Latitude']"/> … … 37 38 </xsl:if> 38 39 <xsl:if test="metadataList/metadata[@name = 'Coordinate']"> 40 <xsl:text disable-output-escaping="yes">,</xsl:text> 39 41 <xsl:text disable-output-escaping="yes">"coord":"</xsl:text> 40 42 <xsl:value-of disable-output-escaping="yes" select="metadataList/metadata[@name = 'Coordinate']"/> -
main/trunk/greenstone3/web/interfaces/default/transform/pages/document.xsl
r33125 r33126 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> 849 <xsl:text disable-output-escaping="yes">"title":"</xsl:text><xsl:value-of disable-output-escaping="yes" select="metadataList/metadata[@name = 'Title']"/><xsl:text disable-output-escaping="yes">",</xsl:text> 849 <xsl:text disable-output-escaping="yes">"title":"</xsl:text><xsl:value-of disable-output-escaping="yes" select="metadataList/metadata[@name = 'Title']"/> 850 <xsl:text disable-output-escaping="yes">"</xsl:text> 850 851 <xsl:if test="metadataList/metadata[@name = 'Latitude'] and metadataList/metadata[@name = 'Longitude']"> 852 <xsl:text disable-output-escaping="yes">,</xsl:text> 851 853 <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> 852 854 <xsl:text disable-output-escaping="yes">"lng":</xsl:text><xsl:value-of disable-output-escaping="yes" select="metadataList/metadata[@name = 'Longitude']"/> 853 855 </xsl:if> 854 856 <xsl:if test="metadataList/metadata[@name = 'Coordinate']"> 857 <xsl:text disable-output-escaping="yes">,</xsl:text> 855 858 <xsl:text disable-output-escaping="yes">"coord":"</xsl:text><xsl:value-of disable-output-escaping="yes" select="metadataList/metadata[@name = 'Coordinate']"/> 856 859 <xsl:text disable-output-escaping="yes">"</xsl:text> … … 869 872 <xsl:text>{</xsl:text> 870 873 <xsl:text disable-output-escaping="yes">"nodeID":"</xsl:text><xsl:value-of select="@selectedNode"/><xsl:text disable-output-escaping="yes">",</xsl:text> 871 <xsl:text disable-output-escaping="yes">"title":"</xsl:text><xsl:value-of disable-output-escaping="yes" select="metadataList/metadata[@name = 'Title']"/><xsl:text disable-output-escaping="yes">",</xsl:text> 874 <xsl:text disable-output-escaping="yes">"title":"</xsl:text><xsl:value-of disable-output-escaping="yes" select="metadataList/metadata[@name = 'Title']"/> 875 <xsl:text disable-output-escaping="yes">"</xsl:text> 872 876 <xsl:if test="metadataList/metadata[@name = 'Latitude'] and metadataList/metadata[@name = 'Longitude']"> 877 <xsl:text disable-output-escaping="yes">,</xsl:text> 873 878 <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> 874 879 <xsl:text disable-output-escaping="yes">"lng":</xsl:text><xsl:value-of disable-output-escaping="yes" select="metadataList/metadata[@name = 'Longitude']"/> 875 880 </xsl:if> 876 881 <xsl:if test="metadataList/metadata[@name = 'Coordinate']"> 882 <xsl:text disable-output-escaping="yes">,</xsl:text> 877 883 <xsl:text disable-output-escaping="yes">"coord":"</xsl:text><xsl:value-of disable-output-escaping="yes" select="metadataList/metadata[@name = 'Coordinate']"/> 878 884 <xsl:text disable-output-escaping="yes">"</xsl:text>
Note:
See TracChangeset
for help on using the changeset viewer.