Changeset 32607 for main/trunk/greenstone3/web/interfaces/default

Timestamp:

2018-11-16T13:21:39+13:00 (5 years ago)

Author:

kjdon

Message:

fixed a bug where the paris photos in gps tutorial wouldn't show up in document view. I think its something to do with the size of the bounds that we are trying to fit the map to. using a single point as bounds. works for hamilton gardens locations, but not paris. to do with availability of photos?? not sure. anyway, if we only have a single point on the map, center on that point and set zoom rather than fit bounds to that point. also tidied up a bit of code - can use bounds.extend with lat/long rather than trying to calculate sw/ne ourselves.

File:

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

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

@@ -82 +82 @@
 {
     var myOptions = 
-    {
+        {
         zoom: 2,
         center: new google.maps.LatLng(0, 0),
@@ -110 +110 @@
     var lngDistance = neLng - swLng;
     
-    console.log("neLat = " + neLat + " neLng = " + neLng + " swLat = " + swLat + " swLng = " + swLng + " latDistance = " + latDistance + " lngDistance = " + lngDistance);
-    
     //Check which increment to use for latitude (i.e. 0.001, 0.01, 0.1 or 1 degree increments)
     var latDelta;
@@ -136 +134 @@
         }
     }
-    
-    if(latDelta == 0.1){latDelta = 1; latPrecision = 0;}
-    if(lngDelta == 0.1){lngDelta = 1; lngPrecision = 0;}
+
+    if(latDelta == 0.1){latDelta = 1; latPrecision = 0; }
+    if(lngDelta == 0.1){lngDelta = 1; lngPrecision = 0; }
     
     var query = "";
@@ -182 +180 @@
     var url = gs.xsltParams.library_name;
     var data = "a=q&s=RawQuery&rt=rd&c=" + gs.cgiParams.c + "&s1.rawquery=" + query + "&excerptid=jsonNodes";
-    
     $.ajax({type:"POST", url:url, data:data})
     .success(function(responseText)
@@ -258 +255 @@
 function updateMap()
 {
-    var north = -180;
-    var east = -180;
-    var south = 180;
-    var west = 180;
-
-    var markersOnMap = 0;
+    var markersOnMap = 0;
+    var bounds =  new google.maps.LatLngBounds();
     for(var i = 0; i < _docList.ids.length; i++)
     {
         var doc = _docList.getDocByIndex(i);
-
         if(doc.parentCL && doc.parentCL.style.display == "none")
         {
@@ -278 +270 @@
             markersOnMap++;
         }
-        
-        if(doc.lat > north)
-        {
-            north = doc.lat;
-        }
-        if(doc.lat < south)
-        {
-            south = doc.lat;
-        }
-        if(doc.lng > east)
-        {
-            east = doc.lng;
-        }
-        if(doc.lng < west)
-        {
-            west = doc.lng;
-        }
-    }
-    
-    //As there is always 2 possible bounding boxes we want the smaller of the two
-    if(east - west > 180)
-    {
-        var temp = east;
-        east = west;
-        west = temp;
-    }
-    
-    var bounds;
-    if(markersOnMap > 0)
-    {
-        bounds = new google.maps.LatLngBounds(new google.maps.LatLng(south, west), new google.maps.LatLng(north, east));
-        _map.fitBounds(bounds);
-    }
+
+            bounds.extend(new google.maps.LatLng(doc.lat, doc.lng));
+    }
+    
+    if(markersOnMap > 1)
+    {
+    _map.fitBounds(bounds);
+    } else if (markersOnMap == 1) {
+    // sometimes a single point bounds are too small for the map to display, so use center and zoom instead of fitbounds.
+    _map.setCenter(bounds.getCenter());
+    _map.setZoom(18); // arbitrary value that looked nice for my example
+    }
 }
 
@@ -438 +409 @@
     marker.markerInfo = info;
     doc.marker = marker;
-
     attachClickHandler(marker, doc.nodeID);
 }