@vcmap/core 5.1.1 → 5.1.3

package/dist/tests/unit/helpers/terrain/terrainData.js

@@ -31,7 +31,7 @@ export function setTerrainServer(scope) {
 }
 /**
  * @param {Scope} scope
- * @returns {Promise<cesium/CesiumTerrainProvider>}
+ * @returns {Promise<import("@vcmap-cesium/engine").CesiumTerrainProvider>}
  */
 export async function getTerrainProvider(scope) {
     setTerrainServer(scope);

package/index.ts

@@ -760,3 +760,4 @@ export {
   createFlightVisualization,
 } from './src/util/flight/flightVisualizer.js';
 export { getTileLoadFunction } from './src/layer/openlayers/loadFunctionHelpers.js';
+export { default as ModelFill } from './src/style/modelFill.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vcmap/core",
-  "version": "5.1.1",
+  "version": "5.1.3",
   "description": "",
   "main": "dist/index.js",
   "type": "module",

package/src/category/category.ts

@@ -20,9 +20,9 @@ import {
 } from '../classRegistry.js';
 import OverrideClassRegistry from '../overrideClassRegistry.js';
 import VcsEvent from '../vcsEvent.js';
-import type VectorStyleItem from '../style/vectorStyleItem.js';
 import type VcsApp from '../vcsApp.js';
 import { markVolatile } from '../vcsModule.js';
+import type VectorStyleItem from '../style/vectorStyleItem.js';
 
 export type CategoryOptions<T extends VcsObject | object> = VcsObjectOptions & {
   title?: string;

package/src/cesium/cesium.d.ts

@@ -62,6 +62,7 @@ declare module '@vcmap-cesium/engine' {
 
   interface Model {
     olFeature?: import('ol').Feature<import('ol/geom.js').Geometry>;
+    allowPicking?: boolean;
     [scaleSymbol]?: number;
   }
 

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/clipping/clippingObject.ts

@@ -14,9 +14,10 @@ import { getLogger as getLoggerByName, type Logger } from '@vcsuite/logger';
 import CesiumMap from '../../map/cesiumMap.js';
 import VcsEvent from '../../vcsEvent.js';
 import LayerCollection from '../layerCollection.js';
-import type FeatureStoreLayer from '../../layer/featureStoreLayer.js';
+import FeatureStoreLayer from '../../layer/featureStoreLayer.js';
 import type VcsMap from '../../map/vcsMap.js';
 import type Layer from '../../layer/layer.js';
+import CesiumTilesetLayer from '../../layer/cesiumTilesetLayer.js';
 
 export type ClippingObjectEntityOption = {
   layerName: string;
@@ -83,7 +84,8 @@ class ClippingObject {
    */
   clippingPlaneUpdated = new VcsEvent<void>();
 
-  private _cachedFeatureStoreLayers: Set<FeatureStoreLayer> = new Set();
+  private _cachedLayers: Set<FeatureStoreLayer | CesiumTilesetLayer> =
+    new Set();
 
   private _activeMap: VcsMap | null = null;
 
@@ -231,14 +233,13 @@ class ClippingObject {
       }
     } else if (
       this.layerNames.includes(layer.name) &&
-      layer.className === 'FeatureStoreLayer'
+      (layer instanceof FeatureStoreLayer ||
+        layer instanceof CesiumTilesetLayer)
     ) {
       if (layer.active) {
-        this._cachedFeatureStoreLayers.add(layer as FeatureStoreLayer);
-      } else if (
-        this._cachedFeatureStoreLayers.has(layer as FeatureStoreLayer)
-      ) {
-        this._cachedFeatureStoreLayers.delete(layer as FeatureStoreLayer);
+        this._cachedLayers.add(layer);
+      } else if (this._cachedLayers.has(layer)) {
+        this._cachedLayers.delete(layer);
       }
     }
   }
@@ -259,11 +260,11 @@ class ClippingObject {
         this.targetsUpdated.raiseEvent();
       }
 
-      if (this._cachedFeatureStoreLayers.size > 0) {
-        this._cachedFeatureStoreLayers.forEach((layer) => {
+      if (this._cachedLayers.size > 0) {
+        this._cachedLayers.forEach((layer) => {
           this.handleLayerChanged(layer);
         });
-        this._cachedFeatureStoreLayers.clear();
+        this._cachedLayers.clear();
       }
     }
     this._activeMap = map;

package/src/util/clipping/clippingObjectManager.ts

@@ -109,13 +109,14 @@ class ClippingObjectManager {
     if (this.hasClippingObject(clippingObject)) {
       throw new Error('ClippingObject already managed, remove it first');
     }
-    clippingObject.setLayerCollection(this._layerCollection);
-
-    this._defaultClippingObjects.add(clippingObject);
     if (this._activeMap instanceof CesiumMap) {
       clippingObject.handleMapChanged(this._activeMap);
     }
 
+    clippingObject.setLayerCollection(this._layerCollection);
+
+    this._defaultClippingObjects.add(clippingObject);
+
     this._listenersMap.set(clippingObject, [
       clippingObject.targetsUpdated.addEventListener(this._update.bind(this)),
       clippingObject.clippingPlaneUpdated.addEventListener(
@@ -181,11 +182,12 @@ class ClippingObjectManager {
     this._exclusiveRemovedCb = removedCb;
     this._exclusiveClippingObjects = clippingObjects;
     this._exclusiveClippingObjects.forEach((clippingObject) => {
-      clippingObject.setLayerCollection(this._layerCollection);
-
       if (this._activeMap instanceof CesiumMap) {
         clippingObject.handleMapChanged(this._activeMap);
       }
+
+      clippingObject.setLayerCollection(this._layerCollection);
+
       this._listenersMap.set(clippingObject, [
         clippingObject.targetsUpdated.addEventListener(this._update.bind(this)),
         clippingObject.clippingPlaneUpdated.addEventListener(

package/src/util/editor/editGeometrySession.ts

@@ -81,7 +81,7 @@ function createEditLineStringGeometryInteraction(
       vertices.map((f) => f.getGeometry()!.getCoordinates()),
     );
   };
-  const translateVertex = new TranslateVertexInteraction();
+  const translateVertex = new TranslateVertexInteraction(feature);
   translateVertex.vertexChanged.addEventListener(resetGeometry);
 
   const insertVertex = new InsertVertexInteraction(feature, geometry);
@@ -130,7 +130,7 @@ function createEditCircleGeometryInteraction(
     .map((c) => createVertex(c, olcsProps));
   scratchLayer.addFeatures(vertices);
 
-  const translateVertex = new TranslateVertexInteraction();
+  const translateVertex = new TranslateVertexInteraction(feature);
   let suspend = false;
   translateVertex.vertexChanged.addEventListener((vertex) => {
     suspend = true;
@@ -181,7 +181,7 @@ function createEditBBoxGeometryInteraction(
 
   scratchLayer.addFeatures(vertices);
   let suspend = false;
-  const translateVertex = new TranslateVertexInteraction();
+  const translateVertex = new TranslateVertexInteraction(feature);
   translateVertex.vertexChanged.addEventListener((vertex) => {
     const vertexIndex = vertices.indexOf(vertex);
     const originIndex = modulo(vertexIndex + 2, 4);
@@ -268,7 +268,7 @@ function createEditSimplePolygonInteraction(
     ]); // update actual geometry, since linear ring is a clone and not a ref
   };
 
-  const translateVertex = new TranslateVertexInteraction();
+  const translateVertex = new TranslateVertexInteraction(feature);
   translateVertex.vertexChanged.addEventListener(resetGeometry);
 
   const insertVertex = new InsertVertexInteraction(feature, linearRing);
@@ -318,13 +318,11 @@ function createEditPointInteraction(
   layer.featureVisibility.hideObjects(featureIdArray);
   vertex[createSync] = true;
   scratchLayer.addFeatures([vertex]);
-  const translateVertex = new TranslateVertexInteraction();
+  const translateVertex = new TranslateVertexInteraction(feature);
   let suspend = false;
   translateVertex.vertexChanged.addEventListener(() => {
     suspend = true;
-    feature
-      .getGeometry()!
-      .setCoordinates(vertex.getGeometry()!.getCoordinates());
+    geometry.setCoordinates(vertex.getGeometry()!.getCoordinates());
     suspend = false;
   });
 
@@ -425,7 +423,6 @@ function startEditGeometrySession(
       if (!geometryIsValid(currentFeature.getGeometry())) {
         layer.removeFeaturesById([currentFeature.getId() as string | number]);
       }
-      currentFeature.unset('olcs_allowPicking');
     }
     currentFeature = null;
     altitudeModeChanged();
@@ -488,7 +485,6 @@ function startEditGeometrySession(
 
       if (currentInteractionSet) {
         interactionChain.addInteraction(currentInteractionSet.interactionChain);
-        currentFeature.set('olcs_allowPicking', false);
         altitudeModeChanged();
       } else {
         getLogger('EditGeometrySession').warning(

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

@@ -1,3 +1,4 @@
+import Feature from 'ol/Feature.js';
 import AbstractInteraction, {
   EventAfterEventHandler,
 } from '../../../interaction/abstractInteraction.js';
@@ -16,8 +17,11 @@ class TranslateVertexInteraction extends AbstractInteraction {
 
   private _vertex: Vertex | null = null;
 
-  constructor() {
+  private _feature: Feature;
+
+  constructor(feature: Feature) {
     super(EventType.DRAGEVENTS);
+    this._feature = feature;
     this.setActive();
   }
 
@@ -28,6 +32,7 @@ class TranslateVertexInteraction extends AbstractInteraction {
 
       if (event.type & EventType.DRAGEND) {
         this._vertex.unset('olcs_allowPicking');
+        this._feature.unset('olcs_allowPicking');
         this._vertex.setStyle(undefined);
         this._vertex = null;
       }
@@ -39,6 +44,7 @@ class TranslateVertexInteraction extends AbstractInteraction {
     ) {
       this._vertex = event.feature as Vertex;
       this._vertex.set('olcs_allowPicking', false);
+      this._feature.set('olcs_allowPicking', false);
       this._vertex.setStyle(emptyStyle);
       event.stopPropagation = true;
     }

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,

package/src/util/flight/flightAnchor.ts

@@ -147,7 +147,7 @@ export function anchorFromGeojsonFeature(
 ): FlightAnchor | undefined {
   const options = {
     ...feature.properties,
-    name: String(feature.id) || uuidv4(),
+    name: feature.id ? String(feature.id) : uuidv4(),
     coordinate: feature.geometry.coordinates,
   };
   if (isOptions(options)) {

package/src/util/flight/flightPlayer.ts

@@ -138,6 +138,27 @@ export async function createFlightPlayer(
     }),
   ];
 
+  const getView = (
+    time: number,
+  ):
+    | {
+        destination: Cartesian3;
+        orientation: HeadingPitchRoll;
+      }
+    | undefined => {
+    if (destinationSpline && quaternionSpline) {
+      return {
+        destination: destinationSpline.evaluate(time) as Cartesian3,
+        orientation: HeadingPitchRoll.fromQuaternion(
+          quaternionSpline.evaluate(time),
+        ),
+      };
+    } else {
+      getLogger('FlightPlayer').error('cannot evaluate spline');
+    }
+    return undefined;
+  };
+
   const cesiumPostRender = (scene: Scene): void => {
     const time = Date.now() / 1000;
     if (!clock.currentSystemTime) {
@@ -170,13 +191,11 @@ export async function createFlightPlayer(
       }
     }
 
-    const view = {
-      destination: destinationSpline!.evaluate(clock.currentTime) as Cartesian3,
-      orientation: HeadingPitchRoll.fromQuaternion(
-        quaternionSpline!.evaluate(clock.currentTime),
-      ),
-    };
-    scene.camera.setView(view);
+    const view = getView(clock.currentTime);
+    if (view) {
+      scene.camera.setView(view);
+    }
+
     if (playerState === 'playing') {
       if (screenSpaceCameraController) {
         screenSpaceCameraController.enableInputs = false;
@@ -185,6 +204,12 @@ export async function createFlightPlayer(
   };
 
   const play = (): void => {
+    if (!instance.isValid()) {
+      getLogger('FlightPlayer').error(
+        `cannot play invalid flight ${instance.name}`,
+      );
+      return;
+    }
     if (playerState === 'playing') {
       return;
     }
@@ -215,6 +240,12 @@ export async function createFlightPlayer(
   };
 
   const goToTime = (time: number): void => {
+    if (!instance.isValid()) {
+      getLogger('FlightPlayer').error(
+        `cannot goToTime of invalid flight ${instance.name}`,
+      );
+      return;
+    }
     if (time > clock.endTime) {
       getLogger('FlightPlayer').warning(`time: ${time} out of range`);
       return;
@@ -222,15 +253,10 @@ export async function createFlightPlayer(
     clock.currentTime = time;
     clock.currentSystemTime = undefined;
     if (playerState !== 'playing') {
-      const view = {
-        destination: destinationSpline!.evaluate(
-          clock.currentTime,
-        ) as Cartesian3,
-        orientation: HeadingPitchRoll.fromQuaternion(
-          quaternionSpline!.evaluate(clock.currentTime),
-        ),
-      };
-      cesiumMap.getScene()?.camera.setView(view);
+      const view = getView(clock.currentTime);
+      if (view) {
+        cesiumMap.getScene()?.camera.setView(view);
+      }
     }
   };
   const destroyed = new VcsEvent<void>();