@vcmap/core 6.2.2 → 6.3.0-rc.1

package/dist/src/map/cesiumMap.d.ts

@@ -1,13 +1,12 @@
-import { JulianDate, Clock, DataSourceClock, Color, CesiumWidget, DataSourceDisplay, DataSourceCollection, ScreenSpaceEventHandler, Cartesian3, CustomDataSource, ImageryLayer, PrimitiveCollection, type Scene, type ImageryLayerCollection, type Cesium3DTileset, type TerrainProvider, type Event as CesiumEvent, type CzmlDataSource, type EntityCollection, type ShadowMap, type ContextOptions } from '@vcmap-cesium/engine';
+import { Clock, Color, type ContextOptions, CustomDataSource, DataSourceClock, DataSourceCollection, DataSourceDisplay, type EntityCollection, type Event as CesiumEvent, JulianDate, type Scene, type ShadowMap } from '@vcmap-cesium/engine';
 import type { Coordinate } from 'ol/coordinate.js';
-import VcsMap, { type VcsMapOptions } from './vcsMap.js';
+import { type VcsMapOptions } from './vcsMap.js';
 import type Viewpoint from '../util/viewpoint.js';
 import type { CameraLimiterOptions } from './cameraLimiter.js';
 import CameraLimiter from './cameraLimiter.js';
-import type LayerCollection from '../util/layerCollection.js';
-import type Layer from '../layer/layer.js';
 import VcsEvent from '../vcsEvent.js';
 import type { DisableMapControlOptions } from '../util/mapCollection.js';
+import BaseCesiumMap, { type CesiumVisualisationType } from './baseCesiumMap.js';
 export type CesiumMapOptions = VcsMapOptions & {
     /**
      * if true, lighting will be activated.
@@ -46,57 +45,19 @@ export type CesiumMapEvent = {
     scene: Scene;
     time: JulianDate;
 };
-/**
- * Ensures, a primitive/imageryLayer/entity is part of a collection and placed at the correct location
- * @param  cesiumCollection
- * @param  item
- * @param  layerCollection
- * @private
- */
-export declare function ensureInCollection<T extends PrimitiveCollection | ImageryLayerCollection>(cesiumCollection: T, item: T extends PrimitiveCollection ? PrimitiveCollection | Cesium3DTileset : ImageryLayer, layerCollection: LayerCollection): void;
-/**
- * @param  dataSourceCollection
- * @param  dataSource
- * @param  layerCollection
- * @private
- */
-export declare function ensureInDataSourceCollection(dataSourceCollection: DataSourceCollection, dataSource: CustomDataSource, layerCollection: LayerCollection): Promise<void>;
-/**
- * @param  primitiveCollection
- * @param  item
- * @param  layerCollection
- * @private
- */
-export declare function indexChangedOnPrimitive(primitiveCollection: PrimitiveCollection, item: PrimitiveCollection, layerCollection: LayerCollection): void;
-/**
- * @param  imageryLayerCollection
- * @param  item
- * @param  layerCollection
- * @private
- */
-export declare function indexChangedOnImageryLayer(imageryLayerCollection: ImageryLayerCollection, item: ImageryLayer, layerCollection: LayerCollection): void;
-/**
- * @param  dataSourceCollection
- * @param  item
- * @param  layerCollection
- * @private
- */
-export declare function indexChangedOnDataSource(dataSourceCollection: DataSourceCollection, item: CustomDataSource, layerCollection: LayerCollection): void;
 /**
  * @param  source
  * @param  target
  * @private
  */
 export declare function synchronizeClock(source: DataSourceClock, target: Clock): CesiumEvent.RemoveCallback;
-export type CesiumVisualisationType = CustomDataSource | CzmlDataSource | PrimitiveCollection | Cesium3DTileset | ImageryLayer;
 /**
  * Cesium Globe Map Class (3D map)
  * @group Map
  */
-declare class CesiumMap extends VcsMap<CesiumVisualisationType> {
+declare class CesiumMap extends BaseCesiumMap {
     static get className(): string;
     static getDefaultOptions(): CesiumMapOptions;
-    private _cesiumWidget;
     dataSourceDisplay: DataSourceDisplay | null;
     /**
      * clock for animated data
@@ -113,8 +74,6 @@ declare class CesiumMap extends VcsMap<CesiumVisualisationType> {
     private _dataSourceClocks;
     enableLightning: boolean;
     tileCacheSize: number;
-    screenSpaceEventHandler: ScreenSpaceEventHandler | null;
-    private _screenSpaceListener;
     defaultJDate: JulianDate;
     /**
      * The defaultShadowMap which is created when calling the constructor of the CesiumWidet in {@link initialize}. This is a reference, not a clone.
@@ -128,14 +87,11 @@ declare class CesiumMap extends VcsMap<CesiumVisualisationType> {
     webGLaa: boolean;
     globeColor: Color;
     private _clusterDataSourceDisplay;
-    private _terrainProvider;
-    defaultTerrainProvider: TerrainProvider | null;
     useOriginalCesiumShader: boolean;
     private _cameraLimiter;
     private _cameraLimiterOptions;
     private _preUpdateListener;
     private _clockSyncListener;
-    private _listeners;
     private _lightIntensity;
     private _contextOptions;
     constructor(options: CesiumMapOptions);
@@ -150,7 +106,6 @@ declare class CesiumMap extends VcsMap<CesiumVisualisationType> {
     get splitPosition(): number;
     set splitPosition(position: number);
     get defaultShadowMap(): ShadowMap | null;
-    get terrainProvider(): TerrainProvider | null;
     /**
      * A camera limit to not allow the camera to get too close to the globe.
      */
@@ -158,20 +113,13 @@ declare class CesiumMap extends VcsMap<CesiumVisualisationType> {
     set cameraLimiter(limiter: CameraLimiter | null);
     private _setupPreUpdateListener;
     initialize(): Promise<void>;
-    activate(): Promise<void>;
-    deactivate(): void;
     /**
      * getHeight for coordinates
      * @param  positions - in web mercator
      * @returns  the array of coordinates with heights updated in place
      */
     getHeightFromTerrain(positions: Coordinate[]): Promise<Coordinate[]>;
-    getViewpoint(): Promise<null | Viewpoint>;
-    getViewpointSync(): Viewpoint | null;
     gotoViewpoint(viewpoint: Viewpoint, optMaximumHeight?: number): Promise<void>;
-    private _getCurrentResolutionFromCartesianLatitude;
-    getCurrentResolution(coordinate: Coordinate): number;
-    getCurrentResolutionFromCartesian(cartesian: Cartesian3): number;
     disableMovement(prevent: boolean | DisableMapControlOptions): void;
     /**
      * set dataSource clock as display clock to visualize time dependent animation
@@ -199,10 +147,6 @@ declare class CesiumMap extends VcsMap<CesiumVisualisationType> {
      * Sets the default shadow map.
      */
     setDefaultShadowMap(): void;
-    /**
-     * returns the cesium Widget Object
-     */
-    getCesiumWidget(): CesiumWidget | null;
     /**
      * returns the Entities Collection
      */
@@ -216,26 +160,7 @@ declare class CesiumMap extends VcsMap<CesiumVisualisationType> {
      * This datasource can only handle Entities with Billboards, Labels or Points.
      */
     getClusterDatasources(): DataSourceCollection;
-    indexChanged(layer: Layer): void;
-    /**
-     * Internal API used to register visualizations from layer implementations
-     * @param  primitiveCollection
-     */
-    addPrimitiveCollection(primitiveCollection: PrimitiveCollection | Cesium3DTileset): void;
-    /**
-     * Internal API to unregister the visualization for a layers implementation
-     * @param  primitiveCollection
-     */
-    removePrimitiveCollection(primitiveCollection: PrimitiveCollection | Cesium3DTileset): void;
-    /**
-     * Internal API used to register visualizations from layer implementations
-     * @param  imageryLayer
-     */
-    addImageryLayer(imageryLayer: ImageryLayer): void;
-    /**
-     * Internal API used to unregister visualizations from layer implementations
-     */
-    removeImageryLayer(imageryLayer: ImageryLayer): void;
+    protected _indexChangedOnVisualization(vis: CesiumVisualisationType): void;
     /**
      * Internal API used to register visualizations from layer implementations
      */
@@ -246,28 +171,11 @@ declare class CesiumMap extends VcsMap<CesiumVisualisationType> {
     removeDataSource(dataSource: CustomDataSource): void;
     addClusterDataSource(dataSource: CustomDataSource): Promise<void>;
     removeClusterDataSource(dataSource: CustomDataSource): void;
-    /**
-     * set the cesium TerrainProvider
-     */
-    setTerrainProvider(terrainProvider: TerrainProvider): void;
-    /**
-     * unsets the TerrainProvider (changes to the default TerrainProvider if the given terranProvider is currently active)
-     */
-    unsetTerrainProvider(terrainProvider: TerrainProvider): void;
     /**
      * returns the cesium DataSourceDisplay Object
      */
     getDataSourceDisplay(): DataSourceDisplay | null;
-    /**
-     * returns the cesium Scene Object, returns null on non initialized or destroyed maps
-     */
-    getScene(): Scene | undefined;
     pointIsVisible(coords: Coordinate): boolean;
-    /**
-     * is called when the cesium Terrainprovider changes. Sets the .terrainProvider and deactivates currently
-     * active TerrainLayer layer if necessary
-     */
-    private _terrainProviderChanged;
     /**
      * returns true if the WEBGL Extension WEBGL_depth_texture is supported. (Is used for picking)
      */
@@ -276,7 +184,7 @@ declare class CesiumMap extends VcsMap<CesiumVisualisationType> {
      * returns true if the WEBGL Extension EXT_frag_depth is supported. (Is used for GroundPoloygons)
      */
     isGroundPrimitiveSupported(): boolean;
-    toJSON(): CesiumMapOptions;
+    toJSON(defaultOptions?: CesiumMapOptions): CesiumMapOptions;
     destroy(): void;
 }
 export default CesiumMap;

package/dist/src/map/cesiumMap.js

@@ -1,4 +1,4 @@
-import { JulianDate, Clock, DataSourceClock, Color, CesiumWidget, ShadowMode, DataSourceDisplay, DataSourceCollection, RequestScheduler, ScreenSpaceEventHandler, Cartesian3, Math as CesiumMath, Camera, BillboardVisualizer, LabelVisualizer, PointVisualizer, CustomDataSource, BoundingSphere, Intersect, ImageryLayer, PrimitiveCollection, } from '@vcmap-cesium/engine';
+import { BillboardVisualizer, BoundingSphere, Camera, Cartesian3, CesiumWidget, Clock, Color, CustomDataSource, DataSourceClock, DataSourceCollection, DataSourceDisplay, Intersect, JulianDate, LabelVisualizer, Math as CesiumMath, PointVisualizer, ShadowMode, } from '@vcmap-cesium/engine';
 import { check, maybe } from '@vcsuite/check';
 import { parseBoolean, parseInteger, parseNumber } from '@vcsuite/parsers';
 import VcsMap from './vcsMap.js';
@@ -9,43 +9,14 @@ import CameraLimiter from './cameraLimiter.js';
 import { mapClassRegistry } from '../classRegistry.js';
 import VcsEvent from '../vcsEvent.js';
 import { vectorClusterGroupName } from '../vectorCluster/vectorClusterSymbols.js';
-import { getResolution, getViewpointFromScene, setupCesiumInteractions, } from './cesiumMapHelpers.js';
-/**
- * Ensures, a primitive/imageryLayer/entity is part of a collection and placed at the correct location
- * @param  cesiumCollection
- * @param  item
- * @param  layerCollection
- * @private
- */
-export function ensureInCollection(cesiumCollection, item, layerCollection) {
-    const targetIndex = layerCollection.indexOfKey(item[vcsLayerName]);
-    if (targetIndex > -1) {
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-ignore
-        if (!cesiumCollection.contains(item)) {
-            const primitivesLength = cesiumCollection.length;
-            let index = primitivesLength;
-            for (let i = 0; i < primitivesLength; i++) {
-                const collectionItem = cesiumCollection.get(i);
-                if (layerCollection.indexOfKey(collectionItem[vcsLayerName]) >
-                    targetIndex) {
-                    index = i;
-                    break;
-                }
-            }
-            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-            // @ts-ignore
-            cesiumCollection.add(item, index);
-        }
-    }
-}
+import BaseCesiumMap from './baseCesiumMap.js';
 /**
  * @param  dataSourceCollection
  * @param  dataSource
  * @param  layerCollection
  * @private
  */
-export async function ensureInDataSourceCollection(dataSourceCollection, dataSource, layerCollection) {
+async function ensureInDataSourceCollection(dataSourceCollection, dataSource, layerCollection) {
     let targetIndex = -1;
     if (dataSource[vectorClusterGroupName]) {
         targetIndex = layerCollection.size;
@@ -85,36 +56,13 @@ export async function ensureInDataSourceCollection(dataSourceCollection, dataSou
         }
     }
 }
-/**
- * @param  primitiveCollection
- * @param  item
- * @param  layerCollection
- * @private
- */
-export function indexChangedOnPrimitive(primitiveCollection, item, layerCollection) {
-    const { destroyPrimitives } = primitiveCollection;
-    primitiveCollection.destroyPrimitives = false;
-    primitiveCollection.remove(item);
-    ensureInCollection(primitiveCollection, item, layerCollection);
-    primitiveCollection.destroyPrimitives = destroyPrimitives;
-}
-/**
- * @param  imageryLayerCollection
- * @param  item
- * @param  layerCollection
- * @private
- */
-export function indexChangedOnImageryLayer(imageryLayerCollection, item, layerCollection) {
-    imageryLayerCollection.remove(item, false);
-    ensureInCollection(imageryLayerCollection, item, layerCollection);
-}
 /**
  * @param  dataSourceCollection
  * @param  item
  * @param  layerCollection
  * @private
  */
-export function indexChangedOnDataSource(dataSourceCollection, item, layerCollection) {
+function indexChangedOnDataSource(dataSourceCollection, item, layerCollection) {
     // eslint-disable-next-line no-void
     void ensureInDataSourceCollection(dataSourceCollection, item, layerCollection);
 }
@@ -143,7 +91,7 @@ export function synchronizeClock(source, target) {
  * Cesium Globe Map Class (3D map)
  * @group Map
  */
-class CesiumMap extends VcsMap {
+class CesiumMap extends BaseCesiumMap {
     static get className() {
         return 'CesiumMap';
     }
@@ -160,7 +108,6 @@ class CesiumMap extends VcsMap {
             contextOptions: undefined,
         };
     }
-    _cesiumWidget = null;
     dataSourceDisplay = null;
     /**
      * clock for animated data
@@ -177,8 +124,6 @@ class CesiumMap extends VcsMap {
     _dataSourceClocks = [];
     enableLightning;
     tileCacheSize;
-    screenSpaceEventHandler = null;
-    _screenSpaceListener;
     defaultJDate;
     /**
      * The defaultShadowMap which is created when calling the constructor of the CesiumWidet in {@link initialize}. This is a reference, not a clone.
@@ -192,19 +137,16 @@ class CesiumMap extends VcsMap {
     webGLaa;
     globeColor;
     _clusterDataSourceDisplay;
-    _terrainProvider = null;
-    defaultTerrainProvider = null;
     useOriginalCesiumShader;
     _cameraLimiter = null;
     _cameraLimiterOptions;
     _preUpdateListener;
     _clockSyncListener;
-    _listeners = [];
     _lightIntensity;
     _contextOptions;
     constructor(options) {
-        super(options);
         const defaultOptions = CesiumMap.getDefaultOptions();
+        super({ ...defaultOptions, ...options });
         this.dataSourceDisplayClock = new Clock({ shouldAnimate: true });
         const defaultClock = new DataSourceClock();
         defaultClock.currentTime = this.dataSourceDisplayClock.currentTime;
@@ -247,9 +189,6 @@ class CesiumMap extends VcsMap {
     get defaultShadowMap() {
         return this._defaultShadowMap;
     }
-    get terrainProvider() {
-        return this._terrainProvider;
-    }
     /**
      * A camera limit to not allow the camera to get too close to the globe.
      */
@@ -297,7 +236,7 @@ class CesiumMap extends VcsMap {
                     antialias: this.webGLaa,
                 },
             };
-            this._cesiumWidget = new CesiumWidget(this.mapElement, {
+            const cesiumWidget = new CesiumWidget(this.mapElement, {
                 requestRenderMode: false,
                 scene3DOnly: true,
                 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
@@ -307,36 +246,30 @@ class CesiumMap extends VcsMap {
                 terrainShadows: ShadowMode.ENABLED,
                 contextOptions,
             });
-            this._cesiumWidget.scene.globe.tileCacheSize = this.tileCacheSize;
-            this._cesiumWidget.scene.globe.baseColor = this.globeColor;
+            cesiumWidget.scene.globe.tileCacheSize = this.tileCacheSize;
+            cesiumWidget.scene.globe.baseColor = this.globeColor;
             this.dataSourceDisplay = new DataSourceDisplay({
-                scene: this._cesiumWidget.scene,
+                scene: cesiumWidget.scene,
                 dataSourceCollection: new DataSourceCollection(),
             });
-            this._cesiumWidget.scene.frameState.creditDisplay.update = () => { };
-            this._cesiumWidget.scene.frameState.creditDisplay.beginFrame =
-                () => { };
-            this._cesiumWidget.scene.frameState.creditDisplay.endFrame =
-                () => { };
-            const { clock } = this._cesiumWidget;
+            cesiumWidget.scene.frameState.creditDisplay.update = () => { };
+            cesiumWidget.scene.frameState.creditDisplay.beginFrame = () => { };
+            cesiumWidget.scene.frameState.creditDisplay.endFrame = () => { };
+            const { clock } = cesiumWidget;
             clock.shouldAnimate = true;
             this._listeners.push(clock.onTick.addEventListener(() => {
                 this.dataSourceDisplayClock.tick();
                 const time = this.dataSourceDisplayClock.currentTime;
                 this.dataSourceDisplay?.update?.(time);
             }));
-            // deactivate cesium Requestthrottling let the browser manage that
-            // RequestScheduler.throttleRequests = false;
-            RequestScheduler.maximumRequestsPerServer = 12;
-            this._cesiumWidget.scene.shadowMap.maximumDistance = 5000.0;
-            this._cesiumWidget.scene.shadowMap.darkness = 0.6;
-            this._cesiumWidget.scene.globe.depthTestAgainstTerrain = true;
-            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;
-            this.setDay(this.defaultJDate);
+            cesiumWidget.scene.shadowMap.maximumDistance = 5000.0;
+            cesiumWidget.scene.shadowMap.darkness = 0.6;
+            cesiumWidget.scene.globe.depthTestAgainstTerrain = true;
+            cesiumWidget.scene.highDynamicRange = false;
+            // cesiumWidget.scene.logarithmicDepthBuffer = false; // TODO observe this
+            cesiumWidget.scene.splitPosition = this.splitPosition;
+            cesiumWidget.scene.light.intensity = this._lightIntensity;
+            cesiumWidget.scene.globe.enableLighting = this.enableLightning;
             // hide default cesium credits container
             const creditsContainer = document.getElementsByClassName('cesium-widget-credits');
             if (creditsContainer) {
@@ -345,25 +278,15 @@ class CesiumMap extends VcsMap {
                     element.style.display = 'none';
                 }
             }
+            this.initialized = true;
+            this._initializeCesiumWidget(cesiumWidget);
             if (this._cameraLimiterOptions && !this._cameraLimiter) {
                 this._cameraLimiter = new CameraLimiter(this._cameraLimiterOptions);
             }
             if (this._cameraLimiter) {
                 this._setupPreUpdateListener();
             }
-            this.screenSpaceEventHandler = new ScreenSpaceEventHandler(this._cesiumWidget.scene.canvas);
-            this._screenSpaceListener = setupCesiumInteractions(this, this._cesiumWidget.scene, this.screenSpaceEventHandler);
-            this.initialized = true;
-            this.defaultTerrainProvider = this._cesiumWidget.scene.terrainProvider;
-            this._terrainProvider = this.defaultTerrainProvider;
-            this._listeners.push(this._cesiumWidget.scene.terrainProviderChanged.addEventListener(this._terrainProviderChanged.bind(this)));
-            this._listeners.push(this._cesiumWidget.scene.postRender.addEventListener((eventScene, time) => {
-                this.postRender.raiseEvent({
-                    map: this,
-                    originalEvent: { scene: eventScene, time },
-                });
-            }));
-            this._defaultShadowMap = this._cesiumWidget.scene.shadowMap;
+            this._defaultShadowMap = cesiumWidget.scene.shadowMap;
             if (this._initialShadowMap) {
                 this.setShadowMap(this._initialShadowMap);
                 this._initialShadowMap = undefined;
@@ -371,19 +294,6 @@ class CesiumMap extends VcsMap {
         }
         return Promise.resolve();
     }
-    async activate() {
-        await super.activate();
-        if (this.active && this._cesiumWidget) {
-            this._cesiumWidget.useDefaultRenderLoop = true;
-            this._cesiumWidget.resize();
-        }
-    }
-    deactivate() {
-        super.deactivate();
-        if (this._cesiumWidget) {
-            this._cesiumWidget.useDefaultRenderLoop = false;
-        }
-    }
     /**
      * getHeight for coordinates
      * @param  positions - in web mercator
@@ -399,15 +309,6 @@ class CesiumMap extends VcsMap {
         }
         return Promise.resolve(positions);
     }
-    getViewpoint() {
-        return Promise.resolve(this.getViewpointSync());
-    }
-    getViewpointSync() {
-        if (!this._cesiumWidget || !this._cesiumWidget.scene || !this.target) {
-            return null;
-        }
-        return getViewpointFromScene(this._cesiumWidget.scene);
-    }
     async gotoViewpoint(viewpoint, optMaximumHeight) {
         if (this.movementApiCallsDisabled ||
             !viewpoint.isValid() ||
@@ -487,20 +388,6 @@ class CesiumMap extends VcsMap {
             });
         }
     }
-    _getCurrentResolutionFromCartesianLatitude(cartesian, latitude) {
-        if (!this._cesiumWidget) {
-            return 1;
-        }
-        return getResolution(cartesian, this._cesiumWidget.camera, this.mapElement, latitude);
-    }
-    getCurrentResolution(coordinate) {
-        const wgs84Coordinate = Projection.mercatorToWgs84(coordinate);
-        const cartesian = Cartesian3.fromDegrees(wgs84Coordinate[0], wgs84Coordinate[1], wgs84Coordinate[2]);
-        return this._getCurrentResolutionFromCartesianLatitude(cartesian, CesiumMath.toRadians(wgs84Coordinate[1]));
-    }
-    getCurrentResolutionFromCartesian(cartesian) {
-        return this._getCurrentResolutionFromCartesianLatitude(cartesian);
-    }
     disableMovement(prevent) {
         super.disableMovement(prevent);
         if (this._cesiumWidget) {
@@ -587,12 +474,6 @@ class CesiumMap extends VcsMap {
         }
         this.setShadowMap(this._defaultShadowMap);
     }
-    /**
-     * returns the cesium Widget Object
-     */
-    getCesiumWidget() {
-        return this._cesiumWidget;
-    }
     /**
      * returns the Entities Collection
      */
@@ -635,64 +516,14 @@ class CesiumMap extends VcsMap {
         }));
         return dataSourceCollection;
     }
-    indexChanged(layer) {
-        const viz = this.getVisualizationsForLayer(layer);
-        if (viz) {
-            viz.forEach((item) => {
-                if (item instanceof PrimitiveCollection) {
-                    indexChangedOnPrimitive(this.getScene().primitives, item, this.layerCollection);
-                }
-                else if (item instanceof ImageryLayer) {
-                    indexChangedOnImageryLayer(this.getScene().imageryLayers, item, this.layerCollection);
-                }
-                else if (item instanceof CustomDataSource) {
-                    indexChangedOnDataSource(this.dataSourceDisplay.dataSources, item, this.layerCollection);
-                }
-            });
-        }
-    }
-    /**
-     * Internal API used to register visualizations from layer implementations
-     * @param  primitiveCollection
-     */
-    addPrimitiveCollection(primitiveCollection) {
-        if (!this._cesiumWidget) {
-            throw new Error('Cannot add primitive to uninitialized map');
-        }
-        if (this.validateVisualization(primitiveCollection)) {
-            this.addVisualization(primitiveCollection);
-            ensureInCollection(this._cesiumWidget.scene.primitives, primitiveCollection, this.layerCollection);
+    _indexChangedOnVisualization(vis) {
+        if (vis instanceof CustomDataSource) {
+            indexChangedOnDataSource(this.dataSourceDisplay.dataSources, vis, this.layerCollection);
         }
-    }
-    /**
-     * Internal API to unregister the visualization for a layers implementation
-     * @param  primitiveCollection
-     */
-    removePrimitiveCollection(primitiveCollection) {
-        // XXX add destroy as boolean?
-        this.removeVisualization(primitiveCollection);
-        this.getScene()?.primitives.remove(primitiveCollection);
-    }
-    /**
-     * Internal API used to register visualizations from layer implementations
-     * @param  imageryLayer
-     */
-    addImageryLayer(imageryLayer) {
-        if (!this._cesiumWidget) {
-            throw new Error('Cannot add primitive to uninitialized map');
-        }
-        if (this.validateVisualization(imageryLayer)) {
-            this.addVisualization(imageryLayer);
-            ensureInCollection(this._cesiumWidget.scene.imageryLayers, imageryLayer, this.layerCollection);
+        else {
+            super._indexChangedOnVisualization(vis);
         }
     }
-    /**
-     * Internal API used to unregister visualizations from layer implementations
-     */
-    removeImageryLayer(imageryLayer) {
-        this.removeVisualization(imageryLayer);
-        this.getScene()?.imageryLayers.remove(imageryLayer);
-    }
     /**
      * Internal API used to register visualizations from layer implementations
      */
@@ -734,37 +565,12 @@ class CesiumMap extends VcsMap {
             this._clusterDataSourceDisplay.dataSources.remove(dataSource);
         }
     }
-    /**
-     * set the cesium TerrainProvider
-     */
-    setTerrainProvider(terrainProvider) {
-        if (this.terrainProvider !== terrainProvider && this._cesiumWidget) {
-            this._cesiumWidget.scene.terrainProvider = terrainProvider;
-        }
-    }
-    /**
-     * unsets the TerrainProvider (changes to the default TerrainProvider if the given terranProvider is currently active)
-     */
-    unsetTerrainProvider(terrainProvider) {
-        if (this.terrainProvider === terrainProvider) {
-            this._terrainProvider = this.defaultTerrainProvider;
-            if (this._cesiumWidget && this.defaultTerrainProvider) {
-                this._cesiumWidget.scene.terrainProvider = this.defaultTerrainProvider;
-            }
-        }
-    }
     /**
      * returns the cesium DataSourceDisplay Object
      */
     getDataSourceDisplay() {
         return this.dataSourceDisplay;
     }
-    /**
-     * returns the cesium Scene Object, returns null on non initialized or destroyed maps
-     */
-    getScene() {
-        return this._cesiumWidget?.scene;
-    }
     pointIsVisible(coords) {
         if (!this._cesiumWidget) {
             return false;
@@ -778,19 +584,6 @@ class CesiumMap extends VcsMap {
         }
         return false;
     }
-    /**
-     * is called when the cesium Terrainprovider changes. Sets the .terrainProvider and deactivates currently
-     * active TerrainLayer layer if necessary
-     */
-    _terrainProviderChanged(terrainProvider) {
-        if (this.terrainProvider !== terrainProvider) {
-            const layer = this.layerCollection.getByKey(this?.terrainProvider?.[vcsLayerName]);
-            this._terrainProvider = terrainProvider;
-            if (layer) {
-                layer.deactivate();
-            }
-        }
-    }
     /**
      * returns true if the WEBGL Extension WEBGL_depth_texture is supported. (Is used for picking)
      */
@@ -809,9 +602,8 @@ class CesiumMap extends VcsMap {
         }
         return this._cesiumWidget?.scene.context.fragmentDepth ?? false;
     }
-    toJSON() {
-        const config = super.toJSON();
-        const defaultOptions = CesiumMap.getDefaultOptions();
+    toJSON(defaultOptions = CesiumMap.getDefaultOptions()) {
+        const config = super.toJSON(defaultOptions);
         if (this.enableLightning !== defaultOptions.enableLightning) {
             config.enableLightning = this.enableLightning;
         }
@@ -845,17 +637,6 @@ class CesiumMap extends VcsMap {
         if (this.dataSourceDisplay && !this.dataSourceDisplay.isDestroyed()) {
             this.dataSourceDisplay.destroy();
         }
-        this._screenSpaceListener?.();
-        if (this.screenSpaceEventHandler) {
-            this.screenSpaceEventHandler.destroy();
-            this.screenSpaceEventHandler = null;
-        }
-        this._listeners.forEach((cb) => {
-            cb();
-        });
-        this._listeners = [];
-        this._terrainProvider = null;
-        this.defaultTerrainProvider = null;
         if (this._clockSyncListener) {
             this._clockSyncListener();
             this._clockSyncListener = undefined;
@@ -867,16 +648,9 @@ class CesiumMap extends VcsMap {
         if (this._cameraLimiter) {
             this._cameraLimiter = null;
         }
-        [...this.layerCollection].forEach((l) => {
-            l.removedFromMap(this);
-        });
         if (this._clusterDataSourceDisplay) {
             this._clusterDataSourceDisplay.destroy();
         }
-        if (this._cesiumWidget) {
-            this._cesiumWidget.destroy();
-            this._cesiumWidget = null;
-        }
         this._initialShadowMap = undefined;
         this._defaultShadowMap = null;
         this.shadowMapChanged.destroy();