@vcmap/core 5.1.2 → 5.1.4

package/src/layer/featureStoreFeatureVisibility.ts

@@ -0,0 +1,55 @@
+import FeatureVisibility, { HighlightStyleType } from './featureVisibility.js';
+import type FeatureStoreLayerChanges from './featureStoreLayerChanges.js';
+
+export default class FeatureStoreFeatureVisibility extends FeatureVisibility {
+  private _changeTracker: FeatureStoreLayerChanges;
+
+  constructor(changeTracker: FeatureStoreLayerChanges) {
+    super();
+    this._changeTracker = changeTracker;
+  }
+
+  highlight(toHighlight: Record<string, HighlightStyleType>): void {
+    const isTracking = this._changeTracker.active;
+    if (isTracking) {
+      this._changeTracker.pauseTracking('changefeature');
+    }
+    super.highlight(toHighlight);
+    if (isTracking) {
+      this._changeTracker.track();
+    }
+  }
+
+  unHighlight(toUnHighlight: (string | number)[]): void {
+    const isTracking = this._changeTracker.active;
+    if (isTracking) {
+      this._changeTracker.pauseTracking('changefeature');
+    }
+    super.unHighlight(toUnHighlight);
+    if (isTracking) {
+      this._changeTracker.track();
+    }
+  }
+
+  hideObjects(toHide: (string | number)[]): void {
+    const isTracking = this._changeTracker.active;
+    if (isTracking) {
+      this._changeTracker.pauseTracking('changefeature');
+    }
+    super.hideObjects(toHide);
+    if (isTracking) {
+      this._changeTracker.track();
+    }
+  }
+
+  showObjects(unHide: (string | number)[]): void {
+    const isTracking = this._changeTracker.active;
+    if (isTracking) {
+      this._changeTracker.pauseTracking('changefeature');
+    }
+    super.showObjects(unHide);
+    if (isTracking) {
+      this._changeTracker.track();
+    }
+  }
+}

package/src/layer/featureStoreLayer.ts

@@ -45,6 +45,7 @@ import { vcsLayerName } from './layerSymbols.js';
 import StyleItem from '../style/styleItem.js';
 import VcsMap from '../map/vcsMap.js';
 import VectorCesiumImpl from './cesium/vectorCesiumImpl.js';
+import FeatureStoreFeatureVisibility from './featureStoreFeatureVisibility.js';
 
 export type FeatureStoreStaticRepresentation = {
   /**
@@ -57,7 +58,10 @@ export type FeatureStoreStaticRepresentation = {
   twoDim?: string;
 };
 
-export type FeatureStoreLayerSchema = VectorOptions & {
+export type FeatureStoreLayerSchema = Omit<
+  VectorOptions,
+  'featureVisibility'
+> & {
   /**
    * layer mongo id
    */
@@ -91,6 +95,8 @@ export type FeatureStoreOptions = FeatureStoreLayerSchema & {
    * injected function for fetching dynamic features from a remote FeatureStoreLayer server
    */
   injectedFetchDynamicFeatureFunc?: FetchDynamicFeatureCallback;
+
+  featureVisibility?: FeatureStoreFeatureVisibility;
 };
 
 export const isTiledFeature: unique symbol = Symbol('isTiledFeature');
@@ -112,6 +118,7 @@ class FeatureStoreLayer extends VectorLayer {
       featureType: 'simple',
       features: [],
       ...VectorLayer.getDefaultOptions(),
+      featureVisibility: undefined,
       projection: mercatorProjection.toJSON(),
       staticRepresentation: {},
       hiddenStaticFeatureIds: [],
@@ -142,6 +149,8 @@ class FeatureStoreLayer extends VectorLayer {
 
   screenSpaceError: number | undefined;
 
+  featureVisibility: FeatureStoreFeatureVisibility;
+
   private _removeVectorPropertiesChangeHandler: () => void;
 
   /**
@@ -210,6 +219,10 @@ class FeatureStoreLayer extends VectorLayer {
       options.injectedFetchDynamicFeatureFunc ??
       this.injectedFetchDynamicFeatureFunc;
 
+    this.featureVisibility =
+      options.featureVisibility ??
+      new FeatureStoreFeatureVisibility(this.changeTracker);
+
     this._featureVisibilitySyncListeners = [
       synchronizeFeatureVisibility(
         this.featureVisibility,
@@ -571,7 +584,7 @@ class FeatureStoreLayer extends VectorLayer {
   }
 
   toJSON(): FeatureStoreOptions {
-    const config: Partial<FeatureStoreOptions> = super.toJSON();
+    const config = super.toJSON() as Partial<FeatureStoreOptions>;
     const defaultOptions = FeatureStoreLayer.getDefaultOptions();
 
     delete config.projection;

package/src/layer/vectorLayer.ts

@@ -436,7 +436,10 @@ class VectorLayer
   /**
    * add features to the vector layer and return an array with their ids.
    * The geometry will be mutated and transformed to EPSG 3857 mercator coordinate system
+   * features will be added an id, if they do not already have one.
    *
+   * returns the ids of the added features. if a feature has an id and the same id is alread in the
+   * layer, it will not be added.
    * @todo mechanism to enforce XYZ coordinate layout for internal usage
    */
   addFeatures(features: Feature[]): (string | number)[] {
@@ -475,7 +478,7 @@ class VectorLayer
       .filter((f) => f) as Feature[];
 
     this.source.addFeatures(toAdd);
-    return features.map((f) => f.getId()) as (string | number)[];
+    return toAdd.map((f) => f.getId()) as (string | number)[];
   }
 
   /**

package/src/layer/wmsLayer.ts

@@ -39,6 +39,7 @@ export type WMSOptions = RasterLayerOptions & {
    * key value pair of additional WMS parameters, url query notation possible
    */
   parameters?: Record<string, string> | string;
+
   /**
    * whether this layer should send getFeatureInfo requests to the service when objects are clicked.
    */
@@ -75,6 +76,7 @@ class WMSLayer extends RasterLayer<WmsCesiumImpl | WmsOpenlayersImpl> {
       tileSize: [256, 256],
       highResolution: false,
       layers: '',
+      singleImage2d: false,
     };
   }
 
@@ -134,7 +136,10 @@ class WMSLayer extends RasterLayer<WmsCesiumImpl | WmsOpenlayersImpl> {
     this._featureInfoOptions =
       options.featureInfo || defaultOptions.featureInfo;
     this._supportedMaps = [CesiumMap.className, OpenlayersMap.className];
-    this.singleImage2d = parseBoolean(options.singleImage2d, false);
+    this.singleImage2d = parseBoolean(
+      options.singleImage2d,
+      defaultOptions.singleImage2d,
+    );
   }
 
   initialize(): Promise<void> {
@@ -252,6 +257,10 @@ class WMSLayer extends RasterLayer<WmsCesiumImpl | WmsOpenlayersImpl> {
       config.tileSize = this.tileSize.slice();
     }
 
+    if (this.singleImage2d !== defaultOptions.singleImage2d) {
+      config.singleImage2d = this.singleImage2d;
+    }
+
     if (
       this.featureProvider &&
       this.featureProvider instanceof WMSFeatureProvider

package/src/style/declarativeStyleItem.ts

@@ -95,7 +95,7 @@ function addCustomProperty(
  * @group Style
  */
 class DeclarativeStyleItem extends StyleItem {
-  static get className(): string {
+  static get className(): 'DeclarativeStyleItem' {
     return 'DeclarativeStyleItem';
   }
 

package/src/style/modelFill.ts

@@ -0,0 +1,15 @@
+import { Fill } from 'ol/style.js';
+
+class ModelFill extends Fill {
+  static fromFill(fill: Fill): ModelFill {
+    return new ModelFill({ color: fill.getColor() });
+  }
+
+  toFill(result?: Fill): Fill {
+    const fill = result ?? new Fill();
+    fill.setColor(this.getColor());
+    return fill;
+  }
+}
+
+export default ModelFill;

package/src/style/styleFactory.ts

@@ -27,7 +27,7 @@ export function getStyleOrDefaultStyle(
           styleItem instanceof VectorStyleItem &&
           defaultStyle instanceof VectorStyleItem
         ) {
-          return defaultStyle.assign(styleItem);
+          return styleItem.assign(defaultStyle.clone().assign(styleItem));
         }
         return styleItem;
       }

package/src/style/vectorStyleItem.ts

@@ -33,6 +33,7 @@ import {
 import { getShapeFromOptions } from './shapesCategory.js';
 import { styleClassRegistry } from '../classRegistry.js';
 import { isSameOrigin } from '../util/urlHelpers.js';
+import ModelFill from './modelFill.js';
 
 export type ColorType = OLColor | OLColorLike;
 export type VectorStyleItemPattern = {
@@ -45,6 +46,12 @@ export type VectorStyleItemPattern = {
 export type VectorStyleItemFill = {
   color: ColorType;
   pattern?: VectorStyleItemPattern;
+  type?: 'fill' | 'modelFill';
+};
+
+export type VectorStyleItemStroke = {
+  width?: number;
+  color?: ColorType;
 };
 
 export type VectorStyleItemImage = {
@@ -87,7 +94,7 @@ export enum OlcsGeometryType {
 
 export type VectorStyleItemOptions = StyleItemOptions & {
   fill?: VectorStyleItemFill | false;
-  stroke?: StrokeOptions | false;
+  stroke?: StrokeOptions | VectorStyleItemStroke | false;
   image?: VectorStyleItemImage | false;
   text?: VectorStyleItemText;
   label?: string;
@@ -104,7 +111,7 @@ export const vectorStyleSymbol: unique symbol = Symbol('VcsVectorStyleItem');
  * @group Style
  */
 class VectorStyleItem extends StyleItem {
-  static get className(): string {
+  static get className(): 'VectorStyleItem' {
     return 'VectorStyleItem';
   }
 
@@ -171,7 +178,7 @@ class VectorStyleItem extends StyleItem {
     });
 
     if (options.fill) {
-      this._fillOptions = options.fill;
+      this._fillOptions = structuredClone(options.fill);
       this._setFill();
     } else {
       this.updateCesiumStyle();
@@ -446,7 +453,10 @@ class VectorStyleItem extends StyleItem {
       if (this._fill) {
         this._fill.setColor(color);
       } else {
-        this._fill = new Fill({ color });
+        this._fill =
+          this._fillOptions?.type === 'modelFill'
+            ? new ModelFill({ color })
+            : new Fill({ color });
         this._style.setFill(this._fill);
       }
 

package/src/util/editor/editGeometrySession.ts

@@ -322,9 +322,7 @@ function createEditPointInteraction(
   let suspend = false;
   translateVertex.vertexChanged.addEventListener(() => {
     suspend = true;
-    feature
-      .getGeometry()!
-      .setCoordinates(vertex.getGeometry()!.getCoordinates());
+    geometry.setCoordinates(vertex.getGeometry()!.getCoordinates());
     suspend = false;
   });
 

package/src/util/editor/selectFeaturesSession.ts

@@ -1,5 +1,5 @@
 import { check, ofEnum } from '@vcsuite/check';
-import { Circle, Fill, Style, Stroke } from 'ol/style.js';
+import { Circle, Style, Stroke } from 'ol/style.js';
 import type { Feature } from 'ol/index.js';
 import { createSync } from '../../layer/vectorSymbols.js';
 import {
@@ -19,6 +19,7 @@ import type VectorLayer from '../../layer/vectorLayer.js';
 import type VcsApp from '../../vcsApp.js';
 import type VcsMap from '../../map/vcsMap.js';
 import { type HighlightStyleType } from '../../layer/featureVisibility.js';
+import ModelFill from '../../style/modelFill.js';
 
 type SelectionHighlightManager = {
   highlightedFeatures: Feature[];
@@ -104,7 +105,7 @@ function createHighlightManager(
 }
 
 export function getDefaultHighlightStyle(): Style {
-  const fill = new Fill({ color: 'rgba(76,175,80,0.2)' });
+  const fill = new ModelFill({ color: 'rgba(76,175,80,0.2)' });
   const stroke = new Stroke({ color: '#4CAF50', width: 2 });
 
   return new Style({

package/src/util/featureconverter/pointHelpers.ts

@@ -28,6 +28,7 @@ import {
 import type { Feature } from 'ol/index.js';
 import type { Coordinate } from 'ol/coordinate.js';
 import { RegularShape, type Style } from 'ol/style.js';
+import { asColorLike } from 'ol/colorlike.js';
 import { createSync } from '../../layer/vectorSymbols.js';
 import VectorProperties, {
   PrimitiveOptionsType,
@@ -37,6 +38,7 @@ import VectorProperties, {
   VectorPropertiesPrimitiveOptions,
 } from '../../layer/vectorProperties.js';
 import { getCesiumColor } from '../../style/styleHelpers.js';
+import ModelFill from '../../style/modelFill.js';
 
 function makeOffsetAutoScalePrimitive(
   primitive: Primitive | Model,
@@ -124,6 +126,7 @@ export async function getModelOptions(
   positions: Cartesian3[],
   vectorProperties: VectorProperties,
   scene: Scene,
+  style?: Style,
 ): Promise<null | {
   primitives: Model[];
   options: VectorPropertiesModelOptions;
@@ -139,6 +142,15 @@ export async function getModelOptions(
     options.roll,
   );
   const allowPicking = vectorProperties.getAllowPicking(feature);
+  const fill = style?.getFill();
+  let color: Color | undefined;
+  if (fill instanceof ModelFill) {
+    const olColor = fill.getColor();
+    if (olColor) {
+      color = Color.fromCssColorString(asColorLike(olColor) as string);
+    }
+  }
+
   const primitives = await Promise.all(
     positions.map(async (position, index) => {
       const modelMatrix = Matrix4.multiply(
@@ -154,6 +166,7 @@ export async function getModelOptions(
         url: options.url,
         modelMatrix,
         allowPicking,
+        color,
         ...additionalModelOptions,
       });
 

package/src/util/featureconverter/pointToCesium.ts

@@ -301,6 +301,7 @@ export default async function pointToCesium(
       positions,
       vectorProperties,
       scene,
+      style,
     );
   } else if (feature.get('olcs_primitiveOptions')) {
     modelOrPrimitiveOptions = await getPrimitiveOptions(
@@ -319,6 +320,7 @@ export default async function pointToCesium(
         positions,
         vectorProperties,
         scene,
+        style,
       )) ??
       (await getPrimitiveOptions(
         feature,