@abi-software/flatmap-viewer 2.5.0-a.1 → 2.5.1

package/src/flatmap-viewer.js

@@ -37,8 +37,6 @@ import {MapServer, loadJSON} from './mapserver.js';
 import {SearchIndex} from './search.js';
 import {UserInteractions} from './interactions.js';
 
-import {MinimapControl} from './controls/minimap.js';
-import {NavigationControl} from './controls/controls.js';
 import {APINATOMY_PATH_PREFIX} from './pathways';
 
 import * as images from './images.js';
@@ -162,33 +160,16 @@ class FlatMap
 
         this._map.setRenderWorldCopies(false);
 
-        // Do we want a fullscreen control?
-
-        if (mapDescription.options.fullscreenControl === true) {
-            this._map.addControl(new maplibregl.FullscreenControl(), 'top-right');
-        }
-
         // Disable map rotation
 
         //this._map.dragRotate.disable();
         //this._map.touchZoomRotate.disableRotation();
 
-        // Add navigation controls if option set
-
-        if (mapDescription.options.navigationControl) {
-            const value = mapDescription.options.navigationControl;
-            const position = ((typeof value === 'string')
-                           && ['top-left', 'top-right', 'bottom-right', 'bottom-left'].includes(value))
-                           ? value : 'bottom-right';
-            this._map.addControl(new NavigationControl(this), position);
-        }
-
         // Finish initialisation when all sources have loaded
         // and map has rendered
 
         this._userInteractions = null;
         this._initialState = null;
-        this._minimap = null;
 
         this._map.on('idle', () => {
             if (this._userInteractions === null) {
@@ -207,14 +188,9 @@ class FlatMap
                     this._userInteractions.setState(this._options.state);
                 }
                 this._initialState = this.getState();
-
-                // Add a minimap if option set
-
-                if (this.options.minimap) {
-                    this._minimap = new MinimapControl(this, this.options.minimap);
-                        this._map.addControl(this._minimap);
-                    }
-
+                if (this._userInteractions.minimap) {
+                    this._userInteractions.minimap.initialise()
+                }
                 this._resolve(this);
             }
         });
@@ -224,13 +200,11 @@ class FlatMap
     //============================
     {
         // Load any images required by the map
-
         for (const image of this._options.images) {
             await this.addImage(image.id, image.url, '', image.options);
         }
 
         // Layers have now loaded so finish setting up
-
         this._userInteractions = new UserInteractions(this);
     }
 
@@ -836,8 +810,8 @@ class FlatMap
 
         this._map.setPaintProperty('background', 'background-color', colour);
 
-        if (this._minimap) {
-            this._minimap.setBackgroundColour(colour);
+        if (this._userInteractions.minimap) {
+            this._userInteractions.minimap.setBackgroundColour(colour);
         }
     }
 
@@ -851,8 +825,8 @@ class FlatMap
     {
         this._map.setPaintProperty('background', 'background-opacity', opacity);
 
-        if (this._minimap) {
-            this._minimap.setBackgroundOpacity(opacity);
+        if (this._userInteractions.minimap) {
+            this._userInteractions.minimap.setBackgroundOpacity(opacity);
         }
     }
 
@@ -864,8 +838,8 @@ class FlatMap
     showMinimap(show)
     //===============
     {
-        if (this._minimap) {
-            this._minimap.show(show);
+        if (this._userInteractions.minimap) {
+            this._userInteractions.minimap.show(show);
         }
 
     }
@@ -898,6 +872,19 @@ class FlatMap
         }
     }
 
+    /**
+     * Show/hide 3D path view.
+     *
+     * @param      {boolean}  [enable=true]
+     */
+    enable3dPaths(enable=true)
+    //========================
+    {
+        if (this._userInteractions !== null) {
+            this._userInteractions.enable3dPaths(enable)
+        }
+    }
+
     //==========================================================================
 
     /**
@@ -1050,6 +1037,52 @@ class FlatMap
         return data;
     }
 
+    /**
+     * Show or hide a tool for drawing regions to annotate on the map.
+     *
+     * @param  {boolean}  [visible=true]
+     */
+    showAnnotator(visible=true)
+    //=========================
+    {
+        if (this._userInteractions !== null) {
+            this._userInteractions.showAnnotator(visible)
+        }
+    }
+
+    /**
+     * Generate an ``'annotation-draw`` callback when a drawn annotation has changed.
+     *
+     * @param {string}  operation       Either ``created``, ``updated`` or ``deleted``
+     * @param {string|Object}  feature  An object with ``id`` and ``geometry`` fields
+     *                                  for a feature that has been created or updated
+     *                                  or the ``id`` of a feature that has been deleted.
+     */
+    annotationDrawEvent(drawEvent, feature)
+    //=====================================
+    {
+        this.callback('annotation-draw', {
+            type: drawEvent,
+            feature: feature
+        });
+    }
+
+    /**
+     * Add or remove a drawn annotation.
+     *
+     * @param {string} operation   Either ``add`` or ``remove``
+     * @param {Object} feature     The feature to add or remove
+     * @param {string} feature.id  The feature's id
+     * @param {Object} feature.geometry  The feature's geometry as GeoJSON
+     */
+    modifyDrawnAnnotatorFeature(operation, feature)
+    //=============================================
+    {
+        if (this._userInteractions) {
+            this._userInteractions.modifyDrawnAnnotatorFeature(operation, feature)
+        }
+    }
+
     /**
      * Generate a callback as a result of some event with a flatmap feature.
      *