Changeset 32834 for main/trunk

Timestamp:

2019-03-01T19:41:57+13:00 (5 years ago)

Author:

ak19

Message:

Discovered bug when testing sectioned documents like solr-demo/lucene-demo coll. Old map-editor LOAD() function always loaded saved metadata of subsections into the map editor of the topsection. That's not what we want. We want each (sub)section's stored GPS map data to be loaded into that (sub)section's map editor.

File:

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

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

@@ -409 +409 @@
             if(JSONString !== "")
             {
-                that.LOAD(JSONString);
+                that.LOAD(JSONString, nodeID);
                 that.savedOverlays = JSONString;
             }
@@ -688 +688 @@
 
 // to be called after reading back in stored JSON from archives meta
-MapEditor.prototype.LOAD = function (json_str) {
+MapEditor.prototype.LOAD = function (json_str, nodeID) {
     this.mapEditorHistory.historyOverlayPush();
     
-    var map_editor = Object.values(gsmap_store)[0];
+    
+    // This seems to convert the map_store object into an array and forces array index access, instead of convenient property access using nodeID   
+    //Object.values(gsmap_store)[0]; // Always gets top level section's map-editor, not what we want.
+    
+    // Get the map editor for the nodeID, as we're asked to load that editor
+    var map_editor = gsmap_store["map-"+nodeID];
     
     var new_overlays = ShapesUtil.JSONToOverlays(json_str);