@abi-software/flatmap-viewer 2.5.8 → 2.5.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.5.8``
+* ``npm install @abi-software/flatmap-viewer@2.5.9``
 
 Documentation
 -------------

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/flatmap-viewer",
-  "version": "2.5.8",
+  "version": "2.5.9",
   "description": "Flatmap viewer using Maplibre GL",
   "repository": {
     "type": "git",

package/src/controls/annotation.js

@@ -78,6 +78,7 @@ export class AnnotationDrawControl
             keybindings: true
         })
         this.__map = null
+        this.__inDrawing = false
     }
 
     onAdd(map)
@@ -96,7 +97,7 @@ export class AnnotationDrawControl
                 e.preventDefault();
             }
         }, false)
-        map.on('draw.modechange', this.featureModeChanged.bind(this))
+        map.on('draw.modechange', this.modeChangedEvent.bind(this))
         map.on('draw.create', this.createdFeature.bind(this))
         map.on('draw.delete', this.deletedFeature.bind(this))
         map.on('draw.update', this.updatedFeature.bind(this))
@@ -197,13 +198,20 @@ export class AnnotationDrawControl
         }
     }
 
-    featureModeChanged(event)
-    //=======================
+    modeChangedEvent(event)
+    //=====================
     {
         // Used as a flag to indicate the feature mode
+        this.__inDrawing = (event.mode.startsWith('draw'))
         this.#sendEvent('modeChanged', event)
     }
 
+    inDrawingMode()
+    //=============
+    {
+        return this.__inDrawing
+    }
+
     commitEvent(event)
     //================
     {

package/src/interactions.js

@@ -333,6 +333,14 @@ export class UserInteractions
         }
     }
 
+    inDrawingAnnotationMode()
+    //=======================
+    {
+        if (this.#annotationDrawControl) {
+            return this.#annotationDrawControl.inDrawingMode()
+        }
+    }
+
     commitAnnotationEvent(event)
     //==========================
     {
@@ -1185,22 +1193,25 @@ export class UserInteractions
             this.unselectFeatures();
             return;
         }
-        const clickedFeature = clickedFeatures.filter((f)=>f.id)[0];
-        const clickedDrawnFeature = clickedFeatures.filter((f)=>!f.id)[0];
+        const inDrawing = this.inDrawingAnnotationMode()
+        const clickedDrawnFeature = clickedFeatures.filter((f) => !f.id)[0];
+        const clickedFeature = clickedFeatures.filter((f) => f.id)[0];
         this.selectionEvent_(event.originalEvent, clickedFeature);
         if (this._modal) {
             // Remove tooltip, reset active features, etc
             this.__resetFeatureDisplay();
             this.unselectFeatures();
             this.__clearModal();
-        } else if (clickedFeature !== undefined) {
+        } else if (clickedDrawnFeature && !inDrawing) {
+            // When feature and drawn feature are coinciding, click on annotation layer by default
+            // While in drawing, DISABLE 'click' event on annotation layer
+            this.__featureEvent('click', clickedDrawnFeature);
+        } else if (clickedFeature) {
             this.__lastClickLngLat = event.lngLat;
             this.__featureEvent('click', clickedFeature);
             if ('properties' in clickedFeature && 'hyperlink' in clickedFeature.properties) {
                 window.open(clickedFeature.properties.hyperlink, '_blank');
             }
-        } else if (clickedDrawnFeature !== undefined) {
-            this.__featureEvent('click', clickedDrawnFeature);
         }
     }