@vcmap/core 5.0.0-rc.5 → 5.0.0-rc.8

package/src/{vcs/vcm/layer/vector.js → layer/vectorLayer.js}

@@ -6,9 +6,9 @@ import { check } from '@vcsuite/check';
 import { parseBoolean } from '@vcsuite/parsers';
 import Projection, { getDefaultProjection, mercatorProjection } from '../util/projection.js';
 import Layer, { vcsMetaVersion } from './layer.js';
-import VectorStyleItem, { defaultVectorStyle, vectorStyleSymbol } from '../util/style/vectorStyleItem.js';
-import DeclarativeStyleItem from '../util/style/declarativeStyleItem.js';
-import writeStyle from '../util/style/writeStyle.js';
+import VectorStyleItem, { defaultVectorStyle, vectorStyleSymbol } from '../style/vectorStyleItem.js';
+import DeclarativeStyleItem from '../style/declarativeStyleItem.js';
+import writeStyle from '../style/writeStyle.js';
 import {
   alreadyTransformedToImage,
   alreadyTransformedToMercator,
@@ -19,14 +19,14 @@ import {
 import Extent from '../util/extent.js';
 import VectorProperties from './vectorProperties.js';
 import FeatureLayer from './featureLayer.js';
-import Openlayers from '../maps/openlayers.js';
-import VectorOpenlayers from './openlayers/vectorOpenlayers.js';
-import VectorCesium from './cesium/vectorCesium.js';
-import VectorOblique from './oblique/vectorOblique.js';
-import Oblique from '../maps/oblique.js';
-import CesiumMap from '../maps/cesium.js';
+import OpenlayersMap from '../map/openlayersMap.js';
+import VectorOpenlayersImpl from './openlayers/vectorOpenlayersImpl.js';
+import VectorCesiumImpl from './cesium/vectorCesiumImpl.js';
+import VectorObliqueImpl from './oblique/vectorObliqueImpl.js';
+import ObliqueMap from '../map/obliqueMap.js';
+import CesiumMap from '../map/cesiumMap.js';
 import { originalStyle, updateOriginalStyle } from './featureVisibility.js';
-import StyleItem, { referenceableStyleSymbol, StyleType } from '../util/style/styleItem.js';
+import StyleItem, { referenceableStyleSymbol, StyleType } from '../style/styleItem.js';
 import { getGenericFeatureFromClickedObject } from './vectorHelpers.js';
 import { VcsClassRegistry } from '../classRegistry.js';
 
@@ -82,18 +82,18 @@ import { VcsClassRegistry } from '../classRegistry.js';
  */
 
 /**
- * Vector Layer for Openlayers, Cesium and Oblique
+ * VectorLayer Layer for OpenlayersMap, Cesium and ObliqueMap
  * @class
  * @export
  * @extends {FeatureLayer}
  * @api stable
  */
-class Vector extends FeatureLayer {
+class VectorLayer extends FeatureLayer {
   /**
    * @readonly
    * @returns {string}
    */
-  static get className() { return 'vcs.vcm.layer.Vector'; }
+  static get className() { return 'VectorLayer'; }
 
   /**
    * @returns {symbol}
@@ -150,11 +150,11 @@ class Vector extends FeatureLayer {
 
     this._supportedMaps = [
       CesiumMap.className,
-      Oblique.className,
-      Openlayers.className,
+      ObliqueMap.className,
+      OpenlayersMap.className,
     ];
 
-    const defaultOptions = Vector.getDefaultOptions();
+    const defaultOptions = VectorLayer.getDefaultOptions();
     /** @type {import("ol/source").Vector<import("ol/geom/Geometry").default>} */
     this.source = new VectorSource({});
 
@@ -321,23 +321,23 @@ class Vector extends FeatureLayer {
   /**
    * @inheritDoc
    * @param {import("@vcmap/core").VcsMap} map
-   * @returns {Array<VectorOblique|VectorCesium|VectorOpenlayers>}
+   * @returns {Array<VectorObliqueImpl|VectorCesiumImpl|VectorOpenlayersImpl>}
    */
   createImplementationsForMap(map) {
     if (!this.visibility) {
       return [];
     }
 
-    if (map instanceof Openlayers) {
-      return [new VectorOpenlayers(map, this.getImplementationOptions())];
+    if (map instanceof OpenlayersMap) {
+      return [new VectorOpenlayersImpl(map, this.getImplementationOptions())];
     }
 
     if (map instanceof CesiumMap) {
-      return [new VectorCesium(map, this.getImplementationOptions())];
+      return [new VectorCesiumImpl(map, this.getImplementationOptions())];
     }
 
-    if (map instanceof Oblique) {
-      return [new VectorOblique(map, this.getImplementationOptions())];
+    if (map instanceof ObliqueMap) {
+      return [new VectorObliqueImpl(map, this.getImplementationOptions())];
     }
 
     return [];
@@ -453,9 +453,9 @@ class Vector extends FeatureLayer {
         if (this.projection.epsg !== mercatorProjection.epsg) {
           const geometry = feature.getGeometry();
           if (geometry) {
-            if (!geometry[Vector.alreadyTransformedToMercator]) {
+            if (!geometry[VectorLayer.alreadyTransformedToMercator]) {
               geometry.transform(this.projection.proj, mercatorProjection.proj);
-              geometry[Vector.alreadyTransformedToMercator] = true;
+              geometry[VectorLayer.alreadyTransformedToMercator] = true;
             }
           }
         }
@@ -575,7 +575,7 @@ class Vector extends FeatureLayer {
    */
   toJSON() {
     const config = /** @type {VectorOptions} */ (super.toJSON());
-    const defaultOptions = Vector.getDefaultOptions();
+    const defaultOptions = VectorLayer.getDefaultOptions();
 
     if (this.projection.epsg !== getDefaultProjection().epsg) {
       config.projection = this.projection.toJSON();
@@ -628,5 +628,5 @@ class Vector extends FeatureLayer {
   }
 }
 
-VcsClassRegistry.registerClass(Vector.className, Vector);
-export default Vector;
+VcsClassRegistry.registerClass(VectorLayer.className, VectorLayer);
+export default VectorLayer;

package/src/{vcs/vcm/layer → layer}/vectorProperties.js

@@ -3,13 +3,13 @@ import { HeightReference, ClassificationType, NearFarScalar, Cartesian3 } from '
 import { check, checkMaybe } from '@vcsuite/check';
 import { parseBoolean, parseEnumKey, parseNumber, parseInteger } from '@vcsuite/parsers';
 import { getLogger as getLoggerByName } from '@vcsuite/logger';
-import VcsEvent from '../event/vcsEvent.js';
+import VcsEvent from '../vcsEvent.js';
 
 /**
  * @returns {import("@vcsuite/logger").Logger}
  */
 function getLogger() {
-  return getLoggerByName('vcs.vcm.layer.VectorProperties');
+  return getLoggerByName('VectorProperties');
 }
 
 /**
@@ -162,7 +162,7 @@ export function getCartesian3Options(cartesian3) {
 }
 
 /**
- * Properties Collection for Vector Features
+ * Properties Collection for VectorLayer Features
  * @class
  * @export
  * @api stable

package/src/{vcs/vcm/layer/vectorTile.js → layer/vectorTileLayer.js}

@@ -1,17 +1,17 @@
 import Style from 'ol/style/Style.js';
 import { parseInteger } from '@vcsuite/parsers';
-import CesiumMap from '../maps/cesium.js';
-import VectorRasterTileCesium from './cesium/vectorRasterTileCesium.js';
-import Openlayers from '../maps/openlayers.js';
-import VectorTileOpenlayers from './openlayers/vectorTileOpenlayers.js';
+import CesiumMap from '../map/cesiumMap.js';
+import VectorRasterTileCesiumImpl from './cesium/vectorRasterTileCesiumImpl.js';
+import OpenlayersMap from '../map/openlayersMap.js';
+import VectorTileOpenlayersImpl from './openlayers/vectorTileOpenlayersImpl.js';
 import FeatureLayer from './featureLayer.js';
-import VectorStyleItem, { defaultVectorStyle } from '../util/style/vectorStyleItem.js';
+import VectorStyleItem, { defaultVectorStyle } from '../style/vectorStyleItem.js';
 import VectorProperties from './vectorProperties.js';
-import DeclarativeStyleItem from '../util/style/declarativeStyleItem.js';
+import DeclarativeStyleItem from '../style/declarativeStyleItem.js';
 import { FeatureVisibilityAction, globalHidden, hidden, highlighted } from './featureVisibility.js';
 import { getStylesArray } from '../util/featureconverter/convert.js';
 import { vcsLayerName } from './layerSymbols.js';
-import TileProviderFeatureProvider from '../util/featureProvider/tileProviderFeatureProvider.js';
+import TileProviderFeatureProvider from '../featureProvider/tileProviderFeatureProvider.js';
 import tileProviderFactory from './tileProvider/tileProviderFactory.js';
 import { getGenericFeatureFromClickedObject } from './vectorHelpers.js';
 import { originalFeatureSymbol } from './vectorSymbols.js';
@@ -67,18 +67,18 @@ function synchronizeFeatureVisibility(featureVisibility, globalHider, feature) {
  */
 
 /**
- * VectorTile Layer for tiled vector Data. Can be connected to data with a TileProvider
+ * VectorTileLayer Layer for tiled vector Data. Can be connected to data with a TileProvider
  * @class
  * @export
  * @extends {FeatureLayer}
  * @api stable
  */
-class VectorTile extends FeatureLayer {
+class VectorTileLayer extends FeatureLayer {
   /**
    * @readonly
    * @returns {string}
    */
-  static get className() { return 'vcs.vcm.layer.VectorTile'; }
+  static get className() { return 'VectorTileLayer'; }
 
   /**
    * @returns {VectorTileOptions}
@@ -103,10 +103,10 @@ class VectorTile extends FeatureLayer {
 
     this._supportedMaps = [
       CesiumMap.className,
-      Openlayers.className,
+      OpenlayersMap.className,
     ];
 
-    const defaultOptions = VectorTile.getDefaultOptions();
+    const defaultOptions = VectorTileLayer.getDefaultOptions();
 
     /** @type {VectorStyleItem} */
     this.highlightStyle = /** @type {undefined} */ (defaultOptions.highlightStyle);
@@ -375,16 +375,16 @@ class VectorTile extends FeatureLayer {
   /**
    * @inheritDoc
    * @param {import("@vcmap/core").VcsMap} map
-   * @returns {Array<VectorRasterTileCesium|VectorTileOpenlayers>}
+   * @returns {Array<VectorRasterTileCesiumImpl|VectorTileOpenlayersImpl>}
    */
   createImplementationsForMap(map) {
     if (map instanceof CesiumMap) {
-      return [new VectorRasterTileCesium(map, this.getImplementationOptions())];
+      return [new VectorRasterTileCesiumImpl(map, this.getImplementationOptions())];
     }
 
-    if (map instanceof Openlayers) {
+    if (map instanceof OpenlayersMap) {
       return [
-        new VectorTileOpenlayers(map, this.getImplementationOptions()),
+        new VectorTileOpenlayersImpl(map, this.getImplementationOptions()),
       ];
     }
 
@@ -450,7 +450,7 @@ class VectorTile extends FeatureLayer {
    */
   toJSON() {
     const config = /** @type {VectorTileOptions} */ (super.toJSON());
-    const defaultOptions = VectorTile.getDefaultOptions();
+    const defaultOptions = VectorTileLayer.getDefaultOptions();
 
     if (this._maxLevel !== defaultOptions.maxLevel) {
       config.maxLevel = this._maxLevel;
@@ -476,5 +476,5 @@ class VectorTile extends FeatureLayer {
   }
 }
 
-VcsClassRegistry.registerClass(VectorTile.className, VectorTile);
-export default VectorTile;
+VcsClassRegistry.registerClass(VectorTileLayer.className, VectorTileLayer);
+export default VectorTileLayer;

package/src/{vcs/vcm/layer/wfs.js → layer/wfsLayer.js}

@@ -1,5 +1,5 @@
 import WFSFormat from 'ol/format/WFS.js';
-import Vector from './vector.js';
+import VectorLayer from './vectorLayer.js';
 import Projection from '../util/projection.js';
 import { VcsClassRegistry } from '../classRegistry.js';
 import { requestJson } from '../util/fetch.js';
@@ -14,21 +14,21 @@ import { requestJson } from '../util/fetch.js';
  */
 
 /**
- * WFS Vector Layer
+ * WfsLayer VectorLayer Layer
  * @class
  * @export
- * @extends {Vector}
+ * @extends {VectorLayer}
  * @api
  */
-class WFS extends Vector {
-  static get className() { return 'vcs.vcm.layer.WFS'; }
+class WFSLayer extends VectorLayer {
+  static get className() { return 'WFSLayer'; }
 
   /**
    * @returns {WFSOptions}
    */
   static getDefaultOptions() {
     return {
-      ...Vector.getDefaultOptions(),
+      ...VectorLayer.getDefaultOptions(),
       featureType: [],
       featureNS: '',
       featurePrefix: '',
@@ -131,8 +131,8 @@ class WFS extends Vector {
 
       return this._dataFetchedPromise;
     }
-    this.getLogger().warning('Could not load WFS layer, no url is set');
-    return Promise.reject(new Error('missing url in WFS layer'));
+    this.getLogger().warning('Could not load WFSLayer layer, no url is set');
+    return Promise.reject(new Error('missing url in WFSLayer layer'));
   }
 
   /**
@@ -161,5 +161,5 @@ class WFS extends Vector {
   }
 }
 
-VcsClassRegistry.registerClass(WFS.className, WFS);
-export default WFS;
+VcsClassRegistry.registerClass(WFSLayer.className, WFSLayer);
+export default WFSLayer;

package/src/{vcs/vcm/layer → layer}/wmsHelpers.js

@@ -33,7 +33,7 @@ export function getWMSSource(options) {
   const maxZoom = options.maxLevel + 1;
   const resolutions = [];
   for (let z = 0; z < maxZoom; ++z) {
-    // generate resolutions and matrixIds arrays for options WMTS
+    // generate resolutions and matrixIds arrays for options WmtsLayer
     resolutions.push(size / (2 ** z));
   }
   const tilingOptions = {

package/src/{vcs/vcm/layer/wms.js → layer/wmsLayer.js}

@@ -1,11 +1,11 @@
 import { check } from '@vcsuite/check';
 import { parseBoolean } from '@vcsuite/parsers';
 import RasterLayer from './rasterLayer.js';
-import WMSFeatureProvider from '../util/featureProvider/wmsFeatureProvider.js';
-import CesiumMap from '../maps/cesium.js';
-import WMSCesium from './cesium/wmsCesium.js';
-import Openlayers from '../maps/openlayers.js';
-import WMSOpenlayers from './openlayers/wmsOpenlayers.js';
+import WMSFeatureProvider from '../featureProvider/wmsFeatureProvider.js';
+import CesiumMap from '../map/cesiumMap.js';
+import WmsCesiumImpl from './cesium/wmsCesiumImpl.js';
+import OpenlayersMap from '../map/openlayersMap.js';
+import WmsOpenlayersImpl from './openlayers/wmsOpenlayersImpl.js';
 import Extent from '../util/extent.js';
 import { VcsClassRegistry } from '../classRegistry.js';
 
@@ -30,14 +30,14 @@ import { VcsClassRegistry } from '../classRegistry.js';
  */
 
 /**
- * WMS layer for Cesium and Openlayers
+ * WmsLayer layer for Cesium and OpenlayersMap
  * @class
  * @export
  * @extends {RasterLayer}
  * @api stable
  */
-class WMS extends RasterLayer {
-  static get className() { return 'vcs.vcm.layer.WMS'; }
+class WMSLayer extends RasterLayer {
+  static get className() { return 'WMSLayer'; }
 
   /**
    * @returns {WMSOptions}
@@ -59,7 +59,7 @@ class WMS extends RasterLayer {
    */
   constructor(options) {
     super(options);
-    const defaultOptions = WMS.getDefaultOptions();
+    const defaultOptions = WMSLayer.getDefaultOptions();
 
     /** @type {string} */
     this.version = options.version || defaultOptions.version;
@@ -97,7 +97,7 @@ class WMS extends RasterLayer {
     this._featureInfoOptions = options.featureInfo || defaultOptions.featureInfo;
     this._supportedMaps = [
       CesiumMap.className,
-      Openlayers.className,
+      OpenlayersMap.className,
     ];
   }
 
@@ -156,19 +156,19 @@ class WMS extends RasterLayer {
 
   /**
    * @param {import("@vcmap/core").VcsMap} map
-   * @returns {Array<WMSCesium|WMSOpenlayers>}
+   * @returns {Array<WmsCesiumImpl|WmsOpenlayersImpl>}
    */
   createImplementationsForMap(map) {
     if (map instanceof CesiumMap) {
-      return [new WMSCesium(map, this.getImplementationOptions())];
-    } else if (map instanceof Openlayers) {
-      return [new WMSOpenlayers(map, this.getImplementationOptions())];
+      return [new WmsCesiumImpl(map, this.getImplementationOptions())];
+    } else if (map instanceof OpenlayersMap) {
+      return [new WmsOpenlayersImpl(map, this.getImplementationOptions())];
     }
     return [];
   }
 
   /**
-   * Sets the layers to request from the WMS
+   * Sets the layers to request from the WmsLayer
    * @param {string|Array<string>} layers - a layer name or an array of layer names
    * @returns {Promise<void>}
    * @api stable
@@ -194,7 +194,7 @@ class WMS extends RasterLayer {
    */
   toJSON() {
     const config = /** @type {WMSOptions} */ (super.toJSON());
-    const defaultOptions = WMS.getDefaultOptions();
+    const defaultOptions = WMSLayer.getDefaultOptions();
 
     if (this.parameters.LAYERS) {
       config.layers = this.parameters.LAYERS;
@@ -266,5 +266,5 @@ class WMS extends RasterLayer {
   }
 }
 
-VcsClassRegistry.registerClass(WMS.className, WMS);
-export default WMS;
+VcsClassRegistry.registerClass(WMSLayer.className, WMSLayer);
+export default WMSLayer;

package/src/{vcs/vcm/layer/wmts.js → layer/wmtsLayer.js}

@@ -1,10 +1,10 @@
 import { parseInteger } from '@vcsuite/parsers';
 import { getLogger } from '@vcsuite/logger';
 import RasterLayer from './rasterLayer.js';
-import Openlayers from '../maps/openlayers.js';
-import CesiumMap from '../maps/cesium.js';
-import WMTSOpenlayers from './openlayers/wmtsOpenlayers.js';
-import WMTSCesium from './cesium/wmtsCesium.js';
+import OpenlayersMap from '../map/openlayersMap.js';
+import CesiumMap from '../map/cesiumMap.js';
+import WmtsOpenlayersImpl from './openlayers/wmtsOpenlayersImpl.js';
+import WmtsCesiumImpl from './cesium/wmtsCesiumImpl.js';
 import { VcsClassRegistry } from '../classRegistry.js';
 
 /**
@@ -47,7 +47,7 @@ function getMatrixIds(matrixIds, maxLevel, prefix) {
     if (matrixIds.length === (maxLevel + 1)) {
       return matrixIds;
     } else {
-      getLogger('vcs.vcm.layer.cesium.WMTSCesium')
+      getLogger('WmtsCesiumImpl')
         .log('matrixIds must have the same length as maxLevel');
     }
   }
@@ -58,14 +58,14 @@ function getMatrixIds(matrixIds, maxLevel, prefix) {
 
 
 /**
- * WMTS layer
+ * WmtsLayer layer
  * @class
  * @export
  * @extends {RasterLayer}
  * @api stable
  */
-class WMTS extends RasterLayer {
-  static get className() { return 'vcs.vcm.layer.WMTS'; }
+class WMTSLayer extends RasterLayer {
+  static get className() { return 'WMTSLayer'; }
 
   /**
    * @returns {WMTSOptions}
@@ -91,12 +91,12 @@ class WMTS extends RasterLayer {
    * @param {WMTSOptions} options
    */
   constructor(options) {
-    const defaultOptions = WMTS.getDefaultOptions();
+    const defaultOptions = WMTSLayer.getDefaultOptions();
     options.tilingSchema = options.tilingSchema || defaultOptions.tilingSchema;
     super(options);
 
     this._supportedMaps = [
-      Openlayers.className,
+      OpenlayersMap.className,
       CesiumMap.className,
     ];
 
@@ -159,15 +159,15 @@ class WMTS extends RasterLayer {
   /**
    * @inheritDoc
    * @param {import("@vcmap/core").VcsMap} map
-   * @returns {Array<WMTSOpenlayers|WMTSCesium>}
+   * @returns {Array<WmtsOpenlayersImpl|WmtsCesiumImpl>}
    */
   createImplementationsForMap(map) {
-    if (map instanceof Openlayers) {
-      return [new WMTSOpenlayers(map, this.getImplementationOptions())];
+    if (map instanceof OpenlayersMap) {
+      return [new WmtsOpenlayersImpl(map, this.getImplementationOptions())];
     }
 
     if (map instanceof CesiumMap) {
-      return [new WMTSCesium(map, this.getImplementationOptions())];
+      return [new WmtsCesiumImpl(map, this.getImplementationOptions())];
     }
     return [];
   }
@@ -178,7 +178,7 @@ class WMTS extends RasterLayer {
    */
   toJSON() {
     const config = /** @type {WMTSOptions} */ (super.toJSON());
-    const defaultOptions = WMTS.getDefaultOptions();
+    const defaultOptions = WMTSLayer.getDefaultOptions();
 
     if (this.tilingSchema !== defaultOptions.tilingSchema) {
       config.tilingSchema = this.tilingSchema;
@@ -230,6 +230,6 @@ class WMTS extends RasterLayer {
   }
 }
 
-VcsClassRegistry.registerClass(WMTS.className, WMTS);
-export default WMTS;
+VcsClassRegistry.registerClass(WMTSLayer.className, WMTSLayer);
+export default WMTSLayer;
 

package/src/{vcs/vcm/maps → map}/baseOLMap.js

@@ -2,7 +2,7 @@ import { Cartesian2 } from '@vcmap/cesium';
 import { unByKey } from 'ol/Observable.js';
 import OLMap from 'ol/Map.js';
 import { defaults as defaultInteractions } from 'ol/interaction.js';
-import VcsMap from './map.js';
+import VcsMap from './vcsMap.js';
 import { vcsLayerName } from '../layer/layerSymbols.js';
 import { ModificationKeyType, PointerEventType, PointerKeyType } from '../interaction/interactionType.js';
 import { VcsClassRegistry } from '../classRegistry.js';
@@ -32,7 +32,7 @@ export function ensureLayerInCollection(layers, layer, layerCollection) {
 }
 
 /**
- * Openlayers Map base map.
+ * OpenlayersMap Map base map.
  * @class
  * @abstract
  * @api
@@ -40,7 +40,7 @@ export function ensureLayerInCollection(layers, layer, layerCollection) {
  * @extends {VcsMap}
  */
 class BaseOLMap extends VcsMap {
-  static get className() { return 'vcs.vcm.maps.BaseOLMap'; }
+  static get className() { return 'BaseOLMap'; }
 
   /**
    * @param {VcsMapOptions} options

package/src/{vcs/vcm/maps → map}/cameraLimiter.js

@@ -35,7 +35,7 @@ export const CameraLimiterMode = {
  * @api
  */
 class CameraLimiter {
-  static get className() { return 'vcs.vcm.maps.CameraLimiter'; }
+  static get className() { return 'CameraLimiter'; }
 
   /**
    * @returns {CameraLimiterOptions}

package/src/{vcs/vcm/maps/cesium.js → map/cesiumMap.js}

@@ -31,7 +31,7 @@ import {
 
 import { check, checkMaybe } from '@vcsuite/check';
 import { parseBoolean, parseInteger } from '@vcsuite/parsers';
-import VcsMap from './map.js';
+import VcsMap from './vcsMap.js';
 import ViewPoint from '../util/viewpoint.js';
 import Projection, { mercatorProjection } from '../util/projection.js';
 import { getHeightFromTerrainProvider } from '../layer/terrainHelpers.js';
@@ -204,7 +204,7 @@ function setDebugOnVisualizations(visualizations, debug) {
  * @api stable
  */
 class CesiumMap extends VcsMap {
-  static get className() { return 'vcs.vcm.maps.Cesium'; }
+  static get className() { return 'CesiumMap'; }
 
   /**
    * @returns {CesiumMapOptions}
@@ -914,7 +914,7 @@ class CesiumMap extends VcsMap {
    */
   removePrimitiveCollection(primitiveCollection) { // XXX add destroy as boolean?
     this.removeVisualization(primitiveCollection);
-    this.getScene().primitives.remove(primitiveCollection);
+    this.getScene()?.primitives.remove(primitiveCollection);
   }
 
   /**
@@ -934,7 +934,7 @@ class CesiumMap extends VcsMap {
    */
   removeImageryLayer(imageryLayer) {
     this.removeVisualization(imageryLayer);
-    this.getScene().imageryLayers.remove(imageryLayer);
+    this.getScene()?.imageryLayers.remove(imageryLayer);
   }
 
   /**
@@ -955,7 +955,9 @@ class CesiumMap extends VcsMap {
    */
   removeDataSource(dataSource) {
     this.removeVisualization(dataSource);
-    this.dataSourceDisplay.dataSources.remove(dataSource);
+    if (!this.dataSourceDisplay.isDestroyed() && !this.dataSourceDisplay.dataSources.isDestroyed()) {
+      this.dataSourceDisplay.dataSources.remove(dataSource);
+    }
   }
 
   /**
@@ -991,21 +993,12 @@ class CesiumMap extends VcsMap {
   }
 
   /**
-   * returns the cesium Viewer Object
+   * returns the cesium Scene Object, returns null on non initialized or destroyed maps
    * @returns {import("@vcmap/cesium").Scene}
    * @api stable
    */
   getScene() {
-    return this._cesiumWidget.scene;
-  }
-
-  /**
-   * @returns {import("@vcmap/cesium").CesiumWidget|*}
-   * @deprecated 3.7
-   */
-  getViewer() {
-    this.getLogger().deprecate('getViewer', 'use getCesiumWidget instead.');
-    return this._cesiumWidget;
+    return this._cesiumWidget?.scene;
   }
 
   /**
@@ -1024,17 +1017,6 @@ class CesiumMap extends VcsMap {
     return false;
   }
 
-  // TODO cesium map requestRender
-  /**
-   * sets the Cesium debug mode.
-   * @api stable
-   * @deprecated v4.1
-   */
-  setDebugMode() {
-    this.getLogger().deprecate('setDebugMode', 'set the debug property directly');
-    this.debug = true;
-  }
-
   /**
    * @private
    */
@@ -1056,7 +1038,7 @@ class CesiumMap extends VcsMap {
 
   /**
    * is called when the cesium Terrainprovider changes. Sets the .terrainProvider and deactivates currently
-   * active Terrain layer if necessary
+   * active TerrainLayer layer if necessary
    * @param {import("@vcmap/cesium").TerrainProvider} terrainProvider
    * @private
    */
@@ -1165,6 +1147,9 @@ class CesiumMap extends VcsMap {
     if (this._removeClusterClockTickListener) {
       this._removeClusterClockTickListener();
     }
+
+    [...this.layerCollection].forEach((l) => { l.removedFromMap(this); });
+
     if (this._clusterDataSourceDisplay) {
       this._clusterDataSourceDisplay.destroy();
     }