Changeset 33169 for main

Timestamp:

2019-06-20T18:40:03+12:00 (5 years ago)

Author:

wy59

Message:

Introducing ShapesUtil.numberOfCoordinatesInBounds() that is used to work out when there's multiple coords and when there's only one (single marker) for a document. In the latter case, it should zoom into the map the single marker in the centre.

Location:

main/trunk/greenstone3/web/interfaces/default/js

Files:

• map-scripts-shapes-util.js (modified) (1 diff)
• map-scripts.js (modified) (3 diffs)

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

@@ -534 +534 @@
 }
 
+
+ShapesUtil.numberOfCoordinatesInBounds = function (shape) {
+    if (shape.type === google.maps.drawing.OverlayType.MARKER){
+        return 1;
+    } else if (shape.type === google.maps.drawing.OverlayType.RECTANGLE) {
+        return 4;
+    } else if (shape.type === google.maps.drawing.OverlayType.CIRCLE) {     
+        return 4; // circles have a rectangular/square bounding box, so 4 coordinates to a circle's bounding box
+    } else if (shape.type === google.maps.drawing.OverlayType.POLYLINE || shape.type === google.maps.drawing.OverlayType.POLYGON) {
+        var path = shape.getPath();
+        return path.length;
+    }
+    
+    console.log("Unrecognised shape, can't calculate the number of coordinates in its bounds");
+    return -1;
+}
+
 ShapesUtil.overlayBounds = function (overlays) {
     

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

@@ -347 +347 @@
                     doc.shapes[x].setVisible(false);
                 }
-                //markersOnMap += doc.shapes.length;
             } else {
                 doc.marker.setVisible(false);
@@ -359 +358 @@
                 for(var x = 0; x < doc.shapes.length; x++) {                    
                     doc.shapes[x].setVisible(true);
-                }
-                markersOnMap += doc.shapes.length;
-                //alert("HERE I AM " + markersOnMap);
-                
+                    markersOnMap += ShapesUtil.numberOfCoordinatesInBounds(doc.shapes[x]);
+                }               
             } else {
                 doc.marker.setVisible(true);
@@ -381 +378 @@
         if(doc.mapoverlay) {
             console.log("@@@@ HERE IN doc.mapoverlay");
-            var overlay_bounds = ShapesUtil.overlayBounds(doc.shapes);
-            bounds.extend(overlay_bounds.getNorthEast());
-            bounds.extend(overlay_bounds.getSouthWest());
+            bounds = ShapesUtil.overlayBounds(doc.shapes);
         }
         else {