Changeset 33217 for main/trunk/greenstone3

Timestamp:

2019-06-24T16:41:04+12:00 (5 years ago)

Author:

wy59

Message:

1. Undoing the change to doc.pm committed in revision 33185: not storing all combinations of precision for Lat and Long in CoordShorts. Instead, Dr Bainbridge fixed up map-scripts.js to ensure that the requested precision (num decimal places) for Lat and Lng in a CoordShort are now the same. The chosen precision for both is set to whichever of the two is more zoomed out, which work out to be whichever of the two has fewer decimal places. 2. Dr Bainbridge and Martin set min-height when mapEnabled to ensure the footer didn't interfere in the map. 3. classifier-scripts' httpRequest() renamed to httpBrowseRequest() and map's getSubClassifier() renamed to httpMapBrowseRequest().

Location:

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

Files:

• classifier_scripts.js (modified) (3 diffs)
• map-scripts.js (modified) (4 diffs)

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

@@ -53 +53 @@
     else
     {
-        httpRequest(sectionID);
+        httpBrowseRequest(sectionID);
     }
 }
@@ -114 +114 @@
 }
 
-function httpRequest(sectionID)
+function httpBrowseRequest(sectionID)
 {
     if(!inProgress[sectionID])
@@ -156 +156 @@
             updateOpenClassifiers();            
             if(typeof mapEnabled !== 'undefined'){
-                getSubClassifier(sectionID);
+                httpMapBrowseRequest(sectionID);
             }
         })

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

@@ -35 +35 @@
         {
             mapEnabled = true;
+            var resultsArea = $('#resultsArea');
+            if (resultsArea.length > 0){
+                resultsArea.css('min-height','500px');
+            }
             for(var i = 0; i < jsonNodes.length; i++)
             {
@@ -167 +171 @@
     {
         lngDelta = (1 / Math.pow(10, i));
+        // Want the grid superimposed on the map to be 5 or fewer steps,
+        // where delta is the grid size to make it so
+        // and precision is the number of decimal places.
         if((lngDistance / lngDelta) <= 5 || lngDelta == 1)
         {
@@ -172 +179 @@
             break;
         }
-    }
-
+    }   
+    
     if(latDelta == 0.1){latDelta = 1; latPrecision = 0; }
     if(lngDelta == 0.1){lngDelta = 1; lngPrecision = 0; }
+    
+    
+    // Want consistent precision for both lat and lng.
+    // So we choose the most conservative (whichever is more zoomed out) for both
+    if(latPrecision < lngPrecision) {
+        lngPrecision = latPrecision;
+    } else if (lngPrecision < latPrecision) {
+        latPrecision = lngPrecision;
+    }
     
     /*
@@ -778 +794 @@
 }
 
-function getSubClassifier(sectionID)
-{
+function httpMapBrowseRequest(sectionID)
+{
+    // Make ajax call to retrieve jsonNodes for section ID, and draw shapes on the map.
     var url = gs.xsltParams.library_name + "?a=b&rt=s&s=ClassifierBrowse&c=" + gs.cgiParams.c + "&cl=" + sectionID + "&excerptid=jsonNodes";
     $.ajax(url)