@vcmap/core 5.0.0-rc.2 → 5.0.0-rc.20

package/src/{vcs/vcm/layer/openStreetMap.js → layer/openStreetMapLayer.js}

@@ -1,13 +1,13 @@
-import { ImagerySplitDirection } from '@vcmap/cesium';
+import { SplitDirection } from '@vcmap/cesium';
 
 import { parseNumberRange, parseInteger } from '@vcsuite/parsers';
 import Layer from './layer.js';
-import Openlayers from '../maps/openlayers.js';
-import CesiumMap from '../maps/cesium.js';
-import OpenStreetMapOpenlayers from './openlayers/openStreetMapOpenlayers.js';
-import OpenStreetMapCesium from './cesium/openStreetMapCesium.js';
-import VcsEvent from '../event/vcsEvent.js';
-import { VcsClassRegistry } from '../classRegistry.js';
+import OpenlayersMap from '../map/openlayersMap.js';
+import CesiumMap from '../map/cesiumMap.js';
+import OpenStreetMapOpenlayersImpl from './openlayers/openStreetMapOpenlayersImpl.js';
+import OpenStreetMapCesiumImpl from './cesium/openStreetMapCesiumImpl.js';
+import VcsEvent from '../vcsEvent.js';
+import { layerClassRegistry } from '../classRegistry.js';
 
 /**
  * @typedef {LayerOptions} OpenStreetMapOptions
@@ -18,15 +18,14 @@ import { VcsClassRegistry } from '../classRegistry.js';
  */
 
 /**
- * OpenStreetMap Layer
+ * OpenStreetMapLayer Layer
  * @class
- * @export
  * @extends {Layer}
  * @api stable
  * @implements {SplitLayer}
  */
-class OpenStreetMap extends Layer {
-  static get className() { return 'vcs.vcm.layer.OpenStreetMap'; }
+class OpenStreetMapLayer extends Layer {
+  static get className() { return 'OpenStreetMapLayer'; }
 
   /**
    * @returns {OpenStreetMapOptions}
@@ -45,22 +44,22 @@ class OpenStreetMap extends Layer {
    */
   constructor(options) {
     super(options);
-    const defaultOptions = OpenStreetMap.getDefaultOptions();
+    const defaultOptions = OpenStreetMapLayer.getDefaultOptions();
     /**
-     * @type {import("@vcmap/cesium").ImagerySplitDirection}
+     * @type {import("@vcmap/cesium").SplitDirection}
      * @private
      */
-    this._splitDirection = ImagerySplitDirection.NONE;
+    this._splitDirection = SplitDirection.NONE;
 
     if (options.splitDirection) {
       this._splitDirection = options.splitDirection === 'left' ?
-        ImagerySplitDirection.LEFT :
-        ImagerySplitDirection.RIGHT;
+        SplitDirection.LEFT :
+        SplitDirection.RIGHT;
     }
 
     this._supportedMaps = [
       CesiumMap.className,
-      Openlayers.className,
+      OpenlayersMap.className,
     ];
 
     /**
@@ -71,7 +70,7 @@ class OpenStreetMap extends Layer {
 
     /**
      * raised if the split direction changes, is passed the split direction as its only argument
-     * @type {VcsEvent<import("@vcmap/cesium").ImagerySplitDirection>}
+     * @type {VcsEvent<import("@vcmap/cesium").SplitDirection>}
      * @api
      */
     this.splitDirectionChanged = new VcsEvent();
@@ -86,18 +85,18 @@ class OpenStreetMap extends Layer {
 
   /**
    * @api
-   * @type {import("@vcmap/cesium").ImagerySplitDirection}
+   * @type {import("@vcmap/cesium").SplitDirection}
    */
   get splitDirection() { return this._splitDirection; }
 
   /**
-   * @param {import("@vcmap/cesium").ImagerySplitDirection} direction
+   * @param {import("@vcmap/cesium").SplitDirection} direction
    */
   set splitDirection(direction) {
     if (direction !== this._splitDirection) {
       this._splitDirection = direction;
       this.getImplementations().forEach((impl) => {
-        /** @type {OpenStreetMapCesium|OpenStreetMapOpenlayers} */
+        /** @type {OpenStreetMapCesiumImpl|OpenStreetMapOpenlayersImpl} */
         (impl).updateSplitDirection(this._splitDirection);
       });
       this.splitDirectionChanged.raiseEvent(this._splitDirection);
@@ -119,7 +118,7 @@ class OpenStreetMap extends Layer {
     if (this._opacity !== parsedValue) {
       this._opacity = parsedValue;
       this.getImplementations().forEach((impl) => {
-        /** @type {OpenStreetMapCesium|OpenStreetMapOpenlayers} */
+        /** @type {OpenStreetMapCesiumImpl|OpenStreetMapOpenlayersImpl} */
         (impl).updateOpacity(parsedValue);
       });
     }
@@ -143,15 +142,15 @@ class OpenStreetMap extends Layer {
   /**
    * @inheritDoc
    * @param {import("@vcmap/core").VcsMap} map
-   * @returns {Array<OpenStreetMapOpenlayers|OpenStreetMapCesium>}
+   * @returns {Array<OpenStreetMapOpenlayersImpl|OpenStreetMapCesiumImpl>}
    */
   createImplementationsForMap(map) {
-    if (map instanceof Openlayers) {
-      return [new OpenStreetMapOpenlayers(map, this.getImplementationOptions())];
+    if (map instanceof OpenlayersMap) {
+      return [new OpenStreetMapOpenlayersImpl(map, this.getImplementationOptions())];
     }
 
     if (map instanceof CesiumMap) {
-      return [new OpenStreetMapCesium(map, this.getImplementationOptions())];
+      return [new OpenStreetMapCesiumImpl(map, this.getImplementationOptions())];
     }
     return [];
   }
@@ -162,10 +161,10 @@ class OpenStreetMap extends Layer {
    */
   toJSON() {
     const config = /** @type {OpenStreetMapOptions} */ (super.toJSON());
-    const defaultOptions = OpenStreetMap.getDefaultOptions();
+    const defaultOptions = OpenStreetMapLayer.getDefaultOptions();
 
-    if (this._splitDirection !== ImagerySplitDirection.NONE) {
-      config.splitDirection = this._splitDirection === ImagerySplitDirection.RIGHT ?
+    if (this._splitDirection !== SplitDirection.NONE) {
+      config.splitDirection = this._splitDirection === SplitDirection.RIGHT ?
         'right' :
         'left';
     }
@@ -190,5 +189,5 @@ class OpenStreetMap extends Layer {
   }
 }
 
-VcsClassRegistry.registerClass(OpenStreetMap.className, OpenStreetMap);
-export default OpenStreetMap;
+layerClassRegistry.registerClass(OpenStreetMapLayer.className, OpenStreetMapLayer);
+export default OpenStreetMapLayer;

package/src/{vcs/vcm/layer/openlayers/layerOpenlayers.js → layer/openlayers/layerOpenlayersImpl.js}

@@ -4,14 +4,13 @@ import LayerImplementation from '../layerImplementation.js';
 /**
  * Layer implementation for {@link CesiumMap}.
  * @class
- * @export
- * @extends {LayerImplementation<import("@vcmap/core").Openlayers>}}
+ * @extends {LayerImplementation<import("@vcmap/core").OpenlayersMap>}}
  */
-class LayerOpenlayers extends LayerImplementation {
-  static get className() { return 'vcs.vcm.layer.openlayers.LayerOpenlayers'; }
+class LayerOpenlayersImpl extends LayerImplementation {
+  static get className() { return 'LayerOpenlayersImpl'; }
 
   /**
-   * @param {import("@vcmap/core").Openlayers} map
+   * @param {import("@vcmap/core").OpenlayersMap} map
    * @param {LayerImplementationOptions} options
    */
   constructor(map, options) {
@@ -76,4 +75,4 @@ class LayerOpenlayers extends LayerImplementation {
   }
 }
 
-export default LayerOpenlayers;
+export default LayerOpenlayersImpl;

package/src/layer/openlayers/openStreetMapOpenlayersImpl.js

@@ -0,0 +1,26 @@
+import Tile from 'ol/layer/Tile.js';
+import OSM from 'ol/source/OSM.js';
+import RasterLayerOpenlayersImpl from './rasterLayerOpenlayersImpl.js';
+
+/**
+ * represents a specific OpenStreetMapLayer layer for openlayers.
+ * @class
+ * @extends {RasterLayerOpenlayersImpl}
+ */
+class OpenStreetMapOpenlayersImpl extends RasterLayerOpenlayersImpl {
+  static get className() { return 'OpenStreetMapOpenlayersImpl'; }
+
+  /**
+   * @returns {import("ol/layer/Tile").default}
+   */
+  getOLLayer() {
+    return new Tile({
+      opacity: this.opacity,
+      source: new OSM({
+        maxZoom: this.maxLevel,
+      }),
+    });
+  }
+}
+
+export default OpenStreetMapOpenlayersImpl;

package/src/{vcs/vcm/layer/openlayers/rasterLayerOpenlayers.js → layer/openlayers/rasterLayerOpenlayersImpl.js}

@@ -1,24 +1,24 @@
-import { ImagerySplitDirection } from '@vcmap/cesium';
+import { SplitDirection } from '@vcmap/cesium';
 import { unByKey } from 'ol/Observable.js';
-import LayerOpenlayers from './layerOpenlayers.js';
+import LayerOpenlayersImpl from './layerOpenlayersImpl.js';
 
 /**
  * RasterLayer implementation for {@link Openlayers}
  * @class
- * @extends {LayerOpenlayers}
+ * @extends {LayerOpenlayersImpl}
  * @implements {RasterLayerImplementation}
  * @abstract
  */
-class RasterLayerOpenlayers extends LayerOpenlayers {
-  static get className() { return 'vcs.vcm.layer.openlayers.RasterLayerOpenlayers'; }
+class RasterLayerOpenlayersImpl extends LayerOpenlayersImpl {
+  static get className() { return 'RasterLayerOpenlayersImpl'; }
 
   /**
-   * @param {import("@vcmap/core").Openlayers} map
+   * @param {import("@vcmap/core").OpenlayersMap} map
    * @param {RasterLayerImplementationOptions} options
    */
   constructor(map, options) {
     super(map, options);
-    /** @type {import("@vcmap/cesium").ImagerySplitDirection} */
+    /** @type {import("@vcmap/cesium").SplitDirection} */
     this.splitDirection = options.splitDirection;
     /** @type {number} */
     this.minLevel = options.minLevel;
@@ -59,16 +59,16 @@ class RasterLayerOpenlayers extends LayerOpenlayers {
   }
 
   /**
-   * @param {import("@vcmap/cesium").ImagerySplitDirection} splitDirection
+   * @param {import("@vcmap/cesium").SplitDirection} splitDirection
    */
   updateSplitDirection(splitDirection) {
     this.splitDirection = splitDirection;
     if (this.initialized) {
-      if (this.splitDirection === ImagerySplitDirection.NONE && this._splitDirectionRenderListeners) {
+      if (this.splitDirection === SplitDirection.NONE && this._splitDirectionRenderListeners) {
         unByKey(this._splitDirectionRenderListeners);
         this._splitDirectionRenderListeners = null;
         this.olLayer.changed();
-      } else if (splitDirection !== ImagerySplitDirection.NONE && !this._splitDirectionRenderListeners) {
+      } else if (splitDirection !== SplitDirection.NONE && !this._splitDirectionRenderListeners) {
         this._splitDirectionRenderListeners = [];
         this._splitDirectionRenderListeners
           .push(/** @type {import("ol/events").EventsKey} */
@@ -77,7 +77,7 @@ class RasterLayerOpenlayers extends LayerOpenlayers {
         this._splitDirectionRenderListeners
           .push(/** @type {import("ol/events").EventsKey} */
             (this.olLayer.on('postrender', (/** @type {import("ol/render/Event").default} */ event) => {
-              event.context.restore();
+              /** @type {CanvasRenderingContext2D} */ (event.context).restore();
             })),
           );
         this.olLayer.changed();
@@ -93,12 +93,13 @@ class RasterLayerOpenlayers extends LayerOpenlayers {
     if (!this.map.splitScreen) {
       return;
     }
-    const { context } = event;
+    // eslint-disable-next-line prefer-destructuring
+    const context = /** @type {CanvasRenderingContext2D} */ (event.context);
     const width = context.canvas.width * this.map.splitScreen.position;
     context.save();
     context.beginPath();
 
-    if (this.splitDirection === ImagerySplitDirection.LEFT) {
+    if (this.splitDirection === SplitDirection.LEFT) {
       context.rect(0, 0, width, context.canvas.height);
     } else {
       context.rect(width, 0, context.canvas.width - width, context.canvas.height);
@@ -118,4 +119,4 @@ class RasterLayerOpenlayers extends LayerOpenlayers {
   }
 }
 
-export default RasterLayerOpenlayers;
+export default RasterLayerOpenlayersImpl;

package/src/{vcs/vcm/layer/openlayers/singleImageOpenlayers.js → layer/openlayers/singleImageOpenlayersImpl.js}

@@ -1,20 +1,19 @@
 import ImageLayer from 'ol/layer/Image.js';
 import ImageStatic from 'ol/source/ImageStatic.js';
-import RasterLayerOpenlayers from './rasterLayerOpenlayers.js';
+import RasterLayerOpenlayersImpl from './rasterLayerOpenlayersImpl.js';
 import { wgs84Projection } from '../../util/projection.js';
 import { isSameOrigin } from '../../util/urlHelpers.js';
 
 /**
  * represents a specific OpenLayers SingleImageLayer Layer class.
  * @class
- * @export
- * @extends {RasterLayerOpenlayers}
+ * @extends {RasterLayerOpenlayersImpl}
  */
-class SingleImageOpenlayers extends RasterLayerOpenlayers {
-  static get className() { return 'vcs.vcm.layer.openlayers.SingleImageOpenlayers'; }
+class SingleImageOpenlayersImpl extends RasterLayerOpenlayersImpl {
+  static get className() { return 'SingleImageOpenlayersImpl'; }
 
   /**
-   * @param {import("@vcmap/core").Openlayers} map
+   * @param {import("@vcmap/core").OpenlayersMap} map
    * @param {SingleImageImplementationOptions} options
    */
   constructor(map, options) {
@@ -46,4 +45,4 @@ class SingleImageOpenlayers extends RasterLayerOpenlayers {
   }
 }
 
-export default SingleImageOpenlayers;
+export default SingleImageOpenlayersImpl;

package/src/{vcs/vcm/layer/openlayers/tileDebugOpenlayers.js → layer/openlayers/tileDebugOpenlayersImpl.js}

@@ -1,16 +1,15 @@
 import Tile from 'ol/layer/Tile.js';
 import TileDebug from 'ol/source/TileDebug.js';
-import LayerOpenlayers from './layerOpenlayers.js';
+import LayerOpenlayersImpl from './layerOpenlayersImpl.js';
 
 /**
  * layer Implementation to render tile boundaries.
  * @class
- * @export
- * @extends {LayerOpenlayers}
+ * @extends {LayerOpenlayersImpl}
  * @implements {VectorTileImplementation}
  */
-class TileDebugOpenlayers extends LayerOpenlayers {
-  static get className() { return 'vcs.vcm.layer.openlayers.TileDebugOpenlayers'; }
+class TileDebugOpenlayersImpl extends LayerOpenlayersImpl {
+  static get className() { return 'TileDebugOpenlayersImpl'; }
 
   /**
    * @returns {import("ol/layer/Tile").default}
@@ -36,4 +35,4 @@ class TileDebugOpenlayers extends LayerOpenlayers {
   updateTiles(args) {}
 }
 
-export default TileDebugOpenlayers;
+export default TileDebugOpenlayersImpl;

package/src/{vcs/vcm/layer/openlayers/tmsOpenlayers.js → layer/openlayers/tmsOpenlayersImpl.js}

@@ -1,21 +1,20 @@
 import XYZ from 'ol/source/XYZ.js';
 import Tile from 'ol/layer/Tile.js';
 import { mercatorProjection } from '../../util/projection.js';
-import RasterLayerOpenlayers from './rasterLayerOpenlayers.js';
+import RasterLayerOpenlayersImpl from './rasterLayerOpenlayersImpl.js';
 import { TilingScheme } from '../rasterLayer.js';
 import { isSameOrigin } from '../../util/urlHelpers.js';
 
 /**
- * TMS implementation for {@link Openlayers}.
+ * TmsLayer implementation for {@link Openlayers}.
  * @class
- * @export
- * @extends {RasterLayerOpenlayers}
+ * @extends {RasterLayerOpenlayersImpl}
  */
-class TMSOpenlayers extends RasterLayerOpenlayers {
-  static get className() { return 'vcs.vcm.layer.openlayers.TMSOpenlayers'; }
+class TmsOpenlayersImpl extends RasterLayerOpenlayersImpl {
+  static get className() { return 'TmsOpenlayersImpl'; }
 
   /**
-   * @param {import("@vcmap/core").Openlayers} map
+   * @param {import("@vcmap/core").OpenlayersMap} map
    * @param {TMSImplementationOptions} options
    */
   constructor(map, options) {
@@ -59,4 +58,4 @@ class TMSOpenlayers extends RasterLayerOpenlayers {
   }
 }
 
-export default TMSOpenlayers;
+export default TmsOpenlayersImpl;

package/src/{vcs/vcm/layer/openlayers/vectorOpenlayers.js → layer/openlayers/vectorOpenlayersImpl.js}

@@ -1,20 +1,18 @@
 import OLVectorLayer from 'ol/layer/Vector.js';
-import LayerOpenlayers from './layerOpenlayers.js';
+import LayerOpenlayersImpl from './layerOpenlayersImpl.js';
 import { synchronizeFeatureVisibilityWithSource } from '../vectorHelpers.js';
-import { getGlobalHider } from '../globalHider.js';
 
 /**
  * represents a specific vectorlayer for openlayers.
  * @class
- * @export
  * @implements {FeatureLayerImplementation}
- * @extends {LayerOpenlayers}
+ * @extends {LayerOpenlayersImpl}
  */
-class VectorOpenlayers extends LayerOpenlayers {
-  static get className() { return 'vcs.vcm.layer.openlayers.VectorOpenlayers'; }
+class VectorOpenlayersImpl extends LayerOpenlayersImpl {
+  static get className() { return 'VectorOpenlayersImpl'; }
 
   /**
-   * @param {import("@vcmap/core").Openlayers} map
+   * @param {import("@vcmap/core").OpenlayersMap} map
    * @param {VectorImplementationOptions} options
    */
   constructor(map, options) {
@@ -36,7 +34,8 @@ class VectorOpenlayers extends LayerOpenlayers {
     this._featureVisibilityListeners = [];
     /** @type {import("ol/layer/Vector").default<import("ol/source").Vector<import("ol/geom/Geometry").default>>|null} */
     this.olLayer = null;
-    this.globalHider = getGlobalHider();
+    /** @type {import("@vcmap/core").GlobalHider} */
+    this.globalHider = options.globalHider;
   }
 
   /**
@@ -115,4 +114,4 @@ class VectorOpenlayers extends LayerOpenlayers {
   }
 }
 
-export default VectorOpenlayers;
+export default VectorOpenlayersImpl;

package/src/{vcs/vcm/layer/openlayers/vectorTileOpenlayers.js → layer/openlayers/vectorTileOpenlayersImpl.js}

@@ -1,21 +1,20 @@
 import OLVectorTileLayer from 'ol/layer/VectorTile.js';
 import VectorTileSource from 'ol/source/VectorTile.js';
 import TileState from 'ol/TileState.js';
-import LayerOpenlayers from './layerOpenlayers.js';
+import LayerOpenlayersImpl from './layerOpenlayersImpl.js';
 import { mercatorProjection } from '../../util/projection.js';
 
 /**
  * represents a specific vectorTileLayer for openlayers.
  * @class
- * @export
  * @implements {VectorTileImplementation}
- * @extends {LayerOpenlayers}
+ * @extends {LayerOpenlayersImpl}
  */
-class VectorTileOpenlayers extends LayerOpenlayers {
-  static get className() { return 'vcs.vcm.layer.openlayers.VectorTileOpenlayers'; }
+class VectorTileOpenlayersImpl extends LayerOpenlayersImpl {
+  static get className() { return 'VectorTileOpenlayersImpl'; }
 
   /**
-   * @param {import("@vcmap/core").Openlayers} map
+   * @param {import("@vcmap/core").OpenlayersMap} map
    * @param {VectorTileImplementationOptions} options
    */
   constructor(map, options) {
@@ -174,4 +173,4 @@ class VectorTileOpenlayers extends LayerOpenlayers {
   }
 }
 
-export default VectorTileOpenlayers;
+export default VectorTileOpenlayersImpl;

package/src/{vcs/vcm/layer/openlayers/wmsOpenlayers.js → layer/openlayers/wmsOpenlayersImpl.js}

@@ -1,18 +1,17 @@
 import Tile from 'ol/layer/Tile.js';
-import RasterLayerOpenlayers from './rasterLayerOpenlayers.js';
+import RasterLayerOpenlayersImpl from './rasterLayerOpenlayersImpl.js';
 import { getWMSSource } from '../wmsHelpers.js';
 
 /**
- * represents a specific Cesium WMSOpenlayers Layer class.
+ * represents a specific Cesium WmsOpenlayersImpl Layer class.
  * @class
- * @export
- * @extends {RasterLayerOpenlayers}
+ * @extends {RasterLayerOpenlayersImpl}
  */
-class WMSOpenlayers extends RasterLayerOpenlayers {
-  static get className() { return 'vcs.vcm.layer.openlayers.WMSOpenlayers'; }
+class WmsOpenlayersImpl extends RasterLayerOpenlayersImpl {
+  static get className() { return 'WmsOpenlayersImpl'; }
 
   /**
-   * @param {import("@vcmap/core").Openlayers} map
+   * @param {import("@vcmap/core").OpenlayersMap} map
    * @param {WMSImplementationOptions} options
    */
   constructor(map, options) {
@@ -52,4 +51,4 @@ class WMSOpenlayers extends RasterLayerOpenlayers {
   }
 }
 
-export default WMSOpenlayers;
+export default WmsOpenlayersImpl;

package/src/{vcs/vcm/layer/openlayers/wmtsOpenlayers.js → layer/openlayers/wmtsOpenlayersImpl.js}

@@ -3,21 +3,20 @@ import WMTSTileGrid from 'ol/tilegrid/WMTS.js';
 import Tile from 'ol/layer/Tile.js';
 import WMTSSource from 'ol/source/WMTS.js';
 import { wgs84Projection, mercatorProjection } from '../../util/projection.js';
-import RasterLayerOpenlayers from './rasterLayerOpenlayers.js';
+import RasterLayerOpenlayersImpl from './rasterLayerOpenlayersImpl.js';
 import { TilingScheme } from '../rasterLayer.js';
 import { isSameOrigin } from '../../util/urlHelpers.js';
 
 /**
- * WMTS implementation for {@link Openlayers}.
+ * WmtsLayer implementation for {@link Openlayers}.
  * @class
- * @export
- * @extends {RasterLayerOpenlayers}
+ * @extends {RasterLayerOpenlayersImpl}
  */
-class WMTSOpenlayers extends RasterLayerOpenlayers {
-  static get className() { return 'vcs.vcm.layer.openlayers.WMTSOpenlayers'; }
+class WmtsOpenlayersImpl extends RasterLayerOpenlayersImpl {
+  static get className() { return 'WmtsOpenlayersImpl'; }
 
   /**
-   * @param {import("@vcmap/core").Openlayers} map
+   * @param {import("@vcmap/core").OpenlayersMap} map
    * @param {WMTSImplementationOptions} options
    */
   constructor(map, options) {
@@ -138,4 +137,4 @@ class WMTSOpenlayers extends RasterLayerOpenlayers {
   }
 }
 
-export default WMTSOpenlayers;
+export default WmtsOpenlayersImpl;

package/src/{vcs/vcm/layer/pointCloud.js → layer/pointCloudLayer.js}

@@ -1,10 +1,10 @@
 import { checkMaybe } from '@vcsuite/check';
-import CesiumTileset from './cesiumTileset.js';
-import DeclarativeStyleItem from '../util/style/declarativeStyleItem.js';
-import VectorStyleItem from '../util/style/vectorStyleItem.js';
-import CesiumMap from '../maps/cesium.js';
-import PointCloudCesium from './cesium/pointCloudCesium.js';
-import { VcsClassRegistry } from '../classRegistry.js';
+import CesiumTilesetLayer from './cesiumTilesetLayer.js';
+import DeclarativeStyleItem from '../style/declarativeStyleItem.js';
+import VectorStyleItem from '../style/vectorStyleItem.js';
+import CesiumMap from '../map/cesiumMap.js';
+import CesiumTilesetCesiumImpl from './cesium/cesiumTilesetCesiumImpl.js';
+import { layerClassRegistry } from '../classRegistry.js';
 
 /**
  * @typedef {CesiumTilesetOptions} PointCloudOptions
@@ -24,7 +24,7 @@ import { VcsClassRegistry } from '../classRegistry.js';
 export const defaultPointCloudStyle = new DeclarativeStyleItem({});
 
 /**
- * represents a specific PointCloud layer for cesium.
+ * represents a specific PointCloudLayer layer for cesium.
  * <h3>Config Parameter</h3>
  * <ul>
  *  <li>url: string: url to the p3dm dataset
@@ -32,19 +32,18 @@ export const defaultPointCloudStyle = new DeclarativeStyleItem({});
  * </ul>
  *
  * @class
- * @export
- * @extends {CesiumTileset}
+ * @extends {CesiumTilesetLayer}
  * @api stable
  */
-class PointCloud extends CesiumTileset {
-  static get className() { return 'vcs.vcm.layer.PointCloud'; }
+class PointCloudLayer extends CesiumTilesetLayer {
+  static get className() { return 'PointCloudLayer'; }
 
   /**
    * @returns {PointCloudOptions}
    */
   static getDefaultOptions() {
     return {
-      ...CesiumTileset.getDefaultOptions(),
+      ...CesiumTilesetLayer.getDefaultOptions(),
       pointSize: null,
     };
   }
@@ -55,7 +54,7 @@ class PointCloud extends CesiumTileset {
   constructor(options) {
     super(options);
 
-    const defaultOptions = PointCloud.getDefaultOptions();
+    const defaultOptions = PointCloudLayer.getDefaultOptions();
     /**
      * The default point size to fall back on, if no point size is given. Uses Cesium default of 1 if null.
      * @api
@@ -72,7 +71,7 @@ class PointCloud extends CesiumTileset {
 
   /**
    * @inheritDoc
-   * @param {(Reference|DeclarativeStyleItemOptions|VectorStyleItemOptions|import("@vcmap/core").StyleItem|string)=} styleOptions
+   * @param {(DeclarativeStyleItemOptions|VectorStyleItemOptions|import("@vcmap/core").StyleItem)=} styleOptions
    * @param {(VectorStyleItem|DeclarativeStyleItem)=} defaultStyle
    * @returns {import("@vcmap/core").StyleItem}
    */
@@ -92,28 +91,21 @@ class PointCloud extends CesiumTileset {
   set pointSize(size) {
     checkMaybe(size, [Number, String]);
     this._pointSize = size;
-    this.getImplementations().forEach((impl) => {
-      /** @type {PointCloudCesium} */ (impl).updatePointSize(size);
-    });
+    /** @type {DeclarativeStyleItem} */ (this.style).pointSize = size?.toString();
   }
 
-  /**
-   * @returns {PointCloudImplementationOptions}
-   */
-  getImplementationOptions() {
-    return {
-      ...super.getImplementationOptions(),
-      pointSize: this.pointSize,
-    };
+  async initialize() {
+    await super.initialize();
+    this.pointSize = this._pointSize;
   }
 
   /**
    * @param {import("@vcmap/core").VcsMap} map
-   * @returns {Array<PointCloudCesium>}
+   * @returns {Array<CesiumTilesetCesiumImpl>}
    */
   createImplementationsForMap(map) {
     if (map instanceof CesiumMap) {
-      return [new PointCloudCesium(map, this.getImplementationOptions())];
+      return [new CesiumTilesetCesiumImpl(map, this.getImplementationOptions())];
     }
 
     return [];
@@ -129,8 +121,8 @@ class PointCloud extends CesiumTileset {
   }
 
   /**
-   * Sets a new declarative style. Cannot set a Vector style on PointCloud layers.
-   * @param {string|import("ol/style/Style").default|import("ol/style/Style").StyleFunction|import("@vcmap/core").StyleItem} style
+   * Sets a new declarative style. Cannot set a VectorLayer style on PointCloudLayer layers.
+   * @param {import("ol/style/Style").default|import("ol/style/Style").StyleFunction|import("@vcmap/core").StyleItem} style
    * @param {boolean=} silent
    * @api
    */
@@ -148,7 +140,7 @@ class PointCloud extends CesiumTileset {
    */
   toJSON() {
     const config = /** @type {PointCloudOptions} */ (super.toJSON());
-    const defaultOptions = PointCloud.getDefaultOptions();
+    const defaultOptions = PointCloudLayer.getDefaultOptions();
 
     if (this.defaultPointSize !== defaultOptions.pointSize) {
       config.pointSize = this.defaultPointSize;
@@ -158,5 +150,5 @@ class PointCloud extends CesiumTileset {
   }
 }
 
-VcsClassRegistry.registerClass(PointCloud.className, PointCloud);
-export default PointCloud;
+layerClassRegistry.registerClass(PointCloudLayer.className, PointCloudLayer);
+export default PointCloudLayer;