Changeset 33143

Timestamp:

2019-06-10T19:31:26+12:00 (5 years ago)

Author:

wy59

Message:

Bounds extends now works correctly for shapes so that all markers are displayed on the map. We have no way of calculating the correct zoom, though, and the zoom was never calculated before for a single marker (comments said it was randomly set to 18 back then as it looked good).

File:

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

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

@@ -330 +330 @@
                     doc.shapes[x].setVisible(false);
                 }
+                markersOnMap = doc.shapes.length;
             } else {
                 doc.marker.setVisible(false);
@@ -341 +342 @@
                     doc.shapes[x].setVisible(true);
                 }
+                markersOnMap = doc.shapes.length;
             } else {
                 doc.marker.setVisible(true);
@@ -362 +364 @@
     if(markersOnMap > 1)
     {
+        //alert("@@@@ fitting bounds, current zoom is: " + _map.getZoom());         
     _map.fitBounds(bounds);
     } else if (markersOnMap == 1) {
@@ -535 +538 @@
     if(shape.type === google.maps.drawing.OverlayType.MARKER) {
         var marker = shape;
-        //marker.addListener('mouseover', function() {
+        marker.addListener('mouseover', function() {
           infoWindow.open(_map, marker);
-        //});
+        });
+        marker.addListener('mouseout', function() {
+            infoWindow.close();
+        });
         attachClickHandler(marker, doc.nodeID); // do what the original code used to do here
     }