Changeset 33126 for main/trunk/greenstone3/web/interfaces/default/js/map-scripts.js

Timestamp:

2019-05-31T21:35:03+12:00 (5 years ago)

Author:

wy59

Message:

Incremental changes following previous commit. This time the code is more backwards compatible with older collections that contain only Latitude and Longitude meta. In such cases, we now ADDITIONALLY add Coordinate (and Coordshort) meta, while still also outputting Lat and Lng meta. The JS and XSL code however now prefers to work with Coordinate meta where present.

File:

• main/trunk/greenstone3/web/interfaces/default/js/map-scripts.js (modified) (4 diffs)

main/trunk/greenstone3/web/interfaces/default/js/map-scripts.js

@@ -25 +25 @@
     {
         console.log("@@@ JSON node div html: " + jsonNodeDiv.html());
-        
         var jsonNodes = eval(jsonNodeDiv.html());
+        
         if(jsonNodes && jsonNodes.length > 0)
         {
@@ -337 +337 @@
         }
 
-        if(!doc.lat) {
+        if(doc.coord) {
             var coordInfo = getLatLngForCoord(doc.coord);
             bounds.extend(new google.maps.LatLng(coordInfo.lat, coordInfo.lng));
@@ -463 +463 @@
         clearInterval(_intervalHandle);
         _intervalHandle = null;
-        if(!doc.lat) {
+        if(doc.coord) {
             var coordInfo = getLatLngForCoord(doc.coord);
             _map.panTo(new google.maps.LatLng(coordInfo.lat, coordInfo.lng));
@@ -491 +491 @@
 {
     var pos;
-    if(doc.lat) {
+    if(doc.coord) {
+        var coordInfo = getLatLngForCoord(doc.coord);           
+        pos = new google.maps.LatLng(coordInfo.lat,coordInfo.lng);      
+    } else {
         pos = new google.maps.LatLng(doc.lat,doc.lng);
-    } else {
-        var coordInfo = getLatLngForCoord(doc.coord);           
-        pos = new google.maps.LatLng(coordInfo.lat,coordInfo.lng);
     }