@vcmap/core 5.0.0-rc.22 → 5.0.0-rc.24

package/index.js

@@ -13,7 +13,6 @@ export { default as CategoryCollection } from './src/category/categoryCollection
 export { layerClassRegistry, tileProviderClassRegistry, featureProviderClassRegistry, mapClassRegistry, styleClassRegistry, categoryClassRegistry, getObjectFromClassRegistry, default as ClassRegistry } from './src/classRegistry.js';
 export { volatileContextId, markVolatile, default as Context } from './src/context.js';
 export { default as AbstractFeatureProvider } from './src/featureProvider/abstractFeatureProvider.js';
-export { getGenericFeatureFromProvidedFeature } from './src/featureProvider/featureProviderHelpers.js';
 export { isProvidedFeature, showProvidedFeature } from './src/featureProvider/featureProviderSymbols.js';
 export { default as TileProviderFeatureProvider } from './src/featureProvider/tileProviderFeatureProvider.js';
 export { getFormat, default as WMSFeatureProvider } from './src/featureProvider/wmsFeatureProvider.js';
@@ -33,7 +32,7 @@ export { default as SingleImageCesiumImpl } from './src/layer/cesium/singleImage
 export { default as TerrainCesiumImpl } from './src/layer/cesium/terrainCesiumImpl.js';
 export { default as TmsCesiumImpl } from './src/layer/cesium/tmsCesiumImpl.js';
 export { default as VectorCesiumImpl } from './src/layer/cesium/vectorCesiumImpl.js';
-export { setReferenceForPicking, removeArrayFromCollection, removeFeatureFromMap, addPrimitiveToContext, default as VectorContext } from './src/layer/cesium/vectorContext.js';
+export { setReferenceForPicking, removeArrayFromCollection, removeFeatureFromMap, addPrimitiveToContext, setupScalingPrimitiveCollection, default as VectorContext } from './src/layer/cesium/vectorContext.js';
 export { default as VectorRasterTileCesiumImpl } from './src/layer/cesium/vectorRasterTileCesiumImpl.js';
 export { toContext, getCanvasFromFeatures, default as VectorTileImageryProvider } from './src/layer/cesium/vectorTileImageryProvider.js';
 export { default as WmsCesiumImpl } from './src/layer/cesium/wmsCesiumImpl.js';
@@ -79,9 +78,9 @@ export { default as StaticGeoJSONTileProvider } from './src/layer/tileProvider/s
 export { mercatorResolutionsToLevel, rectangleToExtent, default as TileProvider } from './src/layer/tileProvider/tileProvider.js';
 export { getURL, default as URLTemplateTileProvider } from './src/layer/tileProvider/urlTemplateTileProvider.js';
 export { default as TMSLayer } from './src/layer/tmsLayer.js';
-export { fvLastUpdated, globalHiderLastUpdated, updateFeatureVisibility, updateGlobalHider, synchronizeFeatureVisibilityWithSource, getGenericFeatureFromClickedObject } from './src/layer/vectorHelpers.js';
+export { fvLastUpdated, globalHiderLastUpdated, updateFeatureVisibility, updateGlobalHider, synchronizeFeatureVisibilityWithSource } from './src/layer/vectorHelpers.js';
 export { default as VectorLayer } from './src/layer/vectorLayer.js';
-export { AltitudeModeCesium, ClassificationTypeCesium, parseNearFarScalar, parseCartesian3, parseStoreyHeights, getAltitudeModeOptions, getClassificationTypeOptions, getNearFarValueOptions, getCartesian3Options, default as VectorProperties } from './src/layer/vectorProperties.js';
+export { PrimitiveOptionsType, AltitudeModeCesium, ClassificationTypeCesium, parseNearFarScalar, parseCartesian3, parseStoreyHeights, getAltitudeModeOptions, getClassificationTypeOptions, getNearFarValueOptions, getCartesian3Options, default as VectorProperties } from './src/layer/vectorProperties.js';
 export { alreadyTransformedToMercator, alreadyTransformedToImage, obliqueGeometry, doNotTransform, originalFeatureSymbol, actuallyIsCircle, createSync } from './src/layer/vectorSymbols.js';
 export { default as VectorTileLayer } from './src/layer/vectorTileLayer.js';
 export { default as WFSLayer } from './src/layer/wfsLayer.js';
@@ -106,6 +105,8 @@ export { default as ObliqueView } from './src/oblique/obliqueView.js';
 export { ObliqueViewDirection, obliqueViewDirectionNames, getDirectionName } from './src/oblique/obliqueViewDirection.js';
 export { getVersionFromImageJson, parseImageMeta, parseImageData, parseLegacyImageData } from './src/oblique/parseImageJson.js';
 export { default as OverrideClassRegistry } from './src/overrideClassRegistry.js';
+export { featureArcStruct, default as ArcStyle } from './src/style/arcStyle.js';
+export { ArrowEnd, default as ArrowStyle } from './src/style/arrowStyle.js';
 export { defaultDeclarativeStyle, default as DeclarativeStyleItem } from './src/style/declarativeStyleItem.js';
 export { getShapeFromOptions, shapeCategory } from './src/style/shapesCategory.js';
 export { getStyleOrDefaultStyle } from './src/style/styleFactory.js';
@@ -118,30 +119,44 @@ export { default as ClippingObjectManager } from './src/util/clipping/clippingOb
 export { createClippingPlaneCollection, copyClippingPlanesToCollection, clearClippingPlanes, setClippingPlanes, createClippingFeature, getClippingOptions } from './src/util/clipping/clippingPlaneHelper.js';
 export { default as Collection } from './src/util/collection.js';
 export { default as startCreateFeatureSession } from './src/util/editor/createFeatureSession.js';
+export { default as startEditFeaturesSession } from './src/util/editor/editFeaturesSession.js';
 export { default as startEditGeometrySession } from './src/util/editor/editGeometrySession.js';
-export { createVertex, pointOnLine3D, pointOnLine2D, createVerticalPlane, createHorizontalPlane } from './src/util/editor/editorHelpers.js';
+export { createVertex, getClosestPointOn2DLine, pointOnLine3D, pointOnLine2D, createCameraVerticalPlane, createHorizontalPlane, getCartographicFromPlane, drapeGeometryOnTerrain, placeGeometryOnTerrain, ensureFeatureAbsolute, clampFeature } from './src/util/editor/editorHelpers.js';
 export { SessionType, setupScratchLayer, GeometryType } from './src/util/editor/editorSessionHelpers.js';
-export { vertexSymbol, vertexIndex } from './src/util/editor/editorSymbols.js';
+export { vertexSymbol, vertexIndex, handlerSymbol } from './src/util/editor/editorSymbols.js';
 export { default as CreateBBoxInteraction } from './src/util/editor/interactions/createBBoxInteraction.js';
 export { default as CreateCircleInteraction } from './src/util/editor/interactions/createCircleInteraction.js';
 export { default as CreateLineStringInteraction } from './src/util/editor/interactions/createLineStringInteraction.js';
 export { default as CreatePointInteraction } from './src/util/editor/interactions/createPointInteraction.js';
 export { default as CreatePolygonInteraction } from './src/util/editor/interactions/createPolygonInteraction.js';
+export { default as EditFeaturesMouseOverInteraction } from './src/util/editor/interactions/editFeaturesMouseOverInteraction.js';
 export { cursorMap, default as EditGeometryMouseOverInteraction } from './src/util/editor/interactions/editGeometryMouseOverInteraction.js';
+export { default as EnsureHandlerSelectionInteraction } from './src/util/editor/interactions/ensureHandlerSelectionInteraction.js';
 export { default as InsertVertexInteraction } from './src/util/editor/interactions/insertVertexInteraction.js';
 export { default as MapInteractionController } from './src/util/editor/interactions/mapInteractionController.js';
 export { default as RemoveVertexInteraction } from './src/util/editor/interactions/removeVertexInteraction.js';
+export { default as SelectMultiFeatureInteraction } from './src/util/editor/interactions/selectMultiFeatureInteraction.js';
 export { default as SelectSingleFeatureInteraction } from './src/util/editor/interactions/selectSingleFeatureInteraction.js';
 export { default as TranslateVertexInteraction } from './src/util/editor/interactions/translateVertexInteraction.js';
+export { default as create2DHandlers } from './src/util/editor/transformation/create2DHandlers.js';
+export { default as create3DHandlers } from './src/util/editor/transformation/create3DHandlers.js';
+export { default as ExtrudeInteraction } from './src/util/editor/transformation/extrudeInteraction.js';
+export { default as RotateInteraction } from './src/util/editor/transformation/rotateInteraction.js';
+export { default as ScaleInteraction } from './src/util/editor/transformation/scaleInteraction.js';
+export { default as createTransformationHandler } from './src/util/editor/transformation/transformationHandler.js';
+export { AXIS_AND_PLANES, TransformationMode, greyedOutColor, is1DAxis, is2DAxis } from './src/util/editor/transformation/transformationTypes.js';
+export { default as TranslateInteraction } from './src/util/editor/transformation/translateInteraction.js';
 export { default as geometryIsValid } from './src/util/editor/validateGeoemetry.js';
 export { default as ExclusiveManager } from './src/util/exclusiveManager.js';
 export { default as Extent } from './src/util/extent.js';
+export { default as arcToCesium } from './src/util/featureconverter/arcToCesium.js';
 export { validateCircle, default as circleToCesium } from './src/util/featureconverter/circleToCesium.js';
 export { getStylesArray, default as convert } from './src/util/featureconverter/convert.js';
 export { default as Extent3D } from './src/util/featureconverter/extent3D.js';
 export { getMaterialAppearance, createClassificationPrimitive, createPrimitive, createOutlinePrimitive, createLinePrimitive, getMinHeightOrGroundLevel, getStoreyHeights, validateStoreys, getHeightAboveGround, getHeightInfo, getStoreyOptions, addPrimitivesToContext } from './src/util/featureconverter/featureconverterHelper.js';
-export { validateLineString, default as lineStringToCesium } from './src/util/featureconverter/lineStringToCesium.js';
-export { getBillboardOptions, getLabelOptions, getModelOptions, validatePoint, getCartesian3AndWGS84FromCoordinates, default as pointToCesium } from './src/util/featureconverter/pointToCesium.js';
+export { addArrowsToContext, validateLineString, default as lineStringToCesium } from './src/util/featureconverter/lineStringToCesium.js';
+export { getModelOptions, getPrimitiveOptions } from './src/util/featureconverter/pointHelpers.js';
+export { getBillboardOptions, getLabelOptions, validatePoint, getCartesian3AndWGS84FromCoordinates, default as pointToCesium } from './src/util/featureconverter/pointToCesium.js';
 export { validatePolygon, default as polygonToCesium } from './src/util/featureconverter/polygonToCesium.js';
 export { requestUrl, requestJson, requestArrayBuffer } from './src/util/fetch.js';
 export { getFlatCoordinatesFromSimpleGeometry, getFlatCoordinatesFromGeometry, circleFromCenterRadius, convertGeometryToPolygon, enforceEndingVertex, removeEndingVertex, removeEndingVertexFromGeometry, enforceRightHand } from './src/util/geometryHelpers.js';
@@ -150,7 +165,7 @@ export { isMobile } from './src/util/isMobile.js';
 export { maxZIndex, default as LayerCollection } from './src/util/layerCollection.js';
 export { detectBrowserLocale } from './src/util/locale.js';
 export { default as MapCollection } from './src/util/mapCollection.js';
-export { coordinateAtDistance, initialBearingBetweenCoords, cartesian2DDistance, cartesian3DDistance, modulo } from './src/util/math.js';
+export { coordinateAtDistance, initialBearingBetweenCoords, getCartesianBearing, cartesian2DDistance, cartesian3DDistance, modulo, cartographicToWgs84, mercatorToCartesian, cartesianToMercator, getMidPoint, getCartesianPitch } from './src/util/math.js';
 export { isOverrideCollection, default as makeOverrideCollection } from './src/util/overrideCollection.js';
 export { wgs84ToMercatorTransformer, mercatorToWgs84Transformer, setDefaultProjectionOptions, getDefaultProjection, wgs84Projection, mercatorProjection, default as Projection } from './src/util/projection.js';
 export { default as SplitScreen } from './src/util/splitScreen.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vcmap/core",
-  "version": "5.0.0-rc.22",
+  "version": "5.0.0-rc.24",
   "description": "",
   "main": "index.js",
   "type": "module",
@@ -53,7 +53,7 @@
     "sinon": "^9.2.4",
     "sinon-chai": "^3.6.0",
     "tui-jsdoc-template": "^1.2.2",
-    "typescript": "^4.6.2"
+    "typescript": "^4.9.3"
   },
   "peerDependencies": {
     "@vcmap/cesium": "~1.97.1",

package/src/category/category.js

@@ -364,7 +364,7 @@ class Category extends VcsObject {
   /**
    * @protected
    * @param {T} item
-   * @returns {Array<Object>}
+   * @returns {Object}
    */
   _serializeItem(item) {
     const config = JSON.parse(JSON.stringify(item));

package/src/featureProvider/abstractFeatureProvider.js

@@ -14,7 +14,6 @@ import { isProvidedFeature, showProvidedFeature } from './featureProviderSymbols
 /**
  * @typedef {VcsObjectOptions} AbstractFeatureProviderOptions
  * @property {import("@vcmap/core").StyleItemOptions|import("@vcmap/core").StyleItem|undefined} style - the style to apply to features created by this feature provider
- * @property {Object|undefined} genericFeatureProperties - generic properties to add to features created by this feature provider
  * @property {import("@vcmap/core").VectorProperties|import("@vcmap/core").VectorPropertiesOptions|undefined} vectorProperties - the vector properties of the features. Allow picking is false by default.
  * @property {boolean} [showGeometry=false] - show the resulting geometry in the map
  * @property {Array<string>} [mapTypes=[]] - can be used to constrict the featureProvider to specific mapTypes empty array means no restriction
@@ -38,7 +37,6 @@ class AbstractFeatureProvider extends VcsObject {
       vectorProperties: {
         allowPicking: false,
       },
-      genericFeatureProperties: undefined,
       showGeometry: false,
       mapTypes: [],
     };
@@ -79,13 +77,6 @@ class AbstractFeatureProvider extends VcsObject {
     this.vectorProperties = options.vectorProperties instanceof VectorProperties ?
       options.vectorProperties :
       new VectorProperties({ ...defaultOptions.vectorProperties, ...options.vectorProperties });
-    /**
-     * An object of potential generic feature properties to add to all feature created by this provider
-     * @type {Object<string, *>|undefined}
-     * @api
-     */
-    this.genericFeatureProperties = options.genericFeatureProperties || defaultOptions.genericFeatureProperties;
-
     /**
      * Map ClassNames Can be used to only apply this featureProvider to the specified maps
      * @type {Array<string>}
@@ -106,7 +97,7 @@ class AbstractFeatureProvider extends VcsObject {
   }
 
   /**
-   * Ensures the feature has an ID, applies all vectorProperties and adds the generic properties, style and the vcsLayerName
+   * Ensures the feature has an ID, applies all vectorProperties and adds style and the vcsLayerName
    * and isProvidedFeature symbols to the feature
    * @param {import("ol").Feature<import("ol/geom/Geometry").default>} feature
    * @returns {import("ol").Feature<import("ol/geom/Geometry").default>}
@@ -119,9 +110,6 @@ class AbstractFeatureProvider extends VcsObject {
     if (this.style) {
       feature.setStyle(this.style.style);
     }
-    if (this.genericFeatureProperties) {
-      feature.setProperties(this.genericFeatureProperties);
-    }
     feature[vcsLayerName] = this.layerName;
     feature[isProvidedFeature] = true;
     feature[showProvidedFeature] = this.showGeometry;
@@ -164,10 +152,6 @@ class AbstractFeatureProvider extends VcsObject {
       config.showGeometry = this.showGeometry;
     }
 
-    if (this.genericFeatureProperties) {
-      config.genericFeatureProperties = { ...this.genericFeatureProperties };
-    }
-
     if (this.style) {
       config.style = this.style.toJSON();
     }
@@ -187,7 +171,6 @@ class AbstractFeatureProvider extends VcsObject {
   destroy() {
     this.style = null;
     this.vectorProperties.destroy();
-    this.genericFeatureProperties = undefined;
     super.destroy();
   }
 }

package/src/featureProvider/wmsFeatureProvider.js

@@ -61,7 +61,7 @@ export function getFormat(responseType, options = {}) {
   if (responseType === 'application/vnd.ogc.gml') {
     return new GML2(options);
   }
-  if (responseType === 'application/vnd.ogc.gml/3.1.1') {
+  if (responseType === 'application/vnd.ogc.gml/3.1.1' || responseType === 'text/xml; subtype=gml/3.1.1') {
     return new GML3(options);
   }
   return null;

package/src/interaction/eventHandler.js

@@ -167,6 +167,12 @@ class EventHandler {
     this._boundKeyListener = this._keyListener.bind(this);
     window.addEventListener('keydown', this._boundKeyListener);
     window.addEventListener('keyup', this._boundKeyListener);
+
+    /**
+     * @type {VcsEvent<ModificationKeyType>}
+     * @private
+     */
+    this._modifierChanged = new VcsEvent();
   }
 
   /**
@@ -198,6 +204,13 @@ class EventHandler {
    */
   get interactions() { return this._interactionChain.chain.slice(); }
 
+  /**
+   * An event called, when the modifier changes. Order of precedence, if more then one key is pressed: SHIFT, ALT, CTRL
+   * @type {VcsEvent<ModificationKeyType>}
+   * @readonly
+   */
+  get modifierChanged() { return this._modifierChanged; }
+
   /**
    * Add a dynamic interaction to the interaction chain. This is the default methodology for
    * user map interactions, such as drawing or measuring. If another exclusive interaction is added,
@@ -417,6 +430,7 @@ class EventHandler {
       if (modifier !== this._lastDispatchedModifier) {
         this._interactionChain.modifierChanged(modifier);
         this._lastDispatchedModifier = modifier;
+        this._modifierChanged.raiseEvent(modifier);
       }
     }
   }

package/src/layer/cesium/clusterContext.js

@@ -24,6 +24,14 @@ class ClusterContext {
   // eslint-disable-next-line class-methods-use-this,no-unused-vars
   addPrimitives(primitives, feature, allowPicking) {}
 
+  /**
+   * @param {Array<import("@vcmap/cesium").Primitive|import("@vcmap/cesium").GroundPrimitive|import("@vcmap/cesium").GroundPolylinePrimitive|import("@vcmap/cesium").ClassificationPrimitive|import("@vcmap/cesium").Model>} primitives
+   * @param {import("ol").Feature<import("ol/geom/Geometry").default>} feature
+   * @param {boolean=} allowPicking
+   */
+  // eslint-disable-next-line class-methods-use-this,no-unused-vars
+  addScaledPrimitives(primitives, feature, allowPicking) {}
+
   /**
    * @param {Array<Object>} billboardOptions
    * @param {import("ol").Feature<import("ol/geom/Geometry").default>} feature
@@ -90,6 +98,10 @@ class ClusterContext {
     this.featureToBillboardMap.clear();
     this.featureToLabelMap.clear();
   }
+
+  destroy() {
+    this.clear();
+  }
 }
 
 export default ClusterContext;

package/src/layer/cesium/vectorCesiumImpl.js

@@ -104,7 +104,7 @@ class VectorCesiumImpl extends LayerImplementation {
    */
   async _setupContext(cesiumMap) {
     const rootCollection = /** @type {import("@vcmap/cesium").PrimitiveCollection} */ (this._rootCollection);
-    this._context = new VectorContext(this._scene, rootCollection);
+    this._context = new VectorContext(cesiumMap, rootCollection);
     cesiumMap.addPrimitiveCollection(rootCollection);
   }
 
@@ -230,7 +230,7 @@ class VectorCesiumImpl extends LayerImplementation {
    */
   destroy() {
     if (this.initialized) {
-      this._context.clear();
+      this._context.destroy();
       this._destroyCollection();
     }
     this._context = null;

package/src/layer/cesium/vectorContext.js

@@ -1,8 +1,17 @@
-import { PrimitiveCollection, BillboardCollection, LabelCollection } from '@vcmap/cesium';
+import {
+  PrimitiveCollection,
+  BillboardCollection,
+  LabelCollection,
+  Matrix4,
+  Cartesian3,
+  Math as CesiumMath,
+} from '@vcmap/cesium';
+import Viewpoint from '../../util/viewpoint.js';
 
 /**
  * @typedef {Object} VectorContextFeatureCache
  * @property {Array<import("@vcmap/cesium").Primitive|import("@vcmap/cesium").GroundPrimitive|import("@vcmap/cesium").GroundPolylinePrimitive|import("@vcmap/cesium").ClassificationPrimitive|import("@vcmap/cesium").Model>|undefined} primitives
+ * @property {Array<import("@vcmap/cesium").Primitive|import("@vcmap/cesium").GroundPrimitive|import("@vcmap/cesium").GroundPolylinePrimitive|import("@vcmap/cesium").ClassificationPrimitive|import("@vcmap/cesium").Model>|undefined} scaledPrimitives
  * @property {Array<import("@vcmap/cesium").Billboard|import("@vcmap/cesium").Entity>|undefined} billboards
  * @property {Array<import("@vcmap/cesium").Label|import("@vcmap/cesium").Entity>|undefined} labels
  */
@@ -31,10 +40,11 @@ export function removeArrayFromCollection(collection, array) {
  * @param {import("ol").Feature<import("ol/geom/Geometry").default>} feature
  * @param {Map<import("ol").Feature<import("ol/geom/Geometry").default>, Array<import("@vcmap/cesium").Primitive|import("@vcmap/cesium").GroundPrimitive|import("@vcmap/cesium").GroundPolylinePrimitive|import("@vcmap/cesium").ClassificationPrimitive|import("@vcmap/cesium").Billboard|import("@vcmap/cesium").Label|import("@vcmap/cesium").Entity|import("@vcmap/cesium").Model>>} featuresMap
  * @param {import("@vcmap/cesium").PrimitiveCollection|import("@vcmap/cesium").BillboardCollection|import("@vcmap/cesium").LabelCollection|import("@vcmap/cesium").EntityCollection} primitiveCollection
+ * @returns {boolean} - if a feature was removed from the map
  */
 export function removeFeatureFromMap(feature, featuresMap, primitiveCollection) {
   removeArrayFromCollection(primitiveCollection, featuresMap.get(feature));
-  featuresMap.delete(feature);
+  return featuresMap.delete(feature);
 }
 
 /**
@@ -61,31 +71,94 @@ export function addPrimitiveToContext(primitives, feature, allowPicking, primiti
   }
 }
 
+/**
+ * Symbol used in self scaling
+ * @type {symbol}
+ */
+const scaleSymbol = Symbol('Scale');
+/**
+ * self scaling scratch
+ * @type {import("@vcmap/cesium").Cartesian3}
+ */
+const scratchCenter = new Cartesian3();
+
+/**
+ * Creates a self scaling primitive collection. It will scale a primitive of model in the collection
+ * in such a fashion, that the cartesian unit of 1 equals 1 pixel.
+ * @param {import("@vcmap/core").CesiumMap} map
+ * @param {import("@vcmap/cesium").PrimitiveCollection} primitiveCollection
+ * @param {{value: boolean}}dirtyRef
+ * @returns {function():void}
+ */
+export function setupScalingPrimitiveCollection(map, primitiveCollection, dirtyRef) {
+  let cachedVP = new Viewpoint({});
+  return map.getScene().postRender.addEventListener(() => {
+    const { length } = primitiveCollection;
+    if (length === 0) {
+      return;
+    }
+
+    const vp = map.getViewpointSync();
+    if (!dirtyRef.value && cachedVP.equals(vp, CesiumMath.EPSILON5)) {
+      return;
+    }
+
+    for (let i = 0; i < length; i++) {
+      const primitive = primitiveCollection.get(i);
+      if (!primitive.isDestroyed()) {
+        const { modelMatrix } = primitive;
+        const center = Matrix4.getTranslation(modelMatrix, scratchCenter);
+        const res = map.getCurrentResolutionFromCartesian(center);
+        if (primitive[scaleSymbol] !== res) {
+          primitive.modelMatrix = Matrix4.setScale(modelMatrix, new Cartesian3(res, res, res), new Matrix4());
+          primitive[scaleSymbol] = res;
+        }
+      }
+    }
+    dirtyRef.value = false;
+    cachedVP = vp;
+  });
+}
+
 /**
  * @class
  */
 class VectorContext {
   /**
-   * @param {import("@vcmap/cesium").Scene} scene
+   * @param {import("@vcmap/core").CesiumMap} map
    * @param {import("@vcmap/cesium").PrimitiveCollection} rootCollection
    */
-  constructor(scene, rootCollection) {
+  constructor(map, rootCollection) {
+    const scene = map.getScene();
     /** @type {import("@vcmap/cesium").PrimitiveCollection} */
     this.primitives = new PrimitiveCollection();
+    /** @type {import("@vcmap/cesium").PrimitiveCollection} */
+    this.scaledPrimitives = new PrimitiveCollection();
     /** @type {import("@vcmap/cesium").BillboardCollection} */
     this.billboards = new BillboardCollection({ scene });
     /** @type {import("@vcmap/cesium").LabelCollection} */
     this.labels = new LabelCollection({ scene });
     /** @type {Map<import("ol").Feature<import("ol/geom/Geometry").default>, Array<import("@vcmap/cesium").Primitive|import("@vcmap/cesium").GroundPrimitive|import("@vcmap/cesium").GroundPolylinePrimitive|import("@vcmap/cesium").ClassificationPrimitive|import("@vcmap/cesium").Model>>} */
     this.featureToPrimitiveMap = new Map();
+    /** @type {Map<import("ol").Feature<import("ol/geom/Geometry").default>, Array<import("@vcmap/cesium").Primitive|import("@vcmap/cesium").GroundPrimitive|import("@vcmap/cesium").GroundPolylinePrimitive|import("@vcmap/cesium").ClassificationPrimitive|import("@vcmap/cesium").Model>>} */
+    this.featureToScaledPrimitiveMap = new Map();
     /** @type {Map<import("ol").Feature<import("ol/geom/Geometry").default>, Array<import("@vcmap/cesium").Billboard>>} */
     this.featureToBillboardMap = new Map();
     /** @type {Map<import("ol").Feature<import("ol/geom/Geometry").default>, Array<import("@vcmap/cesium").Label>>} */
     this.featureToLabelMap = new Map();
 
-    rootCollection.add(this.primitives);
-    rootCollection.add(this.billboards);
-    rootCollection.add(this.labels);
+    /**
+     * @type {import("@vcmap/cesium").PrimitiveCollection}
+     * @private
+     */
+    this._rootCollection = rootCollection;
+    this._rootCollection.add(this.primitives);
+    this._rootCollection.add(this.scaledPrimitives);
+    this._rootCollection.add(this.billboards);
+    this._rootCollection.add(this.labels);
+
+    this._scaledDirty = { value: true };
+    this._postRenderListener = setupScalingPrimitiveCollection(map, this.scaledPrimitives, this._scaledDirty);
   }
 
   /**
@@ -97,6 +170,16 @@ class VectorContext {
     addPrimitiveToContext(primitives, feature, allowPicking, this.primitives, this.featureToPrimitiveMap);
   }
 
+  /**
+   * @param {Array<import("@vcmap/cesium").Primitive|import("@vcmap/cesium").GroundPrimitive|import("@vcmap/cesium").GroundPolylinePrimitive|import("@vcmap/cesium").ClassificationPrimitive|import("@vcmap/cesium").Model>} primitives
+   * @param {import("ol").Feature<import("ol/geom/Geometry").default>} feature
+   * @param {boolean=} allowPicking
+   */
+  addScaledPrimitives(primitives, feature, allowPicking) {
+    addPrimitiveToContext(primitives, feature, allowPicking, this.scaledPrimitives, this.featureToScaledPrimitiveMap);
+    this._scaledDirty.value = true;
+  }
+
   /**
    * @param {Array<Object>} billboardOptions
    * @param {import("ol").Feature<import("ol/geom/Geometry").default>} feature
@@ -120,6 +203,7 @@ class VectorContext {
    */
   removeFeature(feature) {
     removeFeatureFromMap(feature, this.featureToPrimitiveMap, this.primitives);
+    this._scaledDirty.value = removeFeatureFromMap(feature, this.featureToScaledPrimitiveMap, this.scaledPrimitives);
     removeFeatureFromMap(feature, this.featureToBillboardMap, this.billboards);
     removeFeatureFromMap(feature, this.featureToLabelMap, this.labels);
   }
@@ -134,6 +218,8 @@ class VectorContext {
     const cache = {};
     cache.primitives = this.featureToPrimitiveMap.get(feature);
     this.featureToPrimitiveMap.delete(feature);
+    cache.scaledPrimitives = this.featureToScaledPrimitiveMap.get(feature);
+    this.featureToScaledPrimitiveMap.delete(feature);
     cache.billboards = this.featureToBillboardMap.get(feature);
     this.featureToBillboardMap.delete(feature);
     cache.labels = this.featureToLabelMap.get(feature);
@@ -146,6 +232,7 @@ class VectorContext {
    */
   clearFeatureCache(cache) {
     removeArrayFromCollection(this.primitives, cache.primitives);
+    removeArrayFromCollection(this.scaledPrimitives, cache.scaledPrimitives);
     removeArrayFromCollection(this.billboards, cache.billboards);
     removeArrayFromCollection(this.labels, cache.labels);
   }
@@ -156,11 +243,32 @@ class VectorContext {
    */
   clear() {
     this.primitives.removeAll();
+    this.scaledPrimitives.removeAll();
     this.billboards.removeAll();
     this.labels.removeAll();
     this.featureToBillboardMap.clear();
     this.featureToLabelMap.clear();
     this.featureToPrimitiveMap.clear();
+    this._scaledDirty.value = this.featureToScaledPrimitiveMap.size > 0;
+    this.featureToScaledPrimitiveMap.clear();
+  }
+
+  /**
+   * Destroys this context and all its resources
+   */
+  destroy() {
+    if (this._rootCollection) {
+      this._rootCollection.remove(this.primitives);
+      this._rootCollection.remove(this.scaledPrimitives);
+      this._rootCollection.remove(this.billboards);
+      this._rootCollection.remove(this.labels);
+    }
+    this._rootCollection = null;
+    this.featureToBillboardMap.clear();
+    this.featureToLabelMap.clear();
+    this.featureToPrimitiveMap.clear();
+    this.featureToScaledPrimitiveMap.clear();
+    this._postRenderListener();
   }
 }
 

package/src/layer/cesiumTilesetLayer.js

@@ -276,20 +276,6 @@ class CesiumTilesetLayer extends FeatureLayer {
     return null;
   }
 
-  // TODO type params
-  getGenericFeatureFromClickedObject(object) {
-    const attributes = { ...this.genericFeatureProperties, ...object.attributes || object };
-    return {
-      layerName: this.name,
-      layerClass: this.className,
-      attributes,
-      longitude: object.clickedPosition.longitude,
-      latitude: object.clickedPosition.latitude,
-      height: object.clickedPosition.height + this.balloonHeightOffset,
-      relativeToGround: false,
-    };
-  }
-
   /**
    * set the maximum screenspace error of this layer
    * @param {number} value

package/src/layer/czmlLayer.js

@@ -5,7 +5,7 @@ import { vcsLayerName } from './layerSymbols.js';
 import { layerClassRegistry } from '../classRegistry.js';
 
 /**
- * @typedef {DataSourceOptions} CzmlOptions
+ * @typedef {LayerOptions} CzmlOptions
  * @property {string|undefined} sourceUri
  * @api
  */

package/src/layer/dataSourceLayer.js

@@ -6,12 +6,6 @@ import { vcsLayerName } from './layerSymbols.js';
 import FeatureVisibility, { FeatureVisibilityAction } from './featureVisibility.js';
 import { layerClassRegistry } from '../classRegistry.js';
 
-/**
- * @typedef {LayerOptions} DataSourceOptions
- * @property {Object|undefined} genericFeatureProperties
- * @api
- */
-
 /**
  * @typedef {Object} DataSourcePickedObject
  * @property {import("@vcmap/cesium").Entity} id
@@ -36,21 +30,10 @@ class DataSourceLayer extends Layer {
   static get className() { return 'DataSourceLayer'; }
 
   /**
-   * @returns {DataSourceOptions}
-   */
-  static getDefaultOptions() {
-    return {
-      ...Layer.getDefaultOptions(),
-      genericFeatureProperties: {},
-    };
-  }
-
-  /**
-   * @param {DataSourceOptions} options
+   * @param {LayerOptions} options
    */
   constructor(options) {
     super(options);
-    const defaultOptions = DataSourceLayer.getDefaultOptions();
     /**
      * The entities of this layer. Use the `addEntity` API to add Enitities to ensure interoperability with vcm interfaces
      * @type {import("@vcmap/cesium").EntityCollection}
@@ -61,12 +44,6 @@ class DataSourceLayer extends Layer {
      * @type {import("@vcmap/cesium").DataSourceClock|undefined}
      */
     this.clock = undefined;
-    /**
-     * @type {Object}
-     * @private
-     */
-    this._genericFeatureProperties = options.genericFeatureProperties || defaultOptions.genericFeatureProperties;
-
     /**
      * The feature visibility of this layer. NOTE: Entities cannot be highlighted at this moment.
      * @type {FeatureVisibility}
@@ -223,35 +200,6 @@ class DataSourceLayer extends Layer {
     return null;
   }
 
-  /**
-   * @param {DataSourcePickedObject} object
-   * @returns {GenericFeature}
-   */
-  getGenericFeatureFromClickedObject(object) {
-    const attributes = { ...this._genericFeatureProperties, ...object.attributes || {} };
-    return {
-      layerName: this.name,
-      layerClass: this.className,
-      attributes,
-      longitude: object.clickedPosition.longitude,
-      latitude: object.clickedPosition.latitude,
-      height: object.clickedPosition.height,
-      relativeToGround: false,
-    };
-  }
-
-  /**
-   * @inheritDoc
-   * @returns {DataSourceOptions}
-   */
-  toJSON() {
-    const config = /** @type {DataSourceOptions} */ (super.toJSON());
-    if (Object.keys(this._genericFeatureProperties).length > 0) {
-      config.genericFeatureProperties = { ...this._genericFeatureProperties };
-    }
-    return config;
-  }
-
   /**
    * @inheritDoc
    */