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

Timestamp:

2019-07-09T21:42:14+12:00 (5 years ago)

Author:

ak19

Message:

Incorporated request for GPS.mapOverlay for children of a section, following Kathy's explanation from last Thursday. map-scripts then adds the overlays for each child to its parent section's doc.mapoverlay. That seems to work for the solr-haminfo GPS map data demo collection. But Solr faceted searching still doesn't work the way I understand it should. And of course, we don't just want children of a section but all descendants and the section itself.

File:

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

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

@@ -357 +357 @@
 function toggleMapSection(options)
 {
-    
     var sectionID = options["nodeID"];
     
     var titleClassifierEl = document.getElementById("title"+sectionID);
     var jsonNodesStr = titleClassifierEl.getAttribute("data-gps-map-json");
+    //alert("@@@@ got jsonNodesStr |" + jsonNodesStr + "|");
     var jsonNodes = JSON.parse(jsonNodesStr);
     
@@ -703 +703 @@
 
 function createOverlayItems(doc, options) {
-    if(doc.mapoverlay) {
-        //console.log("Have shapes: " + doc.mapoverlay.toString());
+    var loopCounter = 0;
+    if(doc.mapoverlay || doc.childrenMapoverlays) {
+        if(doc.mapoverlay) {
+            // append any child section's mapoverlays onto doc.mapoverlay
+            if(doc.childrenMapoverlays) {               
+                for(loopCounter = 0; loopCounter < doc.childrenMapoverlays.length; loopCounter++) {
+                    //console.log("Pushing next child mapoverlay onto doc.mapoverlay: ", doc.childrenMapoverlays[loopCounter]);
+                    Array.prototype.push.apply(doc.mapoverlay, doc.childrenMapoverlays[loopCounter]);                   
+                }
+                delete doc.childrenMapoverlays; // served its purpose
+            }
+        } else if (doc.childrenMapoverlays) { // no doc.mapoverlay
+            // construct doc.mapoverlay to contain each child section's mapoverlay
+            doc.mapoverlay = [];
+            for(loopCounter = 0; loopCounter < doc.childrenMapoverlays.length; loopCounter++) {
+                //console.log("Pushing next child mapoverlay onto originally empty doc.mapoverlay: ", doc.childrenMapoverlays[loopCounter]);
+                Array.prototype.push.apply(doc.mapoverlay, doc.childrenMapoverlays[loopCounter]);
+            }           
+            delete doc.childrenMapoverlays;  // no more use for this
+        }
+        //console.log("@@@@ Have shapes: ", doc.mapoverlay);        
         createShapes(doc, options);
     } else { // backwards compatible to deal with Lat and Lng meta stored for doc