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

Timestamp:

2019-06-20T17:13:50+12:00 (5 years ago)

Author:

wy59

Message:

Dr Bainbridge's map fixes to do with 1. extending bounds (updateMap) and 2. logging in works again when there's no gps map overlay meta by changing initialiseMapScripts and setupMap (renamed to renderMap now) and 3. performDistanceSearch and helper methods, which now work with Coordinate format instead of Lat/Lng format

File:

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

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

@@ +1 @@
+
+// https://stackoverflow.com/questions/3284808/getting-the-bounds-of-a-polyline-in-google-maps-api-v3
+
+google.maps.Polyline.prototype.getBounds = function() {
+    var bounds = new google.maps.LatLngBounds();
+    this.getPath().forEach(function(item, index) {
+        bounds.extend(new google.maps.LatLng(item.lat(), item.lng()));
+    });
+    return bounds;
+};
+
+google.maps.Polygon.prototype.getBounds = function() {
+    var bounds = new google.maps.LatLngBounds();
+    this.getPath().forEach(function(item, index) {
+        bounds.extend(new google.maps.LatLng(item.lat(), item.lng()));
+    });
+    return bounds;
+};
 
 
@@ -516 +534 @@
 }
 
-
+ShapesUtil.overlayBounds = function (overlays) {
+    
+    
+    var extended_bounds = new google.maps.LatLngBounds();
+    
+    for (var i=0; i<overlays.length; i++) {
+        
+        var overlay_item = overlays[i];
+        
+        if (ShapesUtil.overlayItemIsShape(overlay_item)) {
+            var shape = overlay_item;
+
+            var bounds = shape.getBounds();
+            var ne = bounds.getNorthEast();
+            var sw = bounds.getSouthWest();
+            extended_bounds.extend(ne);
+            extended_bounds.extend(sw);                 
+        }
+        else {
+            var marker = overlay_item;
+            var latlng = marker.getPosition();
+            extended_bounds.extend(latlng);
+        }
+    }
+    
+    return extended_bounds;
+    
+}
+