@vcmap/core 5.0.0-rc.37 → 5.0.0-rc.39

package/src/layer/cesium/vectorContext.ts

@@ -301,6 +301,8 @@ class VectorContext implements CesiumVectorContext {
 
   featureToLabelMap: Map<Feature, Array<Label>> = new Map();
 
+  features: Set<Feature> = new Set();
+
   splitDirection: SplitDirection;
 
   private _rootCollection: PrimitiveCollection;
@@ -346,14 +348,16 @@ class VectorContext implements CesiumVectorContext {
     feature: Feature,
     allowPicking = false,
   ): void {
-    addPrimitiveToContext(
-      primitives,
-      feature,
-      allowPicking,
-      this.primitives,
-      this.featureToPrimitiveMap,
-      this.splitDirection,
-    );
+    if (this.features.has(feature)) {
+      addPrimitiveToContext(
+        primitives,
+        feature,
+        allowPicking,
+        this.primitives,
+        this.featureToPrimitiveMap,
+        this.splitDirection,
+      );
+    }
   }
 
   addScaledPrimitives(
@@ -367,15 +371,17 @@ class VectorContext implements CesiumVectorContext {
     feature: Feature,
     allowPicking = false,
   ): void {
-    addPrimitiveToContext(
-      primitives,
-      feature,
-      allowPicking,
-      this.scaledPrimitives,
-      this.featureToScaledPrimitiveMap,
-      this.splitDirection,
-    );
-    this._scaledDirty.value = true;
+    if (this.features.has(feature)) {
+      addPrimitiveToContext(
+        primitives,
+        feature,
+        allowPicking,
+        this.scaledPrimitives,
+        this.featureToScaledPrimitiveMap,
+        this.splitDirection,
+      );
+      this._scaledDirty.value = true;
+    }
   }
 
   addBillboards(
@@ -383,14 +389,16 @@ class VectorContext implements CesiumVectorContext {
     feature: Feature,
     allowPicking = false,
   ): void {
-    addPrimitiveToContext(
-      billboardOptions,
-      feature,
-      allowPicking,
-      this.billboards,
-      this.featureToBillboardMap,
-      this.splitDirection,
-    );
+    if (this.features.has(feature)) {
+      addPrimitiveToContext(
+        billboardOptions,
+        feature,
+        allowPicking,
+        this.billboards,
+        this.featureToBillboardMap,
+        this.splitDirection,
+      );
+    }
   }
 
   addLabels(
@@ -398,20 +406,23 @@ class VectorContext implements CesiumVectorContext {
     feature: Feature,
     allowPicking = false,
   ): void {
-    addPrimitiveToContext(
-      labelOptions,
-      feature,
-      allowPicking,
-      this.labels,
-      this.featureToLabelMap,
-      this.splitDirection,
-    );
+    if (this.features.has(feature)) {
+      addPrimitiveToContext(
+        labelOptions,
+        feature,
+        allowPicking,
+        this.labels,
+        this.featureToLabelMap,
+        this.splitDirection,
+      );
+    }
   }
 
   /**
    * @param  feature
    */
   removeFeature(feature: Feature): void {
+    this.features.delete(feature);
     removeFeatureFromMap(feature, this.featureToPrimitiveMap, this.primitives);
     this._scaledDirty.value = removeFeatureFromMap(
       feature,
@@ -472,6 +483,7 @@ class VectorContext implements CesiumVectorContext {
     this.featureToPrimitiveMap.clear();
     this._scaledDirty.value = this.featureToScaledPrimitiveMap.size > 0;
     this.featureToScaledPrimitiveMap.clear();
+    this.features.clear();
   }
 
   /**
@@ -490,6 +502,7 @@ class VectorContext implements CesiumVectorContext {
     this.featureToBillboardMap.clear();
     this.featureToLabelMap.clear();
     this.featureToPrimitiveMap.clear();
+    this.features.clear();
     this.featureToScaledPrimitiveMap.clear();
     this._postRenderListener();
   }

package/src/layer/cesiumTilesetLayer.ts

@@ -30,10 +30,6 @@ export type CesiumTilesetOptions = LayerOptions & {
    * relates inversely to the depth over which the layer is activated
    */
   screenSpaceErrorMobile?: number;
-  /**
-   * sets the cesium maximumMemoryUsage Parameter (Is when the cached tiles exceed this value cesium starts to clear the cached tiles)
-   */
-  maximumMemoryUsage?: number;
   tilesetOptions?: object;
   highlightStyle?: VectorStyleItem | VectorStyleItemOptions;
   featureVisibility?: FeatureVisibility;
@@ -71,7 +67,6 @@ class CesiumTilesetLayer extends FeatureLayer<CesiumTilesetCesiumImpl> {
       highlightStyle: undefined,
       screenSpaceError: 16,
       screenSpaceErrorMobile: 32,
-      maximumMemoryUsage: 16,
       tilesetOptions: {},
       offset: undefined,
     };
@@ -83,8 +78,6 @@ class CesiumTilesetLayer extends FeatureLayer<CesiumTilesetCesiumImpl> {
 
   screenSpaceErrorMobile: number;
 
-  maximumMemoryUsage: number;
-
   tilesetOptions: Record<string, unknown>;
 
   private _modelMatrix: Matrix4 | undefined;
@@ -119,11 +112,6 @@ class CesiumTilesetLayer extends FeatureLayer<CesiumTilesetCesiumImpl> {
       defaultOptions.screenSpaceErrorMobile,
     );
 
-    this.maximumMemoryUsage = parseInteger(
-      options.maximumMemoryUsage,
-      defaultOptions.maximumMemoryUsage,
-    );
-
     const tilesetOptions =
       options.tilesetOptions || defaultOptions.tilesetOptions;
 
@@ -131,7 +119,6 @@ class CesiumTilesetLayer extends FeatureLayer<CesiumTilesetCesiumImpl> {
       maximumScreenSpaceError: isMobile()
         ? this.screenSpaceErrorMobile
         : this.screenSpaceError,
-      maximumMemoryUsage: this.maximumMemoryUsage,
       ...tilesetOptions,
     };
 
@@ -245,10 +232,6 @@ class CesiumTilesetLayer extends FeatureLayer<CesiumTilesetCesiumImpl> {
       config.screenSpaceErrorMobile = this.screenSpaceErrorMobile;
     }
 
-    if (this.maximumMemoryUsage !== defaultOptions.maximumMemoryUsage) {
-      config.maximumMemoryUsage = this.maximumMemoryUsage;
-    }
-
     const tilesetOptions: Record<string, unknown> = { ...this.tilesetOptions };
 
     const usedScreenSpaceError = isMobile()
@@ -258,10 +241,6 @@ class CesiumTilesetLayer extends FeatureLayer<CesiumTilesetCesiumImpl> {
       delete tilesetOptions.maximumScreenSpaceError;
     }
 
-    if (tilesetOptions.maximumMemoryUsage === this.maximumMemoryUsage) {
-      delete tilesetOptions.maximumMemoryUsage;
-    }
-
     if (Object.keys(tilesetOptions).length > 0) {
       config.tilesetOptions = tilesetOptions;
     }

package/src/layer/featureVisibility.ts

@@ -105,6 +105,7 @@ export function resetOriginalStyle(feature: HighlightableFeature): void {
   if (!(feature[globalHidden] || feature[hidden] || feature[highlighted])) {
     const style = feature[originalStyle];
     if (
+      style &&
       (feature instanceof Cesium3DTileFeature ||
         feature instanceof Cesium3DTilePointFeature) &&
       featureExists(feature)
@@ -383,21 +384,12 @@ class FeatureVisibility {
 
   hasHiddenFeature(
     id: string | number,
-    feature:
-      | import('ol').Feature<import('ol/geom/Geometry.js').default>
-      | import('@vcmap-cesium/engine').Cesium3DTileFeature
-      | import('@vcmap-cesium/engine').Entity,
+    feature: HighlightableFeature,
   ): boolean {
     return this.hiddenObjects[id] && this.hiddenObjects[id].has(feature);
   }
 
-  addHiddenFeature(
-    id: string | number,
-    feature:
-      | import('ol').Feature<import('ol/geom/Geometry.js').default>
-      | import('@vcmap-cesium/engine').Cesium3DTileFeature
-      | import('@vcmap-cesium/engine').Entity,
-  ): void {
+  addHiddenFeature(id: string | number, feature: HighlightableFeature): void {
     if (this.hiddenObjects[id]) {
       cacheOriginalStyle(feature);
       this.hiddenObjects[id].add(feature);

package/src/layer/vectorLayer.ts

@@ -101,6 +101,11 @@ export type VectorGeometryFactoryType = {
     style: Style,
   ): GroundPolylineGeometry[];
   createLineGeometries(obj: unknown, style: Style): PolylineGeometry[];
+  createLineGeometries(
+    obj: unknown,
+    style: Style,
+    groundLevel?: number,
+  ): PolylineGeometry[];
 };
 
 export type VectorHeightInfo = {

package/src/layer/vectorProperties.ts

@@ -1292,9 +1292,9 @@ class VectorProperties {
      * @param propertyValues An array of values for a specific property from different features.
      * @returns Whether all values are equal.
      */
-    function isAllEqual<T extends string | number | boolean | number[]>(
-      propertyValues: (T | undefined)[],
-    ): boolean {
+    function isAllEqual<
+      T extends string | number | boolean | number[] | Record<string, unknown>,
+    >(propertyValues: (T | undefined)[]): boolean {
       return propertyValues.every((curr, index, array) => {
         if (index === 0) {
           return true;
@@ -1421,6 +1421,21 @@ class VectorProperties {
       values.modelRoll = modelRollValues[0];
     }
 
+    const modelAutoScale = features.map((f) => this.getModelAutoScale(f));
+    if (isAllEqual(modelAutoScale)) {
+      values.modelAutoScale = modelAutoScale[0];
+    }
+
+    const modelOptions = features.map((f) => this.getModelOptions(f));
+    if (isAllEqual(modelOptions)) {
+      values.modelOptions = modelOptions[0];
+    }
+
+    const primitiveOptions = features.map((f) => this.getPrimitiveOptions(f));
+    if (isAllEqual(primitiveOptions)) {
+      values.primitiveOptions = primitiveOptions[0];
+    }
+
     const baseUrlValues = features.map((f) => this.getBaseUrl(f));
     if (isAllEqual(baseUrlValues)) {
       values.baseUrl = baseUrlValues[0];

package/src/map/cesiumMap.ts

@@ -40,7 +40,7 @@ import {
 import type { Coordinate } from 'ol/coordinate.js';
 
 import { checkMaybe } from '@vcsuite/check';
-import { parseBoolean, parseInteger } from '@vcsuite/parsers';
+import { parseBoolean, parseInteger, parseNumber } from '@vcsuite/parsers';
 import VcsMap, { type VcsMapOptions } from './vcsMap.js';
 import Viewpoint from '../util/viewpoint.js';
 import Projection, { mercatorProjection } from '../util/projection.js';
@@ -80,6 +80,12 @@ export type CesiumMapOptions = VcsMapOptions & {
    * This is a global Setting for all VCMap Instances on the same page.
    */
   useOriginalCesiumShader?: boolean;
+
+  /**
+   * changes the default Cesium Sunlight Intensity (default is 3.0)
+   * Cesium Default is 2.0
+   */
+  lightIntensity?: number;
 };
 
 export type CesiumMapEvent = {
@@ -287,6 +293,7 @@ class CesiumMap extends VcsMap<CesiumVisualisationType> {
       cameraLimiter: undefined,
       globeColor: '#3f47cc',
       useOriginalCesiumShader: false,
+      lightIntensity: 3.0,
     };
   }
 
@@ -344,6 +351,8 @@ class CesiumMap extends VcsMap<CesiumVisualisationType> {
 
   private _useOriginalCesiumShader: boolean;
 
+  private _lightIntensity: number;
+
   constructor(options: CesiumMapOptions) {
     super(options);
 
@@ -403,6 +412,28 @@ class CesiumMap extends VcsMap<CesiumVisualisationType> {
     this._listeners = [];
 
     this._lastEventFrameNumber = null;
+
+    this._lightIntensity = parseNumber(
+      options.lightIntensity,
+      defaultOptions.lightIntensity,
+    );
+  }
+
+  /**
+   * returns the light Intensity, see Cesium https://cesium.com/learn/cesiumjs/ref-doc/SunLight.html?classFilter=sunlight#intensity
+   */
+  get lightIntensity(): number {
+    return this._lightIntensity;
+  }
+
+  /**
+   * sets the light Intensity, see Cesium https://cesium.com/learn/cesiumjs/ref-doc/SunLight.html?classFilter=sunlight#intensity
+   */
+  set lightIntensity(intensity: number) {
+    this._lightIntensity = intensity;
+    if (this.initialized && this._cesiumWidget) {
+      this._cesiumWidget.scene.light.intensity = intensity;
+    }
   }
 
   get splitPosition(): number {
@@ -653,6 +684,7 @@ class CesiumMap extends VcsMap<CesiumVisualisationType> {
       this._cesiumWidget.scene.highDynamicRange = false;
       // this._cesiumWidget.scene.logarithmicDepthBuffer = false; // TODO observe this
       this._cesiumWidget.scene.splitPosition = this.splitPosition;
+      this._cesiumWidget.scene.light.intensity = this._lightIntensity;
 
       this._cesiumWidget.scene.globe.enableLighting = this.enableLightning;
 
@@ -1290,6 +1322,10 @@ class CesiumMap extends VcsMap<CesiumVisualisationType> {
       config.cameraLimiter = this._cameraLimiterOptions;
     }
 
+    if (this._lightIntensity !== defaultOptions.lightIntensity) {
+      config.lightIntensity = this._lightIntensity;
+    }
+
     return config;
   }
 

package/src/util/editor/createFeatureSession.ts

@@ -19,6 +19,7 @@ import VectorLayer from '../../layer/vectorLayer.js';
 import { createSync } from '../../layer/vectorSymbols.js';
 import geometryIsValid from './validateGeoemetry.js';
 import ObliqueMap from '../../map/obliqueMap.js';
+import { cursorMap } from './interactions/editGeometryMouseOverInteraction.js';
 
 export type CreateFeatureSession<T extends GeometryType> = EditorSession & {
   geometryType: T;
@@ -200,8 +201,15 @@ function startCreateFeatureSession<T extends GeometryType>(
   });
   setupActiveMap();
 
+  if (app.maps.target) {
+    app.maps.target.style.cursor = cursorMap.edit;
+  }
+
   const stop = (): void => {
     isStopped = true; // setting stopped true immediately, to prevent the recreation of the interaction chain on finished
+    if (app.maps.target) {
+      app.maps.target.style.cursor = cursorMap.auto;
+    }
     mapChangedListener();
     obliqueImageChangedListener();
     if (currentInteraction) {

package/src/util/editor/editFeaturesSession.ts

@@ -28,7 +28,7 @@ import ScaleInteraction from './transformation/scaleInteraction.js';
 import { obliqueGeometry } from '../../layer/vectorSymbols.js';
 import ExtrudeInteraction from './transformation/extrudeInteraction.js';
 import ObliqueMap from '../../map/obliqueMap.js';
-import { ensureFeatureAbsolute } from './editorHelpers.js';
+import { ensureFeatureAbsolute, geometryChangeKeys } from './editorHelpers.js';
 import CesiumMap from '../../map/cesiumMap.js';
 import EnsureHandlerSelectionInteraction from './interactions/ensureHandlerSelectionInteraction.js';
 import EditFeaturesMouseOverInteraction from './interactions/editFeaturesMouseOverInteraction.js';
@@ -92,12 +92,6 @@ export type EditFeaturesSession = EditorSession & {
   features: Feature[];
 };
 
-const geometryChangeKeys = [
-  'olcs_altitudeMode',
-  'olcs_groundLevel',
-  'olcs_heightAboveGround',
-];
-
 /**
  * Creates an editor session to select, translate, rotate & scale the feature on a given layer
  * @param  app

package/src/util/editor/editGeometrySession.ts

@@ -9,6 +9,7 @@ import type {
   LinearRing,
   Geometry,
 } from 'ol/geom.js';
+import { EventsKey } from 'ol/events.js';
 import {
   EditorSession,
   GeometryType,
@@ -20,7 +21,7 @@ import InteractionChain from '../../interaction/interactionChain.js';
 import VcsEvent from '../../vcsEvent.js';
 import TranslateVertexInteraction from './interactions/translateVertexInteraction.js';
 import RemoveVertexInteraction from './interactions/removeVertexInteraction.js';
-import { createVertex } from './editorHelpers.js';
+import { createVertex, geometryChangeKeys } from './editorHelpers.js';
 import InsertVertexInteraction from './interactions/insertVertexInteraction.js';
 import EditGeometryMouseOverInteraction from './interactions/editGeometryMouseOverInteraction.js';
 import { cartesian2DDistance, modulo } from '../math.js';
@@ -362,18 +363,30 @@ function startEditGeometrySession(
     currentFeature = null;
   };
 
+  let featureListener: EventsKey | undefined;
+
   /**
    * Creates an interaction set from an edit geometry interaction. If the geometry of the feature is not supported a message is logged.
    * @param {Feature} feature The feature to be edited.
    */
   function createCurrentInteractionSet(feature?: Feature): void {
     destroyCurrentInteractionSet();
+    if (featureListener) {
+      unByKey(featureListener);
+    }
     if (feature) {
+      featureListener = feature.on('propertychange', ({ key }) => {
+        if (geometryChangeKeys.includes(key)) {
+          createCurrentInteractionSet(feature);
+        }
+      });
       currentFeature = feature;
       currentFeature[createSync] = true;
       const geometry =
         feature[obliqueGeometry] ?? (feature.getGeometry() as Geometry);
       const geometryType = geometry.getType();
+      scratchLayer.vectorProperties.altitudeMode =
+        layer.vectorProperties.getAltitudeMode(feature);
       if (geometryType === GeometryType.Polygon) {
         if (geometry.get('_vcsGeomType') === GeometryType.BBox) {
           currentInteractionSet = createEditBBoxGeometryInteraction(
@@ -427,6 +440,9 @@ function startEditGeometrySession(
 
   const stop = (): void => {
     app.layers.remove(scratchLayer);
+    if (featureListener) {
+      unByKey(featureListener);
+    }
     mapActivatedListener();
     mapInteractionController.reset();
     mouseOverInteraction.reset();

package/src/util/editor/editorHelpers.ts

@@ -40,6 +40,12 @@ export interface SelectFeatureInteraction {
   hasFeatureId(id: string): boolean;
 }
 
+export const geometryChangeKeys = [
+  'olcs_altitudeMode',
+  'olcs_groundLevel',
+  'olcs_heightAboveGround',
+];
+
 /**
  * @param  coordinate
  */

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

@@ -8,6 +8,14 @@ import {
 } from '../../../interaction/interactionType.js';
 import { 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">
+    <path d=" M 14.744 18.702 L 12.814 16.772 L 16.773 12.814 L 18.703 14.744 C 19.099 15.159 19.099 15.812 18.703 16.228 L 16.228 18.702 C 15.813 19.097 15.16 19.097 14.744 18.702 Z  M 3.959 0.002 L 15.635 11.679 L 11.678 15.637 L 0 3.962 L 0 0.002 L 3.959 0.002 Z " fill="rgb(0,0,0)"/>
+    <path d=" M 0.75 0.846 L 3.641 0.846 L 14.532 11.768 L 11.641 14.659 L 0.75 3.581 L 0.75 0.846 Z " fill="rgb(255,255,255)"/>
+    <path d=" M 16.75 14.018 L 18.242 15.511 L 15.414 18.339 L 13.881 16.805 L 16.75 14.018 Z " fill="rgb(255,255,255)"/>
+  </g>
+</svg>`;
+
 export const cursorMap = {
   // TODO these can now be designed custom. IE11 no linger required
   auto: 'auto',
@@ -16,7 +24,9 @@ export const cursorMap = {
   rotate: 'crosshair',
   translate: 'move',
   select: 'pointer',
-  edit: 'pointer', // fa pencil
+  edit: `url("data:image/svg+xml;charset=utf-8,${encodeURIComponent(
+    pointerSvg,
+  )}"), pointer`, // fa pencil
   translateVertex: 'move', // fa-stack pointer-move
   removeVertex: 'no-drop', // fa-stack pencil-minus
   insertVertex: 'cell', // fa-stack pencil-plus

package/src/util/featureconverter/arcToCesium.ts

@@ -86,14 +86,14 @@ function getGeometryFactory(
 /**
  * converts a linestring with an ArcStyle to a a cesium primitive
  */
-export default function arcToCesium(
+export default async function arcToCesium(
   feature: Feature,
   style: ArcStyle,
   geometries: LineString[],
   vectorProperties: VectorProperties,
   scene: Scene,
   context: CesiumVectorContext,
-): void {
+): Promise<void> {
   if (!style.getFill() && !style.getStroke()) {
     return;
   }
@@ -114,7 +114,7 @@ export default function arcToCesium(
     arcGeometryFactory,
     context,
   );
-  addArrowsToContext(
+  await addArrowsToContext(
     feature,
     style,
     validGeometries,

package/src/util/featureconverter/convert.ts

@@ -21,16 +21,23 @@ import ArcStyle, { featureArcStruct } from '../../style/arcStyle.js';
 import type VectorProperties from '../../layer/vectorProperties.js';
 import type { CesiumVectorContext } from '../../layer/cesium/vectorContext.js';
 
-function convertGeometry(
+async function convertGeometry(
   feature: Feature,
   geometry: Geometry,
   style: Style,
   vectorProperties: VectorProperties,
   scene: Scene,
   context: CesiumVectorContext,
-): void {
+): Promise<void> {
   if (geometry instanceof Point) {
-    pointToCesium(feature, style, [geometry], vectorProperties, scene, context);
+    await pointToCesium(
+      feature,
+      style,
+      [geometry],
+      vectorProperties,
+      scene,
+      context,
+    );
   } else if (geometry instanceof Polygon) {
     polygonToCesium(
       feature,
@@ -42,9 +49,16 @@ function convertGeometry(
     );
   } else if (geometry instanceof LineString) {
     if (style instanceof ArcStyle && feature[featureArcStruct]?.coordinates) {
-      arcToCesium(feature, style, [geometry], vectorProperties, scene, context);
+      await arcToCesium(
+        feature,
+        style,
+        [geometry],
+        vectorProperties,
+        scene,
+        context,
+      );
     } else {
-      lineStringToCesium(
+      await lineStringToCesium(
         feature,
         style,
         [geometry],
@@ -63,7 +77,7 @@ function convertGeometry(
       context,
     );
   } else if (geometry instanceof MultiPoint) {
-    pointToCesium(
+    await pointToCesium(
       feature,
       style,
       geometry.getPoints(),
@@ -81,7 +95,7 @@ function convertGeometry(
       context,
     );
   } else if (geometry instanceof MultiLineString) {
-    lineStringToCesium(
+    await lineStringToCesium(
       feature,
       style,
       geometry.getLineStrings(),
@@ -90,16 +104,18 @@ function convertGeometry(
       context,
     );
   } else if (geometry instanceof GeometryCollection) {
-    geometry.getGeometries().forEach((currentGeometry) => {
-      convertGeometry(
-        feature,
-        currentGeometry,
-        style,
-        vectorProperties,
-        scene,
-        context,
-      );
-    });
+    await Promise.all(
+      geometry.getGeometries().map(async (currentGeometry) => {
+        await convertGeometry(
+          feature,
+          currentGeometry,
+          style,
+          vectorProperties,
+          scene,
+          context,
+        );
+      }),
+    );
   }
 }
 
@@ -136,25 +152,27 @@ export function getStylesArray(
  * @param  context
  * @param  scene
  */
-export default function convert(
+export default async function convert(
   feature: Feature,
   style: StyleLike,
   vectorProperties: VectorProperties,
   context: CesiumVectorContext,
   scene: Scene,
-): void {
+): Promise<void> {
   const styles = getStylesArray(feature.getStyle() || style, feature, 0);
-  styles.forEach((currentStyle) => {
-    const geometry = currentStyle.getGeometryFunction()(feature) as Geometry;
-    if (geometry) {
-      convertGeometry(
-        feature,
-        geometry,
-        currentStyle,
-        vectorProperties,
-        scene,
-        context,
-      );
-    }
-  });
+  await Promise.all(
+    styles.map(async (currentStyle) => {
+      const geometry = currentStyle.getGeometryFunction()(feature) as Geometry;
+      if (geometry) {
+        await convertGeometry(
+          feature,
+          geometry,
+          currentStyle,
+          vectorProperties,
+          scene,
+          context,
+        );
+      }
+    }),
+  );
 }