@vcmap/core 5.0.0-rc.1 → 5.0.0-rc.10

package/src/{vcs/vcm/interaction → interaction}/featureProviderInteraction.js

@@ -7,19 +7,8 @@ import { EventType, ModificationKeyType } from './interactionType.js';
  */
 class FeatureProviderInteraction extends AbstractInteraction {
   constructor() {
-    super();
-    /**
-     * @inheritDoc
-     * @type {ModificationKeyType|number}
-     * @protected
-     */
-    this._defaultModificationKey = ModificationKeyType.ALL;
-    /**
-     * @inheritDoc
-     * @type {ModificationKeyType|number}
-     * @protected
-     */
-    this._defaultActive = EventType.CLICK;
+    super(EventType.CLICK, ModificationKeyType.ALL);
+
     this.setActive();
   }
 

package/src/{vcs/vcm/interaction → interaction}/interactionChain.js

@@ -11,31 +11,13 @@ class InteractionChain extends AbstractInteraction {
    * @param {Array<AbstractInteraction>=} chain
    */
   constructor(chain) {
-    super();
+    super(EventType.ALL, ModificationKeyType.ALL, PointerKeyType.ALL);
     /**
      * The interactions to handle one after the other
      * @type {Array<AbstractInteraction>}
      * @api
      */
     this.chain = chain || [];
-    /**
-     * @inheritDoc
-     * @type {EventType}
-     * @protected
-     */
-    this._defaultActive = EventType.ALL;
-    /**
-     * @inheritDoc
-     * @type {ModificationKeyType}
-     * @protected
-     */
-    this._defaultModificationKey = ModificationKeyType.ALL;
-    /**
-     * @inheritDoc
-     * @type {PointerKeyType}
-     * @protected
-     */
-    this._defaultPointerKey = PointerKeyType.ALL;
     this.setActive();
   }
 
@@ -72,8 +54,8 @@ class InteractionChain extends AbstractInteraction {
    * @param {InteractionEvent} event
    * @returns {Promise<InteractionEvent>}
    */
-  pipe(event) {
-    let promise = Promise.resolve(event);
+  async pipe(event) {
+    let pipedEvent = event;
     const chainLength = this.chain.length;
     for (let i = 0; i < chainLength; i++) {
       const interaction = this.chain[i];
@@ -82,16 +64,14 @@ class InteractionChain extends AbstractInteraction {
         (interaction.modificationKey & event.key) &&
         (interaction.pointerKey & event.pointer)
       ) {
-        // eslint-disable-next-line
-        promise = promise.then(function (pipedEvent) {
-          if (pipedEvent.stopPropagation) {
-            return Promise.resolve(pipedEvent);
-          }
-          return this.pipe(pipedEvent);
-        }.bind(interaction));
+        // eslint-disable-next-line no-await-in-loop
+        pipedEvent = await interaction.pipe(pipedEvent);
+        if (pipedEvent.stopPropagation) {
+          break;
+        }
       }
     }
-    return promise;
+    return pipedEvent;
   }
 
   /**
@@ -99,7 +79,7 @@ class InteractionChain extends AbstractInteraction {
    * @override
    */
   setModification() {
-    this.modificationKey = this._defaultModificationKey;
+    super.setModification();
   }
 
   /**
@@ -107,7 +87,7 @@ class InteractionChain extends AbstractInteraction {
    * @override
    */
   setPointer() {
-    this.pointerKey = this._defaultPointerKey;
+    super.setPointer();
   }
 
   /**

package/src/{vcs/vcm/layer/cesium/cesiumTilesetCesium.js → layer/cesium/cesiumTilesetCesiumImpl.js}

@@ -64,9 +64,9 @@ export function getExtentFromTileset(cesium3DTileset) {
  * @implements {FeatureLayerImplementation}
  * @api stable
  */
-class CesiumTilesetCesium extends LayerImplementation {
+class CesiumTilesetCesiumImpl extends LayerImplementation {
   /** @type {string} */
-  static get className() { return 'vcs.vcm.layer.cesium.CesiumTilesetCesium'; }
+  static get className() { return 'CesiumTilesetCesiumImpl'; }
 
   /**
    * @param {import("@vcmap/core").CesiumMap} map
@@ -79,7 +79,7 @@ class CesiumTilesetCesium extends LayerImplementation {
     this.cesium3DTileset = null;
     /** @type {Object} */
     this.tilesetOptions = options.tilesetOptions;
-    /** @type {import("@vcmap/cesium").ImagerySplitDirection} */
+    /** @type {import("@vcmap/cesium").SplitDirection} */
     this.splitDirection = options.splitDirection;
     /** @type {import("@vcmap/core").StyleItem} */
     this.style = options.style;
@@ -92,7 +92,7 @@ class CesiumTilesetCesium extends LayerImplementation {
     /** @type {import("ol/coordinate").Coordinate} */
     this.offset = options.offset;
     /**
-     * @type {Promise<void>}
+     * @type {Promise<import("@vcmap/cesium").Cesium3DTileset>}
      * @private
      */
     this._initializedPromise = null;
@@ -128,9 +128,7 @@ class CesiumTilesetCesium extends LayerImplementation {
         delete tile[cesiumTilesetLastUpdated];
       });
 
-      this._initializedPromise = new Promise((resolve, reject) => {
-        this.cesium3DTileset.readyPromise.then(() => { resolve(); }, reject);
-      });
+      this._initializedPromise = this.cesium3DTileset.readyPromise;
 
       await this._initializedPromise;
       this._originalOrigin = Cartesian3.clone(this.cesium3DTileset.boundingSphere.center);
@@ -147,7 +145,7 @@ class CesiumTilesetCesium extends LayerImplementation {
       }
       this.updateStyle(this.style);
     }
-    return this._initializedPromise;
+    await this._initializedPromise;
   }
 
   /**
@@ -250,7 +248,7 @@ class CesiumTilesetCesium extends LayerImplementation {
   }
 
   /**
-   * @param {import("@vcmap/cesium").ImagerySplitDirection} splitDirection
+   * @param {import("@vcmap/cesium").SplitDirection} splitDirection
    */
   updateSplitDirection(splitDirection) {
     const { splitScreen } = this.map;
@@ -356,4 +354,4 @@ class CesiumTilesetCesium extends LayerImplementation {
   }
 }
 
-export default CesiumTilesetCesium;
+export default CesiumTilesetCesiumImpl;

package/src/{vcs/vcm/layer/cesium/dataSourceCesium.js → layer/cesium/dataSourceCesiumImpl.js}

@@ -28,7 +28,10 @@ function synchronizeEntityCollections(source, destination) {
  * @export
  * @extends {LayerImplementation<import("@vcmap/core").CesiumMap>}}
  */
-class DataSourceCesium extends LayerImplementation {
+class DataSourceCesiumImpl extends LayerImplementation {
+  /** @type {string} */
+  static get className() { return 'DataSourceCesiumImpl'; }
+
   /**
    * @param {import("@vcmap/core").CesiumMap} map
    * @param {DataSourceImplementationOptions} options
@@ -168,4 +171,4 @@ class DataSourceCesium extends LayerImplementation {
   }
 }
 
-export default DataSourceCesium;
+export default DataSourceCesiumImpl;

package/src/{vcs/vcm/layer/cesium/openStreetMapCesium.js → layer/cesium/openStreetMapCesiumImpl.js}

@@ -1,14 +1,14 @@
 import { OpenStreetMapImageryProvider, ImageryLayer as CesiumImageryLayer } from '@vcmap/cesium';
-import RasterLayerCesium from './rasterLayerCesium.js';
+import RasterLayerCesiumImpl from './rasterLayerCesiumImpl.js';
 
 /**
- * represents a specific OpenStreetMap layer for cesium.
+ * represents a specific OpenStreetMapLayer layer for cesium.
  * @class
  * @export
- * @extends {RasterLayerCesium}
+ * @extends {RasterLayerCesiumImpl}
  */
-class OpenStreetMapCesium extends RasterLayerCesium {
-  static get className() { return 'vcs.vcm.layer.cesium.OpenStreetMapCesium'; }
+class OpenStreetMapCesiumImpl extends RasterLayerCesiumImpl {
+  static get className() { return 'OpenStreetMapCesiumImpl'; }
 
   /**
    * @inheritDoc
@@ -26,4 +26,4 @@ class OpenStreetMapCesium extends RasterLayerCesium {
 }
 
 
-export default OpenStreetMapCesium;
+export default OpenStreetMapCesiumImpl;

package/src/{vcs/vcm/layer/cesium/rasterLayerCesium.js → layer/cesium/rasterLayerCesiumImpl.js}

@@ -8,8 +8,8 @@ import LayerImplementation from '../layerImplementation.js';
  * @extends {LayerImplementation<import("@vcmap/core").CesiumMap>}}
  * @implements {RasterLayerImplementation}
  */
-class RasterLayerCesium extends LayerImplementation {
-  static get className() { return 'vcs.vcm.layer.cesium.RasterLayerCesium'; }
+class RasterLayerCesiumImpl extends LayerImplementation {
+  static get className() { return 'RasterLayerCesiumImpl'; }
 
   /**
    * @param {import("@vcmap/core").CesiumMap} map
@@ -19,7 +19,7 @@ class RasterLayerCesium extends LayerImplementation {
     super(map, options);
     /** @type {import("@vcmap/cesium").ImageryLayer|null} */
     this.cesiumLayer = null;
-    /** @type {import("@vcmap/cesium").ImagerySplitDirection} */
+    /** @type {import("@vcmap/cesium").SplitDirection} */
     this.splitDirection = options.splitDirection;
     /** @type {number} */
     this.minLevel = options.minLevel;
@@ -48,7 +48,7 @@ class RasterLayerCesium extends LayerImplementation {
   }
 
   /**
-   * @param {import("@vcmap/cesium").ImagerySplitDirection} splitDirection
+   * @param {import("@vcmap/cesium").SplitDirection} splitDirection
    */
   updateSplitDirection(splitDirection) {
     this.splitDirection = splitDirection;
@@ -107,4 +107,4 @@ class RasterLayerCesium extends LayerImplementation {
   }
 }
 
-export default RasterLayerCesium;
+export default RasterLayerCesiumImpl;

package/src/{vcs/vcm/layer/cesium/singleImageCesium.js → layer/cesium/singleImageCesiumImpl.js}

@@ -1,15 +1,15 @@
 import { Rectangle, SingleTileImageryProvider, ImageryLayer } from '@vcmap/cesium';
-import RasterLayerCesium from './rasterLayerCesium.js';
+import RasterLayerCesiumImpl from './rasterLayerCesiumImpl.js';
 import { wgs84Projection } from '../../util/projection.js';
 
 /**
  * represents a specific Cesium SingleTileImagery Layer class.
  * @class
  * @export
- * @extends {RasterLayerCesium}
+ * @extends {RasterLayerCesiumImpl}
  */
-class SingleImageCesium extends RasterLayerCesium {
-  static get className() { return 'vcs.vcm.layer.cesium.singleImageLayer'; }
+class SingleImageCesiumImpl extends RasterLayerCesiumImpl {
+  static get className() { return 'SingleImageCesiumImpl'; }
 
   /**
    * @param {import("@vcmap/core").CesiumMap} map
@@ -46,4 +46,4 @@ class SingleImageCesium extends RasterLayerCesium {
   }
 }
 
-export default SingleImageCesium;
+export default SingleImageCesiumImpl;

package/src/{vcs/vcm/layer/cesium/terrainCesium.js → layer/cesium/terrainCesiumImpl.js}

@@ -4,13 +4,13 @@ import { getTerrainProviderForUrl } from '../terrainHelpers.js';
 
 
 /**
- * Terrain implementation for {@link CesiumMap}
+ * TerrainLayer implementation for {@link CesiumMap}
  * @class
  * @export
  * @extends {LayerImplementation<import("@vcmap/core").CesiumMap>}}
  */
-class TerrainCesium extends LayerImplementation {
-  static get className() { return 'vcs.vcm.layer.cesium.TerrainCesium'; }
+class TerrainCesiumImpl extends LayerImplementation {
+  static get className() { return 'TerrainCesiumImpl'; }
 
   /**
    * @param {import("@vcmap/core").CesiumMap} map
@@ -77,4 +77,4 @@ class TerrainCesium extends LayerImplementation {
   }
 }
 
-export default TerrainCesium;
+export default TerrainCesiumImpl;

package/src/{vcs/vcm/layer/cesium/tmsCesium.js → layer/cesium/tmsCesiumImpl.js}

@@ -1,16 +1,16 @@
 import { Rectangle, GeographicTilingScheme, TileMapServiceImageryProvider, ImageryLayer as CesiumImageryLayer } from '@vcmap/cesium';
-import RasterLayerCesium from './rasterLayerCesium.js';
+import RasterLayerCesiumImpl from './rasterLayerCesiumImpl.js';
 import { wgs84Projection } from '../../util/projection.js';
 import { TilingScheme } from '../rasterLayer.js';
 
 /**
- * TMS implementation for {@link CesiumMap}.
+ * TmsLayer implementation for {@link CesiumMap}.
  * @class
  * @export
- * @extends {RasterLayerCesium}
+ * @extends {RasterLayerCesiumImpl}
  */
-class TMSCesium extends RasterLayerCesium {
-  static get className() { return 'vcs.vcm.layer.cesium.TMSCesium'; }
+class TmsCesiumImpl extends RasterLayerCesiumImpl {
+  static get className() { return 'TmsCesiumImpl'; }
 
   /**
    * @param {import("@vcmap/core").CesiumMap} map
@@ -51,4 +51,4 @@ class TMSCesium extends RasterLayerCesium {
   }
 }
 
-export default TMSCesium;
+export default TmsCesiumImpl;

package/src/{vcs/vcm/layer/cesium/vectorCesium.js → layer/cesium/vectorCesiumImpl.js}

@@ -15,8 +15,8 @@ import { synchronizeFeatureVisibilityWithSource } from '../vectorHelpers.js';
  * @extends {LayerImplementation<import("@vcmap/core").CesiumMap>}}
  * @implements {FeatureLayerImplementation}
  */
-class VectorCesium extends LayerImplementation {
-  static get className() { return 'vcs.vcm.layer.cesium.VectorCesium'; }
+class VectorCesiumImpl extends LayerImplementation {
+  static get className() { return 'VectorCesiumImpl'; }
 
   /**
    * @param {import("@vcmap/core").CesiumMap} map
@@ -252,4 +252,4 @@ class VectorCesium extends LayerImplementation {
   }
 }
 
-export default VectorCesium;
+export default VectorCesiumImpl;

package/src/{vcs/vcm/layer/cesium/vectorRasterTileCesium.js → layer/cesium/vectorRasterTileCesiumImpl.js}

@@ -1,18 +1,18 @@
 import { ImageryLayer as CesiumImageryLayer, Rectangle } from '@vcmap/cesium';
 import VectorTileImageryProvider from './vectorTileImageryProvider.js';
-import RasterLayerCesium from './rasterLayerCesium.js';
+import RasterLayerCesiumImpl from './rasterLayerCesiumImpl.js';
 import { wgs84Projection } from '../../util/projection.js';
 
 /**
  * represents a rasterized tiled vector layer implementation for cesium.
  * @class
  * @export
- * @extends {RasterLayerCesium}
+ * @extends {RasterLayerCesiumImpl}
  * @implements {VectorTileImplementation}
  */
-class VectorRasterTileCesium extends RasterLayerCesium {
+class VectorRasterTileCesiumImpl extends RasterLayerCesiumImpl {
   static get className() {
-    return 'vcs.vcm.layer.cesium.VectorRasterTileCesium';
+    return 'VectorRasterTileCesiumImpl';
   }
 
   /**
@@ -113,4 +113,4 @@ class VectorRasterTileCesium extends RasterLayerCesium {
   }
 }
 
-export default VectorRasterTileCesium;
+export default VectorRasterTileCesiumImpl;

package/src/{vcs/vcm/layer → layer}/cesium/vectorTileImageryProvider.js

@@ -2,7 +2,7 @@ import { Event as CesiumEvent, Rectangle, Math as CesiumMath } from '@vcmap/cesi
 import { compose, create as createTransform, scale as scaleTransform } from 'ol/transform.js';
 import { rectangleToExtent } from '../tileProvider/tileProvider.js';
 import { wgs84ToMercatorTransformer } from '../../util/projection.js';
-import CanvasTileRenderer from '../../../../ol/render/canvas/canvasTileRenderer.js';
+import CanvasTileRenderer from '../../ol/render/canvas/canvasTileRenderer.js';
 
 /**
  * @param {import("ol/extent").Extent} extent

package/src/{vcs/vcm/layer/cesium/wmsCesium.js → layer/cesium/wmsCesiumImpl.js}

@@ -1,16 +1,16 @@
 import { ImageryLayer as CesiumImageryLayer, Rectangle, WebMercatorTilingScheme, WebMapServiceImageryProvider } from '@vcmap/cesium';
 
-import RasterLayerCesium from './rasterLayerCesium.js';
+import RasterLayerCesiumImpl from './rasterLayerCesiumImpl.js';
 import { wgs84Projection } from '../../util/projection.js';
 
 /**
- * represents a specific Cesium WMSCesium Layer class.
+ * represents a specific Cesium WmsCesiumImpl Layer class.
  * @class
  * @export
- * @extends {RasterLayerCesium}
+ * @extends {RasterLayerCesiumImpl}
  */
-class WMSCesium extends RasterLayerCesium {
-  static get className() { return 'vcs.vcm.layer.cesium.WMSCesium'; }
+class WmsCesiumImpl extends RasterLayerCesiumImpl {
+  static get className() { return 'WmsCesiumImpl'; }
 
   /**
    * @param {import("@vcmap/core").CesiumMap} map
@@ -68,4 +68,4 @@ class WMSCesium extends RasterLayerCesium {
   }
 }
 
-export default WMSCesium;
+export default WmsCesiumImpl;

package/src/{vcs/vcm/layer/cesium/wmtsCesium.js → layer/cesium/wmtsCesiumImpl.js}

@@ -1,16 +1,16 @@
 import { Rectangle, WebMapTileServiceImageryProvider, ImageryLayer as CesiumImageryLayer } from '@vcmap/cesium';
-import RasterLayerCesium from './rasterLayerCesium.js';
+import RasterLayerCesiumImpl from './rasterLayerCesiumImpl.js';
 import { wgs84Projection } from '../../util/projection.js';
 import { getTilingScheme } from '../rasterLayer.js';
 
 /**
- * represents a specific WMTS Implementation for {@link CesiumMap}.
+ * represents a specific WmtsLayer Implementation for {@link CesiumMap}.
  * @class
  * @export
- * @extends {RasterLayerCesium}
+ * @extends {RasterLayerCesiumImpl}
  */
-class WMTSCesium extends RasterLayerCesium {
-  static get className() { return 'vcs.vcm.layer.cesium.WMTSCesium'; }
+class WmtsCesiumImpl extends RasterLayerCesiumImpl {
+  static get className() { return 'WmtsCesiumImpl'; }
 
   /**
    * @param {import("@vcmap/core").CesiumMap} map
@@ -98,4 +98,4 @@ class WMTSCesium extends RasterLayerCesium {
   }
 }
 
-export default WMTSCesium;
+export default WmtsCesiumImpl;

package/src/{vcs/vcm/layer/cesiumTileset.js → layer/cesiumTilesetLayer.js}

@@ -1,18 +1,17 @@
-import { ImagerySplitDirection, Matrix4 } from '@vcmap/cesium';
+import { SplitDirection, Matrix4 } from '@vcmap/cesium';
 
 import { checkMaybe } from '@vcsuite/check';
 import { parseInteger } from '@vcsuite/parsers';
 import getJSONObjectFromObject from './cesium/x3dmHelper.js';
-import VectorStyleItem from '../util/style/vectorStyleItem.js';
+import VectorStyleItem from '../style/vectorStyleItem.js';
 import FeatureLayer from './featureLayer.js';
-import CesiumTilesetCesium, { getExtentFromTileset } from './cesium/cesiumTilesetCesium.js';
-import CesiumMap from '../maps/cesium.js';
-import VcsEvent from '../event/vcsEvent.js';
+import CesiumTilesetCesiumImpl, { getExtentFromTileset } from './cesium/cesiumTilesetCesiumImpl.js';
+import CesiumMap from '../map/cesiumMap.js';
+import VcsEvent from '../vcsEvent.js';
 import Extent from '../util/extent.js';
 import { mercatorProjection } from '../util/projection.js';
 import { isMobile } from '../util/isMobile.js';
-import { referenceableStyleSymbol } from '../util/style/styleItem.js';
-import { VcsClassRegistry } from '../classRegistry.js';
+import { layerClassRegistry } from '../classRegistry.js';
 
 /**
  * @typedef {LayerOptions} CesiumTilesetOptions
@@ -37,7 +36,7 @@ import { VcsClassRegistry } from '../classRegistry.js';
 /**
  * @typedef {FeatureLayerImplementationOptions} CesiumTilesetImplementationOptions
  * @property {Object|undefined} tilesetOptions
- * @property {import("@vcmap/cesium").ImagerySplitDirection} splitDirection
+ * @property {import("@vcmap/cesium").SplitDirection} splitDirection
  * @property {Array<CesiumTilesetTilesetProperties>|undefined} tilesetProperties
  * @property {import("@vcmap/cesium").Matrix4|undefined} modelMatrix
  * @property {import("ol/coordinate").Coordinate|undefined} offset
@@ -52,9 +51,9 @@ import { VcsClassRegistry } from '../classRegistry.js';
  * @api stable
  * @export
  */
-class CesiumTileset extends FeatureLayer {
+class CesiumTilesetLayer extends FeatureLayer {
   /** @type {string} */
-  static get className() { return 'vcs.vcm.layer.CesiumTileset'; }
+  static get className() { return 'CesiumTilesetLayer'; }
 
   /**
    * @returns {CesiumTilesetOptions}
@@ -80,7 +79,7 @@ class CesiumTileset extends FeatureLayer {
     this._supportedMaps = [
       CesiumMap.className,
     ];
-    const defaultOptions = CesiumTileset.getDefaultOptions();
+    const defaultOptions = CesiumTilesetLayer.getDefaultOptions();
     if (this.url && !/\.json$/.test(this.url)) {
       this.url = `${this.url.replace(/\/$/, '')}/tileset.json`;
     }
@@ -111,18 +110,18 @@ class CesiumTileset extends FeatureLayer {
       ...tilesetOptions,
     };
 
-    /** @type {import("@vcmap/cesium").ImagerySplitDirection} */
-    this._splitDirection = ImagerySplitDirection.NONE;
+    /** @type {import("@vcmap/cesium").SplitDirection} */
+    this._splitDirection = SplitDirection.NONE;
 
     if (options.splitDirection) {
       this._splitDirection = options.splitDirection === 'left' ?
-        ImagerySplitDirection.LEFT :
-        ImagerySplitDirection.RIGHT;
+        SplitDirection.LEFT :
+        SplitDirection.RIGHT;
     }
 
     /**
      * 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();
@@ -158,7 +157,7 @@ class CesiumTileset extends FeatureLayer {
 
     this._modelMatrix = modelMatrix;
     this.getImplementations()
-      .forEach(/** @param {CesiumTilesetCesium} impl */ (impl) => {
+      .forEach(/** @param {CesiumTilesetCesiumImpl} impl */ (impl) => {
         impl.updateModelMatrix(modelMatrix);
       });
   }
@@ -182,30 +181,35 @@ class CesiumTileset extends FeatureLayer {
 
     this._offset = offset;
     this.getImplementations()
-      .forEach(/** @param {CesiumTilesetCesium} impl */ (impl) => {
+      .forEach(/** @param {CesiumTilesetCesiumImpl} impl */ (impl) => {
         impl.updateOffset(offset);
       });
   }
 
   /**
    * @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.getImplementations().forEach((impl) => {
-        /** @type {CesiumTilesetCesium} */ (impl).updateSplitDirection(direction);
+        /** @type {CesiumTilesetCesiumImpl} */ (impl).updateSplitDirection(direction);
       });
       this._splitDirection = direction;
       this.splitDirectionChanged.raiseEvent(this._splitDirection);
     }
   }
 
+  async initialize() {
+    await this.style.cesiumStyle.readyPromise;
+    return super.initialize();
+  }
+
   /**
    * @inheritDoc
    * @returns {CesiumTilesetImplementationOptions}
@@ -223,11 +227,11 @@ class CesiumTileset extends FeatureLayer {
   /**
    * @inheritDoc
    * @param {import("@vcmap/core").VcsMap} map
-   * @returns {Array<CesiumTilesetCesium>}
+   * @returns {Array<CesiumTilesetCesiumImpl>}
    */
   createImplementationsForMap(map) {
     if (map instanceof CesiumMap) {
-      return [new CesiumTilesetCesium(map, this.getImplementationOptions())];
+      return [new CesiumTilesetCesiumImpl(map, this.getImplementationOptions())];
     }
     return [];
   }
@@ -261,12 +265,12 @@ class CesiumTileset extends FeatureLayer {
     if (metaExtent) {
       return metaExtent;
     }
-    const impl = /** @type {CesiumTilesetCesium} */ (this.getImplementations()[0]);
+    const impl = /** @type {CesiumTilesetCesiumImpl} */ (this.getImplementations()[0]);
     if (impl) {
       const threeDimExtent = getExtentFromTileset(impl.cesium3DTileset);
 
       const actualExtent = new Extent({
-        ...mercatorProjection.getConfigObject(),
+        projection: mercatorProjection.toJSON(),
         coordinates: threeDimExtent,
       });
 
@@ -299,7 +303,7 @@ class CesiumTileset extends FeatureLayer {
    */
   setMaximumScreenSpaceError(value) {
     this.getImplementations()
-      .forEach(/** @param {CesiumTilesetCesium} impl */(impl) => {
+      .forEach(/** @param {CesiumTilesetCesiumImpl} impl */(impl) => {
         if (impl.cesium3DTileset) {
           impl.cesium3DTileset.maximumScreenSpaceError = value;
         }
@@ -309,14 +313,12 @@ class CesiumTileset extends FeatureLayer {
   /**
    * @returns {CesiumTilesetOptions}
    */
-  getConfigObject() {
+  toJSON() {
     /** @type {CesiumTilesetOptions} */
-    const config = super.getConfigObject();
-    const defaultOptions = CesiumTileset.getDefaultOptions();
+    const config = super.toJSON();
+    const defaultOptions = CesiumTilesetLayer.getDefaultOptions();
     if (this.highlightStyle) {
-      config.highlightStyle = this.highlightStyle[referenceableStyleSymbol] ?
-        this.highlightStyle.getReference() :
-        this.highlightStyle.getOptions();
+      config.highlightStyle = this.highlightStyle.toJSON();
     }
 
     if (this.screenSpaceError !== defaultOptions.screenSpaceError) {
@@ -349,8 +351,8 @@ class CesiumTileset extends FeatureLayer {
       config.tilesetOptions = tilesetOptions;
     }
 
-    if (this._splitDirection !== ImagerySplitDirection.NONE) {
-      config.splitDirection = this._splitDirection === ImagerySplitDirection.RIGHT ?
+    if (this._splitDirection !== SplitDirection.NONE) {
+      config.splitDirection = this._splitDirection === SplitDirection.RIGHT ?
         'right' :
         'left';
     }
@@ -372,5 +374,5 @@ class CesiumTileset extends FeatureLayer {
   }
 }
 
-VcsClassRegistry.registerClass(CesiumTileset.className, CesiumTileset);
-export default CesiumTileset;
+layerClassRegistry.registerClass(CesiumTilesetLayer.className, CesiumTilesetLayer);
+export default CesiumTilesetLayer;