@abi-software/flatmap-viewer 2.2.2 → 2.2.4

package/README.rst

@@ -38,7 +38,7 @@ The map server endpoint is specified as ``MAP_ENDPOINT`` in ``src/main.js``. It
 Package Installation
 ====================
 
-* ``npm install @abi-software/flatmap-viewer@2.2.2``
+* ``npm install @abi-software/flatmap-viewer@2.2.4``
 
 Documentation
 -------------

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/flatmap-viewer",
-  "version": "2.2.2",
+  "version": "2.2.4",
   "description": "Flatmap viewer using Maplibre GL",
   "repository": "https://github.com/AnatomicMaps/flatmap-viewer.git",
   "main": "src/main.js",

package/src/interactions.js

@@ -323,7 +323,7 @@ export class UserInteractions
         );
     }
 
-    activateFeature_(feature)
+    __activateFeature(feature)
     //=======================
     {
         this._map.setFeatureState(feature, { active: true });
@@ -342,7 +342,7 @@ export class UserInteractions
     //==========================
     {
         featureId = +featureId;   // Ensure numeric
-        this.activateFeature_(this.mapFeature_(featureId));
+        this.__activateFeature(this.mapFeature_(featureId));
     }
 
     unhighlightFeatures_()
@@ -732,7 +732,7 @@ export class UserInteractions
         let tooltip = '';
         if (displayInfo) {
             if (!'tooltip' in features[0].properties) {
-                this.activateFeature_(features[0]);
+                this.__activateFeature(features[0]);
             }
             info = this._infoControl.featureInformation(features, event.lngLat);
         }
@@ -746,11 +746,11 @@ export class UserInteractions
                 tooltip = this.lineTooltip_(enabledFeatures);
                 for (const lineFeature of enabledFeatures) {
                     const lineFeatureId = +lineFeature.properties.featureId;  // Ensure numeric
-                    this.activateFeature_(lineFeature);
+                    this.__activateFeature(lineFeature);
                     const lineIds = new Set(enabledFeatures.map(f => f.properties.featureId));
                     for (const featureId of this._pathways.lineFeatureIds(lineIds)) {
                         if (+featureId !== lineFeatureId) {
-                            this.activateFeature_(this.mapFeature_(featureId));
+                            this.__activateFeature(this.mapFeature_(featureId));
                         }
                     }
                 }
@@ -799,14 +799,8 @@ export class UserInteractions
                     }
                     info = `<div id="info-control-info">${htmlList.join('\n')}</div>`;
                 }
-                if ('nerveId' in feature.properties) {
-                    if (feature.properties.active) {
-                        this.activateFeature_(feature);
-                    }
-                    this.activateNerveFeatures_(feature.properties.nerveId);
-                } else {
-                    this.activateFeature_(feature);
-                }
+                this.__activateFeature(feature);
+                this.__activateRelatedFeatures(feature);
                 if ('hyperlink' in feature.properties) {
                     this._map.getCanvas().style.cursor = 'pointer';
                 }
@@ -837,8 +831,8 @@ export class UserInteractions
         }
     }
 
-    selectionEvent_(domEvent, feature)
-    //================================
+    selectionEvent_(event, feature)
+    //=============================
     {
         const multipleSelect = event.ctrlKey || event.metaKey;
         if (!multipleSelect) {
@@ -874,9 +868,14 @@ export class UserInteractions
     {
         this.clearActiveMarker_();
         const clickedFeature = this._map.queryRenderedFeatures(event.point)[0];
+        const originalEvent = event.originalEvent;
         if (clickedFeature === undefined || this._activeFeatures.length === 1) {
-            this.selectionEvent_(event.originalEvent, clickedFeature);
+            this.selectionEvent_(originalEvent, clickedFeature);
         } else if (this._activeFeatures.length > 1) {
+            const multipleSelect = originalEvent.ctrlKey || originalEvent.metaKey;
+            if (!multipleSelect) {
+                this.__unselectFeatures();
+            }
             for (const feature of this._activeFeatures) {
                 this.selectFeature_(feature.id);
             }
@@ -895,11 +894,18 @@ export class UserInteractions
         }
     }
 
-    activateNerveFeatures_(nerveId)
-    //=============================
+    __activateRelatedFeatures(feature)
+    //================================
     {
-        for (const featureId of this._pathways.nerveFeatureIds(nerveId)) {
-            this.activateFeature_(this.mapFeature_(featureId));
+        if ('nerveId' in feature.properties) {
+            for (const featureId of this._pathways.nerveFeatureIds(feature.properties.nerveId)) {
+                this.__activateFeature(this.mapFeature_(featureId));
+            }
+        }
+        if ('nodeId' in feature.properties) {
+            for (const featureId of this._pathways.nodeFeatureIds(feature.properties.nodeId)) {
+                this.__activateFeature(this.mapFeature_(featureId));
+            }
         }
     }
 
@@ -1139,7 +1145,7 @@ export class UserInteractions
                 if (event.type === 'mouseenter') {
                     // Highlight on mouse enter
                     this.resetActiveFeatures_();
-                    this.activateFeature_(feature);
+                    this.__activateFeature(feature);
                 } else {
                     this.selectionEvent_(event, feature)
                 }

package/src/pathways.js

@@ -175,6 +175,16 @@ export class Pathways
         return featureIds;
     }
 
+   nodeFeatureIds(nodeId)
+    //===================
+    {
+        const featureIds = new Set();
+        if (nodeId in this._nodePaths) {
+            this.addPathsToFeatureSet_(this._nodePaths[nodeId], featureIds);
+        }
+        return featureIds;
+    }
+
     pathProperties(feature)
     //=====================
     {