Changeset 33128 for main/trunk/greenstone3/web/interfaces/default/js/classifier_scripts.js

Timestamp:

2019-06-06T20:53:13+12:00 (5 years ago)

Author:

wy59

Message:

Improvements to Coordinate support AND bugfixes. BUT not all the fixes may be ideal, many marked with TODO. 1. Now we support an Array of coordinates. At present these are only displayed as Markers, but in future shapes should appear as shapes. 2. Bugfixes include: (a) expanding sections wasn't working when we had hierarchical docs with Coordinate data, because map-scripts 'overrode' the toggleSection function but no longer did any of the doc expanding behaviour that document_scripts.js used to do. This was not a problem with the ImagesGPS collection, simply because that did not have hierarchical/sectionalised documents. (b) Perl: A previous commit output duplicate Coordinates into the index. Now this doesn't happen. Fix works but may not be ideal. 3. Perl: (a) Reserved index names CD, CS for Coordinate and CoordShort. Note however that LAT and LNG were never added to reserve list for index names. (b) Now doc.pm::processCoord() takes a section parameter and works out the section-ptr from that.

File:

• main/trunk/greenstone3/web/interfaces/default/js/classifier_scripts.js (modified) (2 diffs)

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

@@ -11 +11 @@
     }
     return false;
+}
+
+// TODO: Is there a better solution
+function _basicToggleSection(sectionID) {
+    // Leave this function here, even though it's empty.
+    // This function is here because:
+    // - it mirrors the identically named version in document_scripts
+    // - and this allows map_scripts to override it without knowing whether it's
+    //   overriding classifier_scripts::toggleSection() or document_scripts::toggleSection().
+    
+    // This method is not meant to call toggleSection. If anything it would be the other way around
+    // (as occurs in doc_scripts.js). But this method has to remain empty for classifier_scripts.js
+    // since map_scripts largely repeats classifier_scripts.js::toggleSection() code.
 }
 
@@ -111 +124 @@
     if(!inProgress[sectionID])
     {
-        inProgress[sectionID] = true;       
+        inProgress[sectionID] = true;
         
         var sectionToggle = gs.jqGet("toggle" + sectionID);