@vcmap/core 5.1.0-rc.3 → 5.1.0

package/src/util/editor/editorSessionHelpers.ts

@@ -1,4 +1,5 @@
 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';
@@ -8,6 +9,7 @@ import LayerCollection, { maxZIndex } from '../layerCollection.js';
 import { markVolatile } from '../../vcsModule.js';
 import { PrimitiveOptionsType } from '../../layer/vectorProperties.js';
 import EventHandler from '../../interaction/eventHandler.js';
+import type VcsApp from '../../vcsApp.js';
 
 export enum SessionType {
   CREATE = 'create',
@@ -100,7 +102,7 @@ export function setupInteractionChain(
   );
   const currentFeatureInteractionEvent = eventHandler.featureInteraction.active;
   eventHandler.featureInteraction.setActive(
-    EventType.CLICKMOVE | EventType.DRAGSTART,
+    EventType.CLICKMOVE | EventType.DRAGEVENTS,
   );
 
   return {
@@ -135,3 +137,28 @@ export type GeometryToType<T extends GeometryType> =
     : T extends GeometryType.Circle
     ? Circle
     : never;
+
+export type PickingBehavior = {
+  setForAltitudeMode(altitudeMode: HeightReference): void;
+  reset(): void;
+};
+
+export function createPickingBehavior(app: VcsApp): PickingBehavior {
+  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;
+    },
+  };
+}

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

@@ -10,6 +10,7 @@ import {
 import { cartesian2DDistance } from '../../math.js';
 import {
   createVertex,
+  getOlcsPropsFromFeature,
   pointOnLine2D,
   pointOnLine3D,
   type Vertex,
@@ -74,7 +75,10 @@ class InsertVertexInteraction extends AbstractInteraction {
           index = 0;
         }
         this.vertexInserted.raiseEvent({
-          vertex: createVertex(closestCoord),
+          vertex: createVertex(
+            closestCoord,
+            getOlcsPropsFromFeature(this._feature),
+          ),
           index,
         });
       }

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

@@ -5,6 +5,7 @@ import { EventType } from '../../../interaction/interactionType.js';
 import { vertexSymbol } from '../editorSymbols.js';
 import VcsEvent from '../../../vcsEvent.js';
 import { Vertex } from '../editorHelpers.js';
+import { emptyStyle } from '../../../style/styleHelpers.js';
 
 /**
  * Class to translate a vertex. Will call the passed in vertex changed event with the changed vertex.
@@ -27,6 +28,7 @@ class TranslateVertexInteraction extends AbstractInteraction {
 
       if (event.type & EventType.DRAGEND) {
         this._vertex.unset('olcs_allowPicking');
+        this._vertex.setStyle(undefined);
         this._vertex = null;
       }
       event.stopPropagation = true;
@@ -37,6 +39,7 @@ class TranslateVertexInteraction extends AbstractInteraction {
     ) {
       this._vertex = event.feature as Vertex;
       this._vertex.set('olcs_allowPicking', false);
+      this._vertex.setStyle(emptyStyle);
       event.stopPropagation = true;
     }
     return Promise.resolve(event);

package/src/util/featureconverter/pointToCesium.ts

@@ -226,13 +226,7 @@ export function getCartesian3AndWGS84FromCoordinates(
     );
   coordinates.forEach((coord, index) => {
     wgs84Positions[index] = Projection.mercatorToWgs84(coord, true);
-    let height = null;
-    if (heightInfo.heightReference === HeightReference.RELATIVE_TO_GROUND) {
-      height = heightValue + heightInfo.heightAboveGroundAdjustment;
-    } else {
-      height = heightValue;
-    }
-    positions[index] = Cartesian3.fromDegrees(coord[0], coord[1], height);
+    positions[index] = Cartesian3.fromDegrees(coord[0], coord[1], heightValue);
   });
   return {
     positions,