@abi-software/flatmap-viewer 2.3.0-b.2 → 2.3.2-b.1

package/src/systems.js

@@ -21,45 +21,50 @@ limitations under the License.
 
 export class SystemsManager
 {
-    constructor(flatmap, ui, enabled=true)
+    constructor(flatmap, ui, enabled=false)
     {
         this.__ui = ui;
         this.__systems = new Map();
         this.__enabledChildren = new Map();
         for (const [id, ann] of flatmap.annotations) {
             if (ann['fc-class'] === 'fc-class:System') {
-                if (this.__systems.has(ann.name)) {
-                    this.__systems.get(ann.name).featureIds.push(ann.featureId)
+                const systemId = ann.name.replaceAll(' ', '_');
+                if (this.__systems.has(systemId)) {
+                    this.__systems.get(systemId).featureIds.push(ann.featureId)
                 } else {
-                    this.__systems.set(ann.name, {
-                        id: ann.name.replaceAll(' ', '_'),
+                    this.__systems.set(systemId, {
+                        name: ann.name,
                         colour: ann.colour,
                         featureIds: [ ann.featureId ],
-                        enabled: enabled
+                        enabled: false,
+                        pathIds: ('path-ids' in ann) ? ann['path-ids'] : []
                     });
+                this.__ui.enableFeature(ann.featureId, false, true);
                 }
                 for (const childId of ann['children']) {
-                    if (enabled) {
-                        const enabledCount = (this.__enabledChildren.has(childId))
-                                           ? this.__enabledChildren.get(childId)
-                                           : 0;
-                        this.__enabledChildren.set(childId, enabledCount + 1);
-                    } else {
-                        this.__enabledChildren.set(childId, 0);
-                    }
+                    this.__enabledChildren.set(childId, 0);
+                    this.__ui.enableFeatureWithChildren(childId, false, true);
                 }
             }
         }
+        for (const system of this.__systems.values()) {
+            if (enabled) {
+                this.__enableSystem(system, true);
+            } else {
+                // Disable all paths associated with the disabled system
+                this.__ui.enablePathsBySystem(system, false, true);
+            }
+        }
     }
 
     get systems()
     //===========
     {
         const systems = [];
-        for (const [name, system] of this.__systems.entries()) {
+        for (const [systemId, system] of this.__systems.entries()) {
             systems.push({
-                name: name,
-                id: system.id,
+                id: systemId,
+                name: system.name,
                 colour: system.colour,
                 enabled: system.enabled
             });
@@ -67,26 +72,44 @@ export class SystemsManager
         return systems;
     }
 
-    enable(systemName, enable=true)
-    //=============================
+    enable(systemId, enable=true)
+    //===========================
     {
-        const system = this.__systems.get(systemName);
+        const system = this.__systems.get(systemId);
         if (system !== undefined && enable !== system.enabled) {
-            for (const featureId of system.featureIds) {
-                const feature = this.__ui.mapFeature(featureId);
-                if (feature !== undefined) {
-                    this.__ui.enableFeature(feature, enable);
-                    for (const childFeatureId of feature.children) {
-                        const enabledCount = this.__enabledChildren.get(childFeatureId);
-                        if (enable && enabledCount === 0 || !enable && enabledCount == 1) {
-                            this.__ui.enableFeatureWithChildren(childFeatureId, enable);
-                        }
-                        this.__enabledChildren.set(childFeatureId, enabledCount + (enable ? 1 : -1));
+            this.__enableSystem(system, enable);
+        }
+    }
+
+    __enableSystem(system, enable=true)
+    //=================================
+    {
+        for (const featureId of system.featureIds) {
+            const feature = this.__ui.mapFeature(featureId);
+            if (feature !== undefined) {
+                this.__ui.enableMapFeature(feature, enable);
+                for (const childFeatureId of feature.children) {
+                    const enabledCount = this.__enabledChildren.get(childFeatureId);
+                    if (enable && enabledCount === 0 || !enable && enabledCount == 1) {
+                        this.__ui.enableFeatureWithChildren(childFeatureId, enable);
                     }
+                    this.__enabledChildren.set(childFeatureId, enabledCount + (enable ? 1 : -1));
                 }
             }
-            system.enabled = enable;
         }
+
+        // Enable/disable all paths associated with the system
+        this.__ui.enablePathsBySystem(system, enable);
+
+        // Save system state
+        system.enabled = enable;
+    }
+
+    systemEnabled(systemId)
+    //=====================
+    {
+        const system = this.__systems.get(systemId);
+        return (system !== undefined && system.enabled);
     }
 }
 

package/src/utils.js

@@ -124,3 +124,21 @@ export function setDefaults(options, defaultOptions)
 }
 
 //==============================================================================
+
+export function reverseMap(mapping)
+//=================================
+{
+    const reverse = {};
+    for (const [key, values] of Object.entries(mapping)) {
+        for (const value of values) {
+            if (value in reverse) {
+                reverse[value].add(key);
+            } else {
+                reverse[value] = new Set([key]);
+            }
+        }
+    }
+    return reverse;
+}
+
+//==============================================================================

package/static/css/flatmap-viewer.css

@@ -342,6 +342,18 @@ label[for=layer-all-layers] {
     background-color: #BBB;
 }
 
+#annotation-feature-selection
+{
+    display: flex;
+}
+
+#annotation-feature-buttons
+{
+    float: right;
+    padding-top: 10px;
+    padding-bottom: 10px;
+}
+
 .jsPanel-title {
     font-size: 1.4em !important;
     font-weight: bold !important;