Changeset 33173 for main/trunk/greenstone3

Timestamp:

2019-06-20T22:58:30+12:00 (5 years ago)

Author:

wy59

Message:

Some cleanup

File:

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

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

@@ -367 +367 @@
         }
         
-        /*if(doc.coords) {
-            //console.log("@@@@ HERE IN doc.coords");
-            for(var x = 0; x < doc.coords.length; x++) {
-                var coord = doc.coords[x];
-                var coordInfo = getLatLngForCoord(doc.coords[x]);
-                bounds.extend(new google.maps.LatLng(coordInfo.lat, coordInfo.lng));
-            }
-        }*/
-        
-        if(doc.mapoverlay) {
-            console.log("@@@@ HERE IN doc.mapoverlay");
+        if(doc.shapes) {
+            console.log("@@@@ HERE IN doc.shapes");
             bounds = ShapesUtil.overlayBounds(doc.shapes);
         }
@@ -501 +492 @@
         clearInterval(_intervalHandle);
         _intervalHandle = null;
-         /*if(doc.coords) {
-            for(var x = 0; x < doc.coords.length; x++) {
-                var coord = doc.coords[x];
-                var coordInfo = getLatLngForCoord(doc.coords[x]);
-                _map.panTo(new google.maps.LatLng(coordInfo.lat, coordInfo.lng));
-            }
-        }*/
+         
         if(doc.shapes) {            
             var docShapesBounds = ShapesUtil.overlayBounds(doc.shapes);
@@ -571 +556 @@
     
     if(!shape.description) {
-        //console.log("@@@@ " + shape.type.toString() + " had no description/label");
+        console.log("@@@@ " + shape.type.toString() + " had no description/label");
         return;
     }
@@ -609 +594 @@
     }
     shape.markerInfo = infoWindow;
-    console.log("######## Added markerInfo object to shape");   
+    //console.log("######## Added markerInfo object to shape"); 
 }
 
 // This function will create Google Shapes/Overlays and markers out of a given doc JSONNode's doc.mapOverlay
 // (doc.mapOverlay shapes are stored as an array of JSON) and store the shapes/overlays in the doc.shapes array.
-// Note: doc.coords are just an array of all the coordinates in a doc, not indicating to which shapes they belong.
-// They're only **for searching** - for seaching which coords (hence docs) are in a map.
 // Param mainMarker: if set to true, marker is red. If false, marker is blue
 function createShapes(doc, mainMarker)