@abi-software/flatmap-viewer 2.2.8 → 2.2.9

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.8``
+* ``npm install @abi-software/flatmap-viewer@2.2.9``
 
 Documentation
 -------------

package/package.json

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

package/src/interactions.js

@@ -42,6 +42,7 @@ import {PathControl} from './controls.js';
 import {SearchControl} from './search.js';
 import {VECTOR_TILES_SOURCE} from './styling.js';
 
+import * as pathways from './pathways.js';
 import * as utils from './utils.js';
 
 //==============================================================================
@@ -842,31 +843,34 @@ export class UserInteractions
     selectionEvent_(event, feature)
     //=============================
     {
-        const multipleSelect = event.ctrlKey || event.metaKey;
-        if (!multipleSelect) {
-            this.__unselectFeatures();
-        }
         if (feature !== undefined) {
-            const featureId = feature.id;
-            const selecting = !this.featureSelected_(featureId);
-            if ('properties' in feature
-             && 'type' in feature.properties
-             && feature.properties.type.startsWith('line')) {
+            const clickedFeatureId = feature.id;
+            const dim = !('properties' in feature
+                       && 'kind' in feature.properties
+                       && ['cell-type', 'scaffold', 'tissue'].indexOf(feature.properties.kind) >= 0);
+            if (!(event.ctrlKey || event.metaKey)) {
+                let selecting = true;
+                for (const featureId of this._selectedFeatureIds.keys()) {
+                    if (featureId === clickedFeatureId) {
+                        selecting = false;
+                        break;
+                    }
+                }
+                this.__unselectFeatures();
+                if (selecting) {
+                    for (const feature of this._activeFeatures) {
+                        this.selectFeature_(feature.id, dim);
+                    }
+                }
+            } else {
+                const clickedSelected = this.featureSelected_(clickedFeatureId);
                 for (const feature of this._activeFeatures) {
-                    const featureId = feature.id;
-                    if (selecting) {
-                        this.selectFeature_(featureId);
+                    if (clickedSelected) {
+                        this.unselectFeature_(feature.id);
                     } else {
-                        this.unselectFeature_(featureId);
+                        this.selectFeature_(feature.id, dim);
                     }
                 }
-            } else if (selecting) {
-                const dim = !('properties' in feature
-                             && 'kind' in feature.properties
-                             && ['cell-type', 'scaffold', 'tissue'].indexOf(feature.properties.kind) >= 0);
-                this.selectFeature_(featureId, dim);
-            } else {
-                this.unselectFeature_(featureId);
             }
         }
     }
@@ -875,24 +879,14 @@ export class UserInteractions
     //================
     {
         this.clearActiveMarker_();
-        const clickedFeatures = this._map.queryRenderedFeatures(event.point)
-                                    .filter(feature => this.__enabledFeature(feature));
+        const clickedFeatures = this._map.queryRenderedFeatures(event.point);
         if (clickedFeatures.length == 0){
+            this.__unselectFeatures();
             return;
         }
         const clickedFeature = clickedFeatures[0];
         const originalEvent = event.originalEvent;
-        if (clickedFeature === undefined || this._activeFeatures.length === 1) {
-            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);
-            }
-        }
+        this.selectionEvent_(originalEvent, clickedFeature);
         if (this._modal) {
            // Remove tooltip, reset active features, etc
             this.__resetFeatureDisplay();
@@ -976,18 +970,23 @@ export class UserInteractions
     //===============================
     {
         // Disable/enable all paths except those with `pathTypes`
-
-        this.enablePathFeatures_(!enable, this._pathways.allFeatureIds());
-
         if (Array.isArray(pathTypes)) {
-            for (const pathType of pathTypes) {
-                this.enablePath(pathType, enable);
+            for (const pathType of pathways.PATH_TYPES) {
+                if (pathTypes.indexOf(pathType.type) >= 0) {
+                    this.enablePath(pathType.type, enable)
+                } else {
+                    this.enablePath(pathType.type, !enable)
+                }
             }
         } else {
-            this.enablePath(pathTypes, enable);
+            for (const pathType of pathways.PATH_TYPES) {
+                if (pathType.type === pathTypes) {
+                    this.enablePath(pathType.type, enable)
+                } else {
+                    this.enablePath(pathType.type, !enable)
+                }
+            }
         }
-
-        this._disabledPathFeatures = true;
     }
 
     pathwaysFeatureIds(externalIds)