@vcmap/core 6.0.0-rc.8 → 6.0.0

package/src/map/cesiumMap.ts

@@ -37,6 +37,7 @@ import {
   type DataSource,
   type Visualizer,
   type ShadowMap,
+  type ContextOptions,
 } from '@vcmap-cesium/engine';
 import type { Coordinate } from 'ol/coordinate.js';
 
@@ -89,6 +90,12 @@ export type CesiumMapOptions = VcsMapOptions & {
    * Cesium Default is 2.0
    */
   lightIntensity?: number;
+
+  /**
+   * can be used to forward contextOptions to the CesiumWidget
+   * https://cesium.com/learn/cesiumjs/ref-doc/global.html#ContextOptions
+   */
+  contextOptions?: ContextOptions;
 };
 
 export type CesiumMapEvent = {
@@ -297,6 +304,7 @@ class CesiumMap extends VcsMap<CesiumVisualisationType> {
       globeColor: '#3f47cc',
       useOriginalCesiumShader: false,
       lightIntensity: 3.0,
+      contextOptions: undefined,
     };
   }
 
@@ -368,6 +376,8 @@ class CesiumMap extends VcsMap<CesiumVisualisationType> {
 
   private _lightIntensity: number;
 
+  private _contextOptions: ContextOptions | undefined;
+
   constructor(options: CesiumMapOptions) {
     super(options);
 
@@ -438,6 +448,8 @@ class CesiumMap extends VcsMap<CesiumVisualisationType> {
       options.lightIntensity,
       defaultOptions.lightIntensity,
     );
+
+    this._contextOptions = structuredClone(options.contextOptions);
   }
 
   /**
@@ -468,6 +480,10 @@ class CesiumMap extends VcsMap<CesiumVisualisationType> {
     }
   }
 
+  get defaultShadowMap(): ShadowMap | null {
+    return this._defaultShadowMap;
+  }
+
   get terrainProvider(): TerrainProvider | null {
     return this._terrainProvider;
   }
@@ -656,6 +672,13 @@ class CesiumMap extends VcsMap<CesiumVisualisationType> {
           'Cannot activate Original Cesium Shader, flag to use VCS Shader is already set by another Cesium Map or VCMap Instance',
         );
       }
+      const contextOptions = {
+        ...this._contextOptions,
+        webgl: {
+          ...this._contextOptions?.webgl,
+          antialias: this.webGLaa,
+        },
+      };
       this._cesiumWidget = new CesiumWidget(this.mapElement, {
         requestRenderMode: false,
         scene3DOnly: true,
@@ -664,12 +687,7 @@ class CesiumMap extends VcsMap<CesiumVisualisationType> {
         baseLayer: false,
         shadows: false,
         terrainShadows: ShadowMode.ENABLED,
-        contextOptions: {
-          webgl: {
-            failIfMajorPerformanceCaveat: false,
-            antialias: this.webGLaa,
-          },
-        },
+        contextOptions,
       });
       this._cesiumWidget.scene.globe.tileCacheSize = this.tileCacheSize;
       this._cesiumWidget.scene.globe.baseColor = this.globeColor;
@@ -1400,6 +1418,10 @@ class CesiumMap extends VcsMap<CesiumVisualisationType> {
       config.useOriginalCesiumShader = this.useOriginalCesiumShader;
     }
 
+    if (this._contextOptions !== defaultOptions.contextOptions) {
+      config.contextOptions = structuredClone(this._contextOptions);
+    }
+
     return config;
   }
 

package/src/ol/feature.ts

@@ -44,6 +44,16 @@ Feature.prototype.getProperty = function getProperty(
   return this.get(property);
 };
 
+Feature.prototype.getAttributes = function getAttributes(
+  this: Feature,
+): Record<string, unknown> {
+  const properties = this.getProperties();
+  if (this.getGeometryName()) {
+    delete properties[this.getGeometryName()];
+  }
+  return properties;
+};
+
 /**
  * To be used for cesium 3D style functions
  * @param {string} property

package/src/ol/ol.d.ts

@@ -95,6 +95,7 @@ declare module 'ol/index.js' {
   interface Feature<Geometry> {
     getProperty(key: string): any;
     getPropertyInherited(key: string): any;
+    getAttributes(): Record<string, unknown>;
     [vcsLayerName]?: string;
     [originalFeatureSymbol]?: Feature<Geometry>;
     [vectorStyleSymbol]?: VectorStyleItem;

package/src/style/declarativeStyleItem.ts

@@ -17,11 +17,7 @@ import Fill from 'ol/style/Fill.js';
 import type { Feature } from 'ol/index.js';
 
 import StyleItem, { type StyleItemOptions } from './styleItem.js';
-import {
-  cesiumColorToColor,
-  getDefaultCondition,
-  whiteColor,
-} from './styleHelpers.js';
+import { cesiumColorToColor, whiteColor } from './styleHelpers.js';
 import { originalFeatureSymbol } from '../layer/vectorSymbols.js';
 import { styleClassRegistry } from '../classRegistry.js';
 import { isSameOrigin } from '../util/urlHelpers.js';
@@ -507,70 +503,4 @@ styleClassRegistry.registerClass(
   DeclarativeStyleItem,
 );
 
-export const defaultDeclarativeStyle = new DeclarativeStyleItem({
-  declarativeStyle: {
-    show: true,
-    color: {
-      conditions: getDefaultCondition('olcs_color', true),
-    },
-    scale: {
-      conditions: getDefaultCondition('olcs_scale'),
-    },
-    pointOutlineWidth: {
-      conditions: getDefaultCondition('olcs_outlineWidth'),
-    },
-    pointOutlineColor: {
-      conditions: getDefaultCondition('olcs_outlineColor', true),
-    },
-    pointSize: {
-      conditions: getDefaultCondition('olcs_pointSize'),
-    },
-    image: {
-      conditions: getDefaultCondition('olcs_image'),
-    },
-    font: {
-      conditions: getDefaultCondition('olcs_font'),
-    },
-    labelStyle: '2',
-    labelText: {
-      conditions: getDefaultCondition('olcs_labelText'),
-    },
-    labelColor: {
-      conditions: getDefaultCondition('olcs_fontColor', true),
-    },
-    labelOutlineWidth: {
-      conditions: getDefaultCondition('olcs_fontOutlineWidth'),
-    },
-    labelOutlineColor: {
-      conditions: getDefaultCondition('olcs_fontOutlineColor', true),
-    },
-    /*
-    anchorLineEnabled: {
-      conditions: [
-        [
-          defaultExtrudedHeightCondition,
-          'true',
-        ],
-        ['true', 'false'],
-      ],
-    },
-    anchorLineColor: {
-      conditions: getDefaultCondition('olcs_anchorLineColor', true),
-    },
-    heightOffset: {
-      conditions: [
-        [
-          defaultExtrudedHeightCondition,
-          // eslint-disable-next-line no-template-curly-in-string
-          '${attributes.olcs_extrudedHeight}',
-        ],
-        ['true', '0'],
-      ],
-    },
-    */
-    verticalOrigin: '1',
-    horizontalOrigin: '0',
-    labelHorizontalOrigin: '0',
-    labelVerticalOrigin: '1',
-  },
-});
+export const defaultDeclarativeStyle = new DeclarativeStyleItem({});

package/src/util/displayQuality/displayQuality.ts

@@ -20,6 +20,7 @@ export type DisplayQualityViewModelOptions = {
   fogScreenSpaceErrorFactor?: number;
   resolutionScale?: number;
   layerSSEFactor?: number;
+  msaa?: 1 | 2 | 4 | 8;
 };
 
 export type DisplayQualityLayerModel = {
@@ -55,6 +56,7 @@ class DisplayQuality {
         fogScreenSpaceErrorFactor: 6,
         resolutionScale: 0.9,
         layerSSEFactor: 2,
+        msaa: 1,
       },
       medium: {
         sse: 2.333,
@@ -64,6 +66,7 @@ class DisplayQuality {
         fogScreenSpaceErrorFactor: 4,
         resolutionScale: 1,
         layerSSEFactor: 1.1,
+        msaa: 1,
       },
       high: {
         sse: 4 / 3,
@@ -73,6 +76,7 @@ class DisplayQuality {
         fogScreenSpaceErrorFactor: 0,
         resolutionScale: 1,
         layerSSEFactor: 0.5,
+        msaa: 4,
       },
     };
   }
@@ -172,7 +176,12 @@ class DisplayQuality {
               key,
               Object.fromEntries(
                 Object.entries(value as Record<string, unknown>).filter(
-                  ([, v]) => v != null,
+                  ([innerKey, v]) => {
+                    if (innerKey === 'msaa') {
+                      return ([1, 2, 4, 8] as Array<unknown>).includes(v);
+                    }
+                    return v != null;
+                  },
                 ),
               ),
             ];
@@ -245,6 +254,9 @@ class DisplayQuality {
       viewer.scene.fog.density = this._viewModel.fogDensity!;
       viewer.scene.fog.screenSpaceErrorFactor =
         this._viewModel.fogScreenSpaceErrorFactor!;
+      if (this._viewModel.msaa) {
+        viewer.scene.msaaSamples = this._viewModel.msaa;
+      }
     }
 
     if (this._currentQualityLevel !== previousLevel) {

package/src/util/editor/createFeatureSession.ts

@@ -4,7 +4,7 @@ import type { Geometry, LineString, Polygon } from 'ol/geom.js';
 import { unByKey } from 'ol/Observable.js';
 import VcsEvent from '../../vcsEvent.js';
 import {
-  createPickingBehavior,
+  setupPickingBehavior,
   EditorSession,
   GeometryToType,
   GeometryType,
@@ -28,6 +28,7 @@ import CreationSnapping from './interactions/creationSnapping.js';
 import { syncScratchLayerVectorProperties } from './editorHelpers.js';
 import LayerSnapping from './interactions/layerSnapping.js';
 import { SnapType, snapTypes } from './snappingHelpers.js';
+import SegmentLengthInteraction from './interactions/segmentLengthInteraction.js';
 
 export type CreateFeatureSession<T extends GeometryType> =
   EditorSession<SessionType.CREATE> & {
@@ -89,6 +90,12 @@ export interface CreateInteraction<T extends Geometry> {
   destroy(): void;
 }
 
+export type CreateFeatureSessionOptions = {
+  initialSnapToLayers?: VectorLayer[];
+  snapTo?: SnapType[];
+  hideSegmentLength?: boolean;
+};
+
 /**
  * Creates an editor session to create features of the given geometry type.
  * While the session is active: Do not change the geometry on the current feature (the last created one)
@@ -96,9 +103,8 @@ export interface CreateInteraction<T extends Geometry> {
  * @param  app
  * @param  layer
  * @param  geometryType
- * @param initialAltitudeMode - whether to use the layers altitude mode or set this on the feature
- * @param [initialSnapToLayers=[layer]] - the layers to initially snap to. defaults to the provided layer
- * @param [snapTo] - what to snap to, by default all snaps are active
+ * @param [initialAltitudeMode] - whether to use the layers altitude mode or set this on the feature
+ * @param [options]
  * @group Editor
  */
 function startCreateFeatureSession<T extends GeometryType>(
@@ -106,13 +112,15 @@ function startCreateFeatureSession<T extends GeometryType>(
   layer: VectorLayer,
   geometryType: T,
   initialAltitudeMode?: AltitudeModeType,
-  initialSnapToLayers: VectorLayer[] = [layer],
-  snapTo: SnapType[] = [...snapTypes],
+  options?: CreateFeatureSessionOptions,
 ): CreateFeatureSession<T> {
   check(app, VcsApp);
   check(layer, VectorLayer);
   check(geometryType, ofEnum(GeometryType));
 
+  const snapTo = options?.snapTo ?? [...snapTypes];
+  const showSegmentLength = !options?.hideSegmentLength;
+
   const {
     interactionChain,
     removed: interactionRemoved,
@@ -129,7 +137,10 @@ function startCreateFeatureSession<T extends GeometryType>(
   let currentFeature: Feature<GeometryToType<T>> | null = null;
   let snappingInteraction: CreationSnapping | null = null;
   let layerSnappingInteraction: LayerSnapping | null = null;
-  let snapToLayers: VectorLayer[] = initialSnapToLayers?.slice() ?? [];
+  let segmentLengthInteraction: SegmentLengthInteraction | null = null;
+  let snapToLayers: VectorLayer[] = options?.initialSnapToLayers?.slice() ?? [
+    layer,
+  ];
 
   /**
    * Ture if the currently active map is an ObliqueMap. set in setupActiveMap
@@ -137,16 +148,14 @@ function startCreateFeatureSession<T extends GeometryType>(
   let isOblique = false;
 
   let featureAltitudeMode = initialAltitudeMode;
-  const pickingBehavior = createPickingBehavior(app);
+  const resetPickingBehavior = setupPickingBehavior(app);
 
   const altitudeModeChanged = (): void => {
     const altitudeModeFeature =
       currentFeature ?? new Feature({ olcs_altitudeMode: featureAltitudeMode });
-    const altitudeModeInUse =
-      layer.vectorProperties.getAltitudeMode(altitudeModeFeature);
 
-    scratchLayer.vectorProperties.altitudeMode = altitudeModeInUse;
-    pickingBehavior.setForAltitudeMode(altitudeModeInUse);
+    scratchLayer.vectorProperties.altitudeMode =
+      layer.vectorProperties.getAltitudeMode(altitudeModeFeature);
   };
 
   const vectorPropertiesListener = syncScratchLayerVectorProperties(
@@ -179,6 +188,11 @@ function startCreateFeatureSession<T extends GeometryType>(
       layerSnappingInteraction.destroy();
       layerSnappingInteraction = null;
     }
+    if (segmentLengthInteraction) {
+      interactionChain.removeInteraction(segmentLengthInteraction);
+      segmentLengthInteraction.destroy();
+      segmentLengthInteraction = null;
+    }
     interactionListeners.forEach((cb) => {
       cb();
     });
@@ -201,6 +215,19 @@ function startCreateFeatureSession<T extends GeometryType>(
       snappingInteraction = new CreationSnapping(scratchLayer, snapTo);
     }
 
+    if (
+      showSegmentLength &&
+      (geometryType === GeometryType.Polygon ||
+        geometryType === GeometryType.LineString ||
+        geometryType === GeometryType.BBox ||
+        geometryType === GeometryType.Circle)
+    ) {
+      segmentLengthInteraction = new SegmentLengthInteraction(
+        scratchLayer,
+        true,
+      );
+    }
+
     interactionListeners = [
       currentInteraction.created.addEventListener((geometry) => {
         if (isOblique) {
@@ -213,6 +240,7 @@ function startCreateFeatureSession<T extends GeometryType>(
         if (featureAltitudeMode) {
           currentFeature.set('olcs_altitudeMode', featureAltitudeMode);
         }
+        currentFeature.set('olcs_allowPicking', false);
         const propChangeListener = currentFeature.on(
           'propertychange',
           (event) => {
@@ -229,6 +257,11 @@ function startCreateFeatureSession<T extends GeometryType>(
         if (snappingInteraction) {
           snappingInteraction.setGeometry(geometry as LineString | Polygon);
         }
+        if (segmentLengthInteraction) {
+          segmentLengthInteraction.setGeometry(
+            geometry as LineString | Polygon,
+          );
+        }
       }),
       currentInteraction.finished.addEventListener((geometry) => {
         if (isOblique) {
@@ -236,6 +269,7 @@ function startCreateFeatureSession<T extends GeometryType>(
         }
         if (currentFeature) {
           delete currentFeature[createSync];
+          currentFeature.set('olcs_allowPicking', true);
           if (
             !geometry ||
             currentFeature.getGeometry() !== geometry ||
@@ -256,11 +290,15 @@ function startCreateFeatureSession<T extends GeometryType>(
         }
       }),
     ];
+
     interactionChain.addInteraction(layerSnappingInteraction);
     if (snappingInteraction) {
       interactionChain.addInteraction(snappingInteraction);
     }
     interactionChain.addInteraction(currentInteraction);
+    if (segmentLengthInteraction) {
+      interactionChain.addInteraction(segmentLengthInteraction);
+    }
   };
   createInteraction();
 
@@ -313,7 +351,7 @@ function startCreateFeatureSession<T extends GeometryType>(
     destroyInteractionChain();
     currentFeatureListener();
     vectorPropertiesListener();
-    pickingBehavior.reset();
+    resetPickingBehavior();
 
     stopped.raiseEvent();
     stopped.destroy();

package/src/util/editor/editGeometrySession.ts

@@ -11,7 +11,7 @@ import type {
 } from 'ol/geom.js';
 import { EventsKey } from 'ol/events.js';
 import {
-  createPickingBehavior,
+  setupPickingBehavior,
   EditorSession,
   GeometryType,
   SessionType,
@@ -45,6 +45,7 @@ import { vertexIndexSymbol } from './editorSymbols.js';
 import LayerSnapping from './interactions/layerSnapping.js';
 import { EventType } from '../../interaction/interactionType.js';
 import { SnapType, snapTypes } from './snappingHelpers.js';
+import SegmentLengthInteraction from './interactions/segmentLengthInteraction.js';
 
 export type EditGeometrySession = EditorSession<SessionType.EDIT_GEOMETRY> & {
   setFeature(feature?: Feature): void;
@@ -57,11 +58,12 @@ type EditGeometryInteraction = {
   destroy(): void;
 };
 
-type EditGeometrySessionOptions = {
+export type EditGeometrySessionOptions = {
   denyInsertion?: boolean;
   denyRemoval?: boolean;
   initialSnapToLayers?: VectorLayer[];
   snapTo?: SnapType[];
+  hideSegmentLength?: boolean;
 };
 
 function createEditLineStringGeometryInteraction(
@@ -91,6 +93,12 @@ function createEditLineStringGeometryInteraction(
     translateVertex,
   ];
 
+  if (!options.hideSegmentLength) {
+    const segmentLength = new SegmentLengthInteraction(scratchLayer, false);
+    segmentLength.setGeometry(geometry);
+    interactions.push(segmentLength);
+  }
+
   if (!options.denyInsertion) {
     const insertVertex = new InsertVertexInteraction(
       feature,
@@ -137,6 +145,7 @@ function createEditLineStringGeometryInteraction(
 function createEditCircleGeometryInteraction(
   feature: Feature<Circle>,
   scratchLayer: VectorLayer,
+  options: EditGeometrySessionOptions,
 ): EditGeometryInteraction {
   const geometry =
     feature[obliqueGeometry] ?? (feature.getGeometry() as Circle);
@@ -175,7 +184,14 @@ function createEditCircleGeometryInteraction(
     }
   });
 
-  const interactionChain = new InteractionChain([translateVertex]);
+  const interactions: AbstractInteraction[] = [translateVertex];
+  if (!options.hideSegmentLength) {
+    const segmentLength = new SegmentLengthInteraction(scratchLayer, false);
+    segmentLength.setGeometry(geometry);
+    interactions.push(segmentLength);
+  }
+
+  const interactionChain = new InteractionChain(interactions);
 
   return {
     interactionChain,
@@ -192,6 +208,7 @@ function createEditCircleGeometryInteraction(
 function createEditBBoxGeometryInteraction(
   feature: Feature<Polygon>,
   scratchLayer: VectorLayer,
+  options: EditGeometrySessionOptions,
 ): EditGeometryInteraction {
   const geometry =
     feature[obliqueGeometry] ?? (feature.getGeometry() as Polygon);
@@ -255,7 +272,16 @@ function createEditBBoxGeometryInteraction(
       });
     }
   });
-  const interactionChain = new InteractionChain([translateVertex]);
+
+  const interactions: AbstractInteraction[] = [translateVertex];
+
+  if (!options.hideSegmentLength) {
+    const segmentLength = new SegmentLengthInteraction(scratchLayer, false);
+    segmentLength.setGeometry(geometry);
+    interactions.push(segmentLength);
+  }
+
+  const interactionChain = new InteractionChain(interactions);
 
   return {
     interactionChain,
@@ -300,6 +326,12 @@ function createEditSimplePolygonInteraction(
     translateVertex,
   ];
 
+  if (!options.hideSegmentLength) {
+    const segmentLength = new SegmentLengthInteraction(scratchLayer, false);
+    segmentLength.setGeometry(geometry);
+    interactions.push(segmentLength);
+  }
+
   if (!options.denyInsertion) {
     const insertVertex = new InsertVertexInteraction(
       feature,
@@ -429,14 +461,11 @@ function startEditGeometrySession(
 
   const snapTo = editVertexOptions?.snapTo ?? [...snapTypes];
 
-  const pickingBehavior = createPickingBehavior(app);
+  const resetPickingBehavior = setupPickingBehavior(app);
   const altitudeModeChanged = (): void => {
-    const altitudeMode = currentFeature
+    scratchLayer.vectorProperties.altitudeMode = currentFeature
       ? layer.vectorProperties.getAltitudeMode(currentFeature)
       : layer.vectorProperties.altitudeMode;
-
-    scratchLayer.vectorProperties.altitudeMode = altitudeMode;
-    pickingBehavior.setForAltitudeMode(altitudeMode);
   };
   altitudeModeChanged();
 
@@ -496,6 +525,7 @@ function startEditGeometrySession(
           currentInteractionSet = createEditBBoxGeometryInteraction(
             feature as Feature<Polygon>,
             scratchLayer,
+            editVertexOptions,
           );
         } else if ((geometry as Polygon).getLinearRingCount() === 1) {
           currentInteractionSet = createEditSimplePolygonInteraction(
@@ -524,6 +554,7 @@ function startEditGeometrySession(
         currentInteractionSet = createEditCircleGeometryInteraction(
           feature as Feature<Circle>,
           scratchLayer,
+          editVertexOptions,
         );
       }
 
@@ -572,7 +603,7 @@ function startEditGeometrySession(
     destroyCurrentInteractionSet();
     destroyInteractionChain();
     vectorPropertiesChangedListener();
-    pickingBehavior.reset();
+    resetPickingBehavior();
     stopped.raiseEvent();
     stopped.destroy();
   };

package/src/util/editor/editorHelpers.ts

@@ -17,6 +17,7 @@ import {
   type Camera,
 } from '@vcmap-cesium/engine';
 
+import { getLogger } from '@vcsuite/logger';
 import { mercatorToCartesian } from '../math.js';
 import { getFlatCoordinateReferences } from '../geometryHelpers.js';
 import CesiumMap from '../../map/cesiumMap.js';
@@ -123,6 +124,10 @@ export function createVertex(
   return vertex;
 }
 
+export function isVertex(f?: unknown): f is Vertex {
+  return f instanceof Feature && !!f[vertexSymbol];
+}
+
 export function getCoordinatesAndLayoutFromVertices(vertices: Vertex[]): {
   coordinates: Coordinate[];
   layout: GeometryLayout;
@@ -363,6 +368,10 @@ export async function drapeGeometryOnTerrain(
   geometry: Geometry,
   map: VcsMap,
 ): Promise<void> {
+  getLogger('editor helpers').deprecate(
+    'drapeGeometryOnTerrain',
+    'drapeGeometryOnTerrain is deprecated and will be removed in 6.1. Use drapeGeometryOnSurface instead.',
+  );
   if (map instanceof CesiumMap) {
     const coordinates = geometry.getCoordinates() as any[];
     const flats = getFlatCoordinateReferences(geometry, coordinates);
@@ -380,6 +389,10 @@ export async function placeGeometryOnTerrain(
   geometry: Geometry,
   map: VcsMap,
 ): Promise<void> {
+  getLogger('editor helpers').deprecate(
+    'placeGeometryOnTerrain',
+    'place geometry on terrain is deprecated and will be removed in 6.1. Use placeGeometryOnSurface instead.',
+  );
   if (map instanceof CesiumMap) {
     const coordinates = geometry.getCoordinates() as any[];
     const flats = getFlatCoordinateReferences(geometry, coordinates);

package/src/util/editor/editorSessionHelpers.ts

@@ -1,5 +1,4 @@
 import type { Point, Polygon, Circle, LineString } from 'ol/geom.js';
-import { HeightReference } from '@vcmap-cesium/engine';
 import VectorLayer from '../../layer/vectorLayer.js';
 import { mercatorProjection } from '../projection.js';
 import InteractionChain from '../../interaction/interactionChain.js';
@@ -145,27 +144,14 @@ export type GeometryToType<T extends GeometryType> =
     ? Circle
     : never;
 
-export type PickingBehavior = {
-  setForAltitudeMode(altitudeMode: HeightReference): void;
-  reset(): void;
-};
-
-export function createPickingBehavior(app: VcsApp): PickingBehavior {
+export function setupPickingBehavior(app: VcsApp): () => void {
   const initialPickPosition =
     app.maps.eventHandler.featureInteraction.pickPosition;
 
-  return {
-    setForAltitudeMode(altitudeMode: HeightReference): void {
-      if (altitudeMode === HeightReference.NONE) {
-        app.maps.eventHandler.featureInteraction.pickPosition =
-          EventType.CLICKMOVE | EventType.DRAGEVENTS;
-      } else {
-        app.maps.eventHandler.featureInteraction.pickPosition = EventType.NONE;
-      }
-    },
-    reset(): void {
-      app.maps.eventHandler.featureInteraction.pickPosition =
-        initialPickPosition;
-    },
+  app.maps.eventHandler.featureInteraction.pickPosition =
+    EventType.CLICKMOVE | EventType.DRAGEVENTS;
+
+  return () => {
+    app.maps.eventHandler.featureInteraction.pickPosition = initialPickPosition;
   };
 }

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

@@ -1,4 +1,4 @@
-import { mouseOverSymbol, vertexSymbol } from '../editorSymbols.js';
+import { mouseOverSymbol } from '../editorSymbols.js';
 import AbstractInteraction, {
   EventAfterEventHandler,
 } from '../../../interaction/abstractInteraction.js';
@@ -6,7 +6,7 @@ import {
   ModificationKeyType,
   EventType,
 } from '../../../interaction/interactionType.js';
-import { Vertex } from '../editorHelpers.js';
+import { isVertex, Vertex } from '../editorHelpers.js';
 
 const pointerSvg = `<svg xmlns="http://www.w3.org/2000/svg" width="19" height="19" viewBox="0 0 19 19">
   <g id="pen">
@@ -56,8 +56,8 @@ class EditGeometryMouseOverInteraction extends AbstractInteraction {
   }
 
   pipe(event: EventAfterEventHandler): Promise<EventAfterEventHandler> {
-    if (event.feature && (event.feature as Vertex)[vertexSymbol]) {
-      this._currentVertex = event.feature as Vertex;
+    if (isVertex(event.feature)) {
+      this._currentVertex = event.feature;
     } else {
       this._currentVertex = null;
     }