Changeset 33185 for main/trunk/greenstone3

Timestamp:

2019-06-21T20:37:49+12:00 (5 years ago)

Author:

wy59

Message:

1. Corrections to map-scripts.js code (e.g. a var had been omitted from a declaration). Reinstated Dr Bainbridge's setting of the bounds during updateMap, as his way preserved the cumulative bounds we were building up and the recently committed 'improvement' had actually tossed this important bit of code away. 3. Major change to doc.pm to store all combinations of Lat and Lng components of CoordShort, since each Lat and Lng can have a different number of decimal places. We need to store all possible combinations since searching requires that, as searching can and does in fact have unequal number of dec places for coordinates (that end up using CoordShort) on occasion. Without this fix, shapes of nearby docs/subsections don't get returned in such cases.

File:

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

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

@@ -150 +150 @@
     //Check which increment to use for longitude (i.e. 0.001, 0.01, 0.1 or 1 degree increments)
     var lngDelta;
+    var lngPrecision;
     for(var i = 3; i >= 0; i--)
     {
@@ -205 +206 @@
     var query = "";
     var iMax = Math.floor(latDistance / latDelta) + 1;
-    var jMax = Math.floor(lngDistance / lngDelta) + 1;;
+    var jMax = Math.floor(lngDistance / lngDelta) + 1;
     for(var i = 0; i <= iMax; i++) //for(var i = 0; i <= Math.floor(latDistance / latDelta) + 1; i++)
     {
@@ -355 +356 @@
         {
             if(doc.shapes) {
-                //console.log("@@@ making doc.shapes["+x+"] visible");
                 for(var x = 0; x < doc.shapes.length; x++) {                    
                     doc.shapes[x].setVisible(true);
@@ -369 +369 @@
         if(doc.shapes) {
             console.log("@@@@ HERE IN doc.shapes");
-            bounds = ShapesUtil.overlayBounds(doc.shapes);
+            var docSection_overlay_bounds = ShapesUtil.overlayBounds(doc.shapes);
+            // We now have the current document or document subsection's bounds.
+            // Use this to extend the overall bounds (the cumulative bounds for all nearby documents,
+            // or at least the cumulative bounds for this document with all its subsections).
+            bounds.extend(docSection_overlay_bounds.getNorthEast());
+            bounds.extend(docSection_overlay_bounds.getSouthWest()); 
         }
         else {