@abi-software/flatmap-viewer 2.5.4 → 2.5.6

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/flatmap-viewer",
-  "version": "2.5.4",
+  "version": "2.5.6",
   "description": "Flatmap viewer using Maplibre GL",
   "repository": "https://github.com/AnatomicMaps/flatmap-viewer.git",
   "main": "src/main.js",
@@ -21,7 +21,6 @@
     "@deck.gl/core": "^8.9.33",
     "@deck.gl/layers": "^8.9.33",
     "@deck.gl/mapbox": "^8.9.33",
-    "@mapbox/mapbox-gl-draw": "^1.4.3",
     "@turf/area": "^6.5.0",
     "@turf/bbox": "^6.5.0",
     "@turf/helpers": "^6.5.0",
@@ -39,7 +38,7 @@
     "@babel/plugin-transform-runtime": "^7.5.5",
     "@babel/preset-env": "^7.10.4",
     "babel-loader": "^8.1.0",
-    "browser-sync": "^2.26.7",
+    "browser-sync": "^3.0.2",
     "bs-fullscreen-message": "^1.1.0",
     "clean-webpack-plugin": "^3.0.0",
     "css-loader": "^6.7.3",

package/src/interactions.js

@@ -99,6 +99,9 @@ function expandBounds(bbox1, bbox2, padding)
 
 function labelPosition(feature)
 {
+    if (feature.geometry.type === 'Point') {
+        return feature.geometry.coordinates
+    }
     const polygon = feature.geometry.coordinates;
     // Rough heuristic. Area is in km^2; below appears to be good enough.
     const precision = ('area' in feature.properties)
@@ -255,6 +258,9 @@ export class UserInteractions
             }
         }
 
+        // Initialise map annotation
+        this.__setupAnnotation()
+
         // Add an initially hidden tool for drawing on the map.
         this.#annotationDrawControl = new AnnotationDrawControl(flatmap, false)
         this._map.addControl(this.#annotationDrawControl)
@@ -358,6 +364,34 @@ export class UserInteractions
         }
     }
 
+    __setupAnnotation()
+    //=================
+    {
+        // Relate external annotation identifiers to map (GeoJSON) ids
+        this.__featureIdToMapId = new Map([...this._flatmap.annotations.entries()]
+                                                  .map(idAnn => [idAnn[1].id, idAnn[0]]))
+        // Flag features that have annotations
+        for (const mapId of this.__featureIdToMapId.values()) {
+            const feature = this.mapFeature(mapId)
+            if (feature !== undefined) {
+                this._map.setFeatureState(feature, { 'map-annotation': true })
+            }
+        }
+    }
+
+    setFeatureAnnotated(featureId)
+    //============================
+    {
+        // External feature id to map's GeoJSON id
+        const mapId = this.__featureIdToMapId.get(featureId)
+        if (mapId) {
+            const feature = this.mapFeature(mapId)
+            if (feature !== undefined) {
+                this._map.setFeatureState(feature, { 'annotated': true })
+            }
+        }
+    }
+
     #setPaint(options)
     //================
     {