@vcmap/core 5.0.0-rc.27 → 5.0.0-rc.28

package/src/util/editor/editGeometrySession.js

@@ -1,6 +1,6 @@
 import { getLogger } from '@vcsuite/logger';
+import { unByKey } from 'ol/Observable.js';
 import { GeometryType, SessionType, setupInteractionChain, setupScratchLayer } from './editorSessionHelpers.js';
-import SelectSingleFeatureInteraction from './interactions/selectSingleFeatureInteraction.js';
 import InteractionChain from '../../interaction/interactionChain.js';
 import VcsEvent from '../../vcsEvent.js';
 import TranslateVertexInteraction from './interactions/translateVertexInteraction.js';
@@ -11,14 +11,12 @@ import EditGeometryMouseOverInteraction from './interactions/editGeometryMouseOv
 import { cartesian2DDistance, modulo } from '../math.js';
 import { createSync, obliqueGeometry } from '../../layer/vectorSymbols.js';
 import geometryIsValid from './validateGeoemetry.js';
-import ObliqueMap from '../../map/obliqueMap.js';
-import { emptyStyle } from '../../style/styleHelpers.js';
 import MapInteractionController from './interactions/mapInteractionController.js';
-import { originalStyle } from '../../layer/featureVisibility.js';
 
 /**
  * @typedef {EditorSession} EditGeometrySession
- * @property {SelectSingleFeatureInteraction} featureSelection - the feature selection for this session.
+ * @property {function(import("ol").Feature):void} setFeature - Sets the feature for the edit session.
+ * @property {import("ol").Feature | null} feature - Gets the current feature of the edit session.
  */
 
 /**
@@ -82,12 +80,15 @@ function createEditLineStringGeometryInteraction(feature, scratchLayer) {
  * @returns {EditGeometryInteraction}
  */
 function createEditCircleGeometryInteraction(feature, scratchLayer) {
+  /** @type {import("ol/geom").Circle} */
   const geometry = feature[obliqueGeometry] ?? feature.getGeometry();
   const vertices = geometry.getCoordinates().map(createVertex);
   scratchLayer.addFeatures(vertices);
 
   const translateVertex = new TranslateVertexInteraction();
+  let suspend;
   translateVertex.vertexChanged.addEventListener((vertex) => {
+    suspend = true;
     if (vertices.indexOf(vertex) === 1) {
       const coords = geometry.getCoordinates();
       coords[1] = vertex.getGeometry().getCoordinates();
@@ -97,6 +98,16 @@ function createEditCircleGeometryInteraction(feature, scratchLayer) {
       geometry.setCenter(vertex.getGeometry().getCoordinates());
       vertices[1].getGeometry().setCoordinates(geometry.getCoordinates()[1]);
     }
+    suspend = false;
+  });
+
+  const geometryListener = geometry.on('change', () => {
+    if (!suspend) {
+      geometry.getCoordinates()
+        .forEach((c, index) => {
+          vertices[index].getGeometry().setCoordinates(c);
+        });
+    }
   });
 
   const interactionChain = new InteractionChain([translateVertex]);
@@ -106,6 +117,7 @@ function createEditCircleGeometryInteraction(feature, scratchLayer) {
     destroy: () => {
       scratchLayer.removeFeaturesById(vertices.map(v => v.getId()));
       interactionChain.destroy();
+      unByKey(geometryListener);
     },
   };
 }
@@ -119,7 +131,7 @@ function createEditBBoxGeometryInteraction(feature, scratchLayer) {
   const geometry = feature[obliqueGeometry] ?? feature.getGeometry();
   const vertices = geometry.getCoordinates()[0].map(createVertex);
   scratchLayer.addFeatures(vertices);
-
+  let suspend = false;
   const translateVertex = new TranslateVertexInteraction();
   translateVertex.vertexChanged.addEventListener((vertex) => {
     const vertexIndex = vertices.indexOf(vertex);
@@ -156,9 +168,19 @@ function createEditBBoxGeometryInteraction(feature, scratchLayer) {
     updateOtherVertex(rightOfIndex);
     updateOtherVertex(leftOfIndex);
 
+    suspend = true;
     geometry.setCoordinates([vertices.map(f => f.getGeometry().getCoordinates())]);
+    suspend = false;
   });
 
+  const geometryListener = geometry.on('change', () => {
+    if (!suspend) {
+      geometry.getCoordinates()[0]
+        .forEach((c, index) => {
+          vertices[index].getGeometry().setCoordinates(c);
+        });
+    }
+  });
   const interactionChain = new InteractionChain([translateVertex]);
 
   return {
@@ -166,6 +188,7 @@ function createEditBBoxGeometryInteraction(feature, scratchLayer) {
     destroy: () => {
       scratchLayer.removeFeaturesById(vertices.map(v => v.getId()));
       interactionChain.destroy();
+      unByKey(geometryListener);
     },
   };
 }
@@ -224,17 +247,28 @@ function createEditSimplePolygonInteraction(feature, scratchLayer) {
 /**
  * @param {import("ol").Feature<import("ol/geom").Point>} feature
  * @param {import("@vcmap/core").VectorLayer} scratchLayer
+ * @param {import("@vcmap/core").VectorLayer} layer
  * @returns {EditGeometryInteraction}
  */
-function createEditPointInteraction(feature, scratchLayer) {
-  const vertex = createVertex(feature.getGeometry().getCoordinates());
-  const featureStyle = feature.getStyle();
-  feature[originalStyle] = featureStyle;
-  feature.setStyle(emptyStyle);
+function createEditPointInteraction(feature, scratchLayer, layer) {
+  const geometry = feature[obliqueGeometry] ?? feature.getGeometry();
+  const vertex = createVertex(geometry.getCoordinates());
+  const featureIdArray = [feature.getId()];
+  layer.featureVisibility.hideObjects(featureIdArray);
+  vertex[createSync] = true;
   scratchLayer.addFeatures([vertex]);
   const translateVertex = new TranslateVertexInteraction();
+  let suspend = false;
   translateVertex.vertexChanged.addEventListener(() => {
+    suspend = true;
     feature.getGeometry().setCoordinates(vertex.getGeometry().getCoordinates());
+    suspend = false;
+  });
+
+  const geometryListener = geometry.on('change', () => {
+    if (!suspend) {
+      vertex.getGeometry().setCoordinates(geometry.getCoordinates());
+    }
   });
 
   const interactionChain = new InteractionChain([
@@ -246,7 +280,8 @@ function createEditPointInteraction(feature, scratchLayer) {
     destroy: () => {
       interactionChain.destroy();
       scratchLayer.removeFeaturesById([vertex.getId()]);
-      feature.setStyle(featureStyle);
+      layer.featureVisibility.showObjects(featureIdArray);
+      unByKey(geometryListener);
     },
   };
 }
@@ -255,24 +290,22 @@ function createEditPointInteraction(feature, scratchLayer) {
  * Creates the edit geometry session.
  * @param {import("@vcmap/core").VcsApp} app
  * @param {import("@vcmap/core").VectorLayer} layer
+ * @param {string} [interactionId] id for registering mutliple exclusive interaction. Needed to run a selection session at the same time as a edit features session.
  * @returns {EditGeometrySession}
  */
-function startEditGeometrySession(app, layer) {
+function startEditGeometrySession(app, layer, interactionId) {
   const {
     interactionChain,
     removed: interactionRemoved,
     destroy: destroyInteractionChain,
-  } = setupInteractionChain(app.maps.eventHandler);
+  } = setupInteractionChain(app.maps.eventHandler, interactionId);
 
   const scratchLayer = setupScratchLayer(app.layers);
 
-  const selectFeatureInteraction = new SelectSingleFeatureInteraction(layer);
-  interactionChain.addInteraction(selectFeatureInteraction);
-
   const mapInteractionController = new MapInteractionController();
   interactionChain.addInteraction(mapInteractionController);
 
-  const mouseOverInteraction = new EditGeometryMouseOverInteraction(layer.name);
+  const mouseOverInteraction = new EditGeometryMouseOverInteraction();
   interactionChain.addInteraction(mouseOverInteraction);
 
   /**
@@ -284,11 +317,12 @@ function startEditGeometrySession(app, layer) {
    * @type {EditGeometryInteraction|null}
    */
   let currentInteractionSet = null;
-  let currentFeature = null;
   /**
-   * @type {ObliqueMap|null}
+   * The feature that is set for the edit session.
+   * @type {import("ol").Feature}
    */
-  let obliqueMap = null;
+  let currentFeature = null;
+
 
   const destroyCurrentInteractionSet = () => {
     if (currentInteractionSet) {
@@ -304,18 +338,15 @@ function startEditGeometrySession(app, layer) {
       }
     }
     currentFeature = null;
-
-    if (obliqueMap) {
-      obliqueMap.switchEnabled = true;
-    }
   };
 
-  selectFeatureInteraction.featureChanged.addEventListener((feature) => {
+  /**
+   * Creates an interaction set from an edit geometry interaction. If the geometry of the feature is not supported a message is logged.
+   * @param {import("ol").Feature} feature The feature to be edited.
+   */
+  function createCurrentInteractionSet(feature) {
     destroyCurrentInteractionSet();
     if (feature) {
-      if (obliqueMap) {
-        obliqueMap.switchEnabled = false;
-      }
       currentFeature = feature;
       currentFeature[createSync] = true;
       const geometry = feature[obliqueGeometry] ?? feature.getGeometry();
@@ -341,6 +372,7 @@ function startEditGeometrySession(app, layer) {
         currentInteractionSet = createEditPointInteraction(
           /** @type {import("ol").Feature<import("ol/geom").Point>} */ (feature),
           scratchLayer,
+          layer,
         );
       } else if (geometryType === GeometryType.Circle) {
         currentInteractionSet = createEditCircleGeometryInteraction(
@@ -355,35 +387,20 @@ function startEditGeometrySession(app, layer) {
         getLogger('EditGeometrySession').warning(`Geometry of type ${geometryType} is currently not supported`);
         currentFeature[createSync] = false;
         currentFeature = null;
-        selectFeatureInteraction.clear();
       }
     }
-  });
+  }
 
-  let obliqueImageChangedListener = () => {};
   const setupActiveMap = () => {
     mapInteractionController.reset();
     mouseOverInteraction.reset();
-    selectFeatureInteraction.clear();
-    obliqueImageChangedListener();
-    const { activeMap } = app.maps;
-    if (activeMap instanceof ObliqueMap) {
-      obliqueMap = activeMap;
-      obliqueImageChangedListener = /** @type {ObliqueMap} */ (activeMap).imageChanged
-        .addEventListener(() => {
-          selectFeatureInteraction.clear();
-        });
-    } else {
-      obliqueMap = null;
-      obliqueImageChangedListener = () => {};
-    }
+    createCurrentInteractionSet(null);
   };
   const mapActivatedListener = app.maps.mapActivated.addEventListener(setupActiveMap);
   setupActiveMap();
 
   const stop = () => {
     app.layers.remove(scratchLayer);
-    obliqueImageChangedListener();
     mapActivatedListener();
     mapInteractionController.reset();
     mouseOverInteraction.reset();
@@ -396,9 +413,14 @@ function startEditGeometrySession(app, layer) {
 
   return {
     type: SessionType.EDIT_GEOMETRY,
-    featureSelection: selectFeatureInteraction,
     stopped,
     stop,
+    setFeature(feature) {
+      createCurrentInteractionSet(feature);
+    },
+    get feature() {
+      return currentFeature;
+    },
   };
 }
 

package/src/util/editor/editorHelpers.js

@@ -13,6 +13,7 @@ import { getFlatCoordinatesFromGeometry } from '../geometryHelpers.js';
 import CesiumMap from '../../map/cesiumMap.js';
 import { vertexSymbol } from './editorSymbols.js';
 import Vector from '../../layer/vectorLayer.js';
+import { createSync } from '../../layer/vectorSymbols.js';
 
 /**
  * @param {import("ol/coordinate").Coordinate} coordinate
@@ -26,6 +27,7 @@ export function createVertex(coordinate) {
   });
   vertex[vertexSymbol] = true;
   vertex[Vector.doNotTransform] = true;
+  vertex[createSync] = true;
   return vertex;
 }
 
@@ -193,7 +195,7 @@ export async function placeGeometryOnTerrain(geometry, map) {
  * @param {import("@vcmap/core").VcsMap} cesiumMap
  * @returns {Promise<void>}
  */
-export async function ensureFeatureAbsolute(feature, layer, cesiumMap) {
+export async function ensureFeatureAbsolute(feature, layer, cesiumMap) { // XXX this does not ensure 3D coordinates
   const layerIsClamped = layer.vectorProperties.altitudeMode === HeightReference.CLAMP_TO_GROUND;
   const altitudeMode = feature.get('olcs_altitudeMode');
   if (altitudeMode === 'clampToGround' || (!altitudeMode && layerIsClamped)) {

package/src/util/editor/editorSessionHelpers.js

@@ -4,7 +4,7 @@ import InteractionChain from '../../interaction/interactionChain.js';
 import VcsEvent from '../../vcsEvent.js';
 import { EventType } from '../../interaction/interactionType.js';
 import { maxZIndex } from '../layerCollection.js';
-import { markVolatile } from '../../context.js';
+import { markVolatile } from '../../vcsModule.js';
 import { PrimitiveOptionsType } from '../../layer/vectorProperties.js';
 
 /**
@@ -23,11 +23,13 @@ import { PrimitiveOptionsType } from '../../layer/vectorProperties.js';
  * @property {string} CREATE
  * @property {string} EDIT_GEOMETRY
  * @property {string} EDIT_FEATURES
+ * @property {string} SELECT
  */
 export const SessionType = {
   CREATE: 'create',
   EDIT_GEOMETRY: 'editGeometry',
   EDIT_FEATURES: 'editFeatures',
+  SELECT: 'selectFeatures',
 };
 
 /**
@@ -77,16 +79,22 @@ export function setupScratchLayer(layerCollection) { // IDEA pass in stopped and
  * feature interaction to be active on CLICKMOVE & DRAGSTART. Destroying the setup will reset the interaction
  * to its previous active state.
  * @param {import("@vcmap/core").EventHandler} eventHandler
+ * @param {string} [interactionId]
  * @returns {{ interactionChain: InteractionChain, removed: VcsEvent<void>, destroy: function():void }}
  * @private
  */
-export function setupInteractionChain(eventHandler) {
+export function setupInteractionChain(eventHandler, interactionId) {
   const interactionChain = new InteractionChain();
   /**
    * @type {VcsEvent<void>}
    */
   const removed = new VcsEvent();
-  const listener = eventHandler.addExclusiveInteraction(interactionChain, () => { removed.raiseEvent(); });
+  const listener = eventHandler.addExclusiveInteraction(
+    interactionChain,
+    () => { removed.raiseEvent(); },
+    undefined,
+    interactionId,
+  );
   const currentFeatureInteractionEvent = eventHandler.featureInteraction.active;
   eventHandler.featureInteraction.setActive(EventType.CLICKMOVE | EventType.DRAGSTART);
 

package/src/util/editor/editorSymbols.js

@@ -14,3 +14,8 @@ export const vertexIndex = Symbol('VertexIndex');
  * @type {symbol}
  */
 export const handlerSymbol = Symbol('Handler');
+/**
+ * Symbol to identify which was the last editor mouse over handler that edited the cursor style.
+ * @type {symbol}
+ */
+export const mouseOverSymbol = Symbol('MouseOver');

package/src/util/editor/interactions/editFeaturesMouseOverInteraction.js

@@ -1,7 +1,6 @@
-import { handlerSymbol } from '../editorSymbols.js';
+import { handlerSymbol, mouseOverSymbol } from '../editorSymbols.js';
 import AbstractInteraction from '../../../interaction/abstractInteraction.js';
 import { ModificationKeyType, EventType } from '../../../interaction/interactionType.js';
-import { vcsLayerName } from '../../../layer/layerSymbols.js';
 import { cursorMap } from './editGeometryMouseOverInteraction.js';
 
 /**
@@ -10,27 +9,13 @@ import { cursorMap } from './editGeometryMouseOverInteraction.js';
  * @extends {AbstractInteraction}
  */
 class EditFeaturesMouseOverInteraction extends AbstractInteraction {
-  /**
-   * @param {string} layerName - the layer name of the currently editing layer
-   * @param {import("@vcmap/core").SelectMultiFeatureInteraction} selectMultiFeatureInteraction
-   */
-  constructor(layerName, selectMultiFeatureInteraction) {
-    super(EventType.MOVE, ModificationKeyType.ALL);
+  constructor() {
+    super(EventType.MOVE, ModificationKeyType.NONE);
     /**
      * @type {import("ol").Feature|import("@vcmap-cesium/engine").Cesium3DTileFeature|import("@vcmap-cesium/engine").Cesium3DTilePointFeature|null}
      * @private
      */
-    this._lastFeature = null;
-    /**
-     * @type {import("@vcmap/core").SelectMultiFeatureInteraction}
-     * @private
-     */
-    this._selectMultiFeatureInteraction = selectMultiFeatureInteraction;
-    /**
-     * The layer name to react to
-     * @type {string}
-     */
-    this.layerName = layerName;
+    this._currentHandler = null;
     /**
      * @type {CSSStyleDeclaration}
      */
@@ -46,26 +31,17 @@ class EditFeaturesMouseOverInteraction extends AbstractInteraction {
    */
   async pipe(event) {
     if (
-      event.feature &&
-      (event.feature[vcsLayerName] === this.layerName || event.feature[handlerSymbol])
+      event.feature && event.feature[handlerSymbol]
     ) {
-      this._lastFeature = /** @type {import("ol").Feature|import("@vcmap-cesium/engine").Cesium3DTileFeature|import("@vcmap-cesium/engine").Cesium3DTilePointFeature} */
+      this._currentHandler = /** @type {import("ol").Feature|import("@vcmap-cesium/engine").Cesium3DTileFeature|import("@vcmap-cesium/engine").Cesium3DTilePointFeature} */
         (event.feature);
     } else {
-      this._lastFeature = null;
+      this._currentHandler = null;
     }
-    this._evaluate(event.key);
+    this._evaluate();
     return event;
   }
 
-  /**
-   * @inheritDoc
-   * @param {ModificationKeyType} modifier
-   */
-  modifierChanged(modifier) {
-    this._evaluate(modifier);
-  }
-
   /**
    * @inheritDoc
    * @param {(boolean|number)=} active
@@ -85,26 +61,15 @@ class EditFeaturesMouseOverInteraction extends AbstractInteraction {
   }
 
   /**
-   * @param {ModificationKeyType} modifier
    * @private
    */
-  _evaluate(modifier) {
-    if (this._lastFeature) {
-      if (this._lastFeature[handlerSymbol]) {
-        this.cursorStyle.cursor = cursorMap.select;
-      } else if (modifier === ModificationKeyType.CTRL) {
-        if (!this._selectMultiFeatureInteraction.hasFeatureId(/** @type {string} */ (this._lastFeature.getId()))) {
-          this.cursorStyle.cursor = cursorMap.addToSelection;
-        } else {
-          this.cursorStyle.cursor = cursorMap.removeFromSelection;
-        }
-      } else if (!this._selectMultiFeatureInteraction.hasFeatureId(/** @type {string} */ (this._lastFeature.getId()))) {
-        this.cursorStyle.cursor = cursorMap.select;
-      } else {
-        this.cursorStyle.cursor = cursorMap.auto;
-      }
-    } else {
+  _evaluate() {
+    if (this._currentHandler) {
+      this.cursorStyle.cursor = cursorMap.translate;
+      this.cursorStyle[mouseOverSymbol] = this.id;
+    } else if (this.cursorStyle?.[mouseOverSymbol] === this.id) {
       this.cursorStyle.cursor = cursorMap.auto;
+      delete this.cursorStyle[mouseOverSymbol];
     }
   }
 
@@ -112,6 +77,7 @@ class EditFeaturesMouseOverInteraction extends AbstractInteraction {
    * @inheritDoc
    */
   destroy() {
+    this.reset();
     this.cursorStyle = null;
     super.destroy();
   }

package/src/util/editor/interactions/editGeometryMouseOverInteraction.js

@@ -1,10 +1,8 @@
-import { vertexSymbol } from '../editorSymbols.js';
+import { mouseOverSymbol, vertexSymbol } from '../editorSymbols.js';
 import AbstractInteraction from '../../../interaction/abstractInteraction.js';
 import { ModificationKeyType, EventType } from '../../../interaction/interactionType.js';
-import { vcsLayerName } from '../../../layer/layerSymbols.js';
 
 /**
- * only exported for tests
  * @type {Object}
  */
 export const cursorMap = { // TODO these can now be designed custom. IE11 no linger required
@@ -16,7 +14,7 @@ export const cursorMap = { // TODO these can now be designed custom. IE11 no lin
   select: 'pointer',
   edit: 'pointer', // fa pencil
   translateVertex: 'move', // fa-stack pointer-move
-  removeVertex: 'pointer', // fa-stack pencil-minus
+  removeVertex: 'no-drop', // fa-stack pencil-minus
   insertVertex: 'cell', // fa-stack pencil-plus
   addToSelection: 'cell', // fa-stack pointer-black
   removeFromSelection: 'not-allowed',
@@ -28,21 +26,13 @@ export const cursorMap = { // TODO these can now be designed custom. IE11 no lin
  * @extends {AbstractInteraction}
  */
 class EditGeometryMouseOverInteraction extends AbstractInteraction {
-  /**
-   * @param {string} layerName - the layer name of the currently editing layer
-   */
-  constructor(layerName) {
-    super(EventType.MOVE, ModificationKeyType.ALL);
+  constructor() {
+    super(EventType.MOVE, ModificationKeyType.NONE | ModificationKeyType.SHIFT);
     /**
      * @type {import("ol").Feature|import("@vcmap-cesium/engine").Cesium3DTileFeature|import("@vcmap-cesium/engine").Cesium3DTilePointFeature|null}
      * @private
      */
-    this._lastFeature = null;
-    /**
-     * The layer name to react to
-     * @type {string}
-     */
-    this.layerName = layerName;
+    this._currentVertex = null;
     /**
      * @type {CSSStyleDeclaration}
      */
@@ -57,17 +47,11 @@ class EditGeometryMouseOverInteraction extends AbstractInteraction {
    * @returns {Promise<InteractionEvent>}
    */
   async pipe(event) {
-    if (
-      event.feature &&
-      (
-        event.feature[vcsLayerName] === this.layerName ||
-        event.feature[vertexSymbol]
-      )
-    ) {
-      this._lastFeature = /** @type {import("ol").Feature|import("@vcmap-cesium/engine").Cesium3DTileFeature|import("@vcmap-cesium/engine").Cesium3DTilePointFeature} */
+    if (event.feature && event.feature[vertexSymbol]) {
+      this._currentVertex = /** @type {import("ol").Feature|import("@vcmap-cesium/engine").Cesium3DTileFeature|import("@vcmap-cesium/engine").Cesium3DTilePointFeature} */
         (event.feature);
     } else {
-      this._lastFeature = null;
+      this._currentVertex = null;
     }
     this._evaluate(event.key);
     return event;
@@ -104,18 +88,16 @@ class EditGeometryMouseOverInteraction extends AbstractInteraction {
    * @private
    */
   _evaluate(modifier) {
-    if (this._lastFeature) {
-      if (this._lastFeature[vertexSymbol]) {
-        if (modifier === ModificationKeyType.SHIFT) {
-          this.cursorStyle.cursor = cursorMap.removeVertex;
-        } else {
-          this.cursorStyle.cursor = cursorMap.translateVertex;
-        }
+    if (this._currentVertex) {
+      if (modifier === ModificationKeyType.SHIFT) {
+        this.cursorStyle.cursor = cursorMap.removeVertex;
       } else {
-        this.cursorStyle.cursor = cursorMap.select;
+        this.cursorStyle.cursor = cursorMap.translateVertex;
       }
-    } else {
+      this.cursorStyle[mouseOverSymbol] = this.id;
+    } else if (this.cursorStyle?.[mouseOverSymbol] === this.id) {
       this.cursorStyle.cursor = cursorMap.auto;
+      delete this.cursorStyle[mouseOverSymbol];
     }
   }
 
@@ -123,6 +105,7 @@ class EditGeometryMouseOverInteraction extends AbstractInteraction {
    * @inheritDoc
    */
   destroy() {
+    this.reset();
     this.cursorStyle = null;
     super.destroy();
   }

package/src/util/editor/interactions/ensureHandlerSelectionInteraction.js

@@ -11,15 +11,15 @@ import CesiumMap from '../../../map/cesiumMap.js';
  */
 class EnsureHandlerSelectionInteraction extends AbstractInteraction {
   /**
-   * @param {import("@vcmap/core").SelectMultiFeatureInteraction} selectMultiFeatureInteraction
+   * @param {Array<import("ol").Feature>} selectedFeatures Reference to the selected features.
    */
-  constructor(selectMultiFeatureInteraction) {
+  constructor(selectedFeatures) {
     super(EventType.DRAGSTART | EventType.MOVE);
     /**
-     * @type {import("@vcmap/core").SelectMultiFeatureInteraction}
+     * @type {Array<import("ol").Feature>}
      * @private
      */
-    this._featureSelection = selectMultiFeatureInteraction;
+    this._featureSelection = selectedFeatures;
   }
 
   /**
@@ -29,7 +29,7 @@ class EnsureHandlerSelectionInteraction extends AbstractInteraction {
   async pipe(event) {
     if (
       event.feature &&
-      this._featureSelection.selectedFeatures.length > 0 &&
+      this._featureSelection.length > 0 &&
       !event.feature[handlerSymbol] &&
       event.map instanceof CesiumMap
     ) {