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

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

@@ -27,7 +27,16 @@ import { EventType, ModificationKeyType, PointerKeyType } from './interactionTyp
  * @api
  */
 class AbstractInteraction {
-  constructor() {
+  /**
+   * @param {number} [defaultActive=EventType.NONE] - A bitmask representing the default {@link EventType} to listen to
+   * @param {number} [defaultModificationKey=ModificationKeyType.NONE] - A bitmask representing the default {@link ModificationKeyType} keys to listen to
+   * @param {number} [defaultPointerKey=PointerKeyType.LEFT] - A bitmask representing the {@link PointerKeyType} pointer key to listen to
+   */
+  constructor(
+    defaultActive = EventType.NONE,
+    defaultModificationKey = ModificationKeyType.NONE,
+    defaultPointerKey = PointerKeyType.LEFT,
+  ) {
     /**
      * A unique identifier for this interaction
      * @type {string}
@@ -36,13 +45,10 @@ class AbstractInteraction {
     this.id = uuidv4();
 
     /**
-     * A bitmask representing the default events to listen to
-     * {@link EventType}, default is NONE
      * @type {number}
-     * @protected
-     * @api
+     * @private
      */
-    this._defaultActive = EventType.NONE;
+    this._defaultActive = defaultActive;
 
     /**
      * The current active bitmask for {@link EventType}
@@ -52,13 +58,10 @@ class AbstractInteraction {
     this.active = this._defaultActive;
 
     /**
-     * The default bitmask for modification keys to listen to,
-     * {@link ModificationKeyType} default is NONE
      * @type {number}
-     * @protected
-     * @api
+     * @private
      */
-    this._defaultModificationKey = ModificationKeyType.NONE;
+    this._defaultModificationKey = defaultModificationKey;
 
     /**
      * The current active {@link ModificationKeyType}
@@ -68,11 +71,10 @@ class AbstractInteraction {
     this.modificationKey = this._defaultModificationKey;
 
     /**
-     * default bitmask for pointer key {@link PointerKeyType}, starting value is LEFT
      * @type {number}
-     * @protected
+     * @private
      */
-    this._defaultPointerKey = PointerKeyType.LEFT;
+    this._defaultPointerKey = defaultPointerKey;
 
     /**
      * The currently active {@link PointerKeyType}
@@ -114,7 +116,7 @@ class AbstractInteraction {
   }
 
   /**
-   * Sets the modification key to listen to
+   * Sets the modification key to listen to or the default modification key if none is provided.
    * @param {number=} mod
    * @api
    */
@@ -127,8 +129,8 @@ class AbstractInteraction {
   }
 
   /**
-   * Sets the pointer key for this interaction$
-   * @param {number} pointer
+   * Sets the pointer key for this interaction or the default pointer if none is provided.
+   * @param {number=} pointer
    * @api
    */
   setPointer(pointer) {

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

@@ -10,7 +10,7 @@ import { transformFromImage } from '../oblique/helpers.js';
  */
 class CoordinateAtPixel extends AbstractInteraction {
   constructor() {
-    super();
+    super(EventType.ALL, ModificationKeyType.ALL);
     /**
      * @type {import("@vcmap/cesium").Cartographic}
      * @private
@@ -22,9 +22,6 @@ class CoordinateAtPixel extends AbstractInteraction {
      */
     this._scratchCartesian = new Cartesian3();
 
-    this._defaultActive = EventType.ALL;
-    this._defaultModificationKey = ModificationKeyType.ALL;
-
     this.setActive();
   }
 
@@ -35,9 +32,9 @@ class CoordinateAtPixel extends AbstractInteraction {
    */
   // eslint-disable-next-line class-methods-use-this
   async pipe(event) {
-    if (event.map.className === 'vcs.vcm.maps.Cesium') {
+    if (event.map.className === 'CesiumMap') {
       return this._cesiumHandler(event);
-    } else if (event.map.className === 'vcs.vcm.maps.Oblique') {
+    } else if (event.map.className === 'ObliqueMap') {
       return CoordinateAtPixel.obliqueHandler(event);
     }
     return event;
@@ -74,10 +71,10 @@ class CoordinateAtPixel extends AbstractInteraction {
    * @private
    */
   static obliqueHandler(event) {
-    const obliqueMap = /** @type {import("@vcmap/core").Oblique} */ (event.map);
+    const obliqueMap = /** @type {import("@vcmap/core").ObliqueMap} */ (event.map);
     const image = obliqueMap.currentImage;
     if (image) {
-      // don't use Terrain for coordinate Transformation if the event is a move or drag event,
+      // don't use TerrainLayer for coordinate Transformation if the event is a move or drag event,
       // to avoid requesting the terrain each mousemove...
       // XXX but what about DRAGSTART and DRAGEND? this could be usefull, no?
       const move = event.type & (EventType.MOVE ^ EventType.DRAGEVENTS);

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

@@ -9,7 +9,7 @@ import CoordinateAtPixel from './coordinateAtPixel.js';
 import FeatureAtPixelInteraction from './featureAtPixelInteraction.js';
 import { EventType, PointerEventType } from './interactionType.js';
 import FeatureProviderInteraction from './featureProviderInteraction.js';
-import VcsEvent from '../event/vcsEvent.js';
+import VcsEvent from '../vcsEvent.js';
 
 /**
  * @namespace interaction
@@ -31,7 +31,7 @@ import VcsEvent from '../event/vcsEvent.js';
  * @property {import("@vcmap/core").ModificationKeyType} key
  * @property {import("@vcmap/core").PointerKeyType} pointer
  * @property {import("ol/coordinate").Coordinate|undefined} position - position in web mercator coordinates
- * @property {import("ol/coordinate").Coordinate|undefined} positionOrPixel - position in web mercator coordinates or image coordinates in Oblique Map Mode
+ * @property {import("ol/coordinate").Coordinate|undefined} positionOrPixel - position in web mercator coordinates or image coordinates in ObliqueMap Map Mode
  * @property {boolean|undefined} multipleTouch - vcs:undocumented
  * @property {number|null|undefined} time - vcs:undocumented
  */
@@ -47,7 +47,7 @@ import VcsEvent from '../event/vcsEvent.js';
  * @returns {import("@vcsuite/logger").Logger}
  */
 function getLogger() {
-  return getLoggerByName('vcs.vcm.interaction.EventHandler');
+  return getLoggerByName('EventHandler');
 }
 
 /**

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

@@ -12,7 +12,7 @@ import { originalFeatureSymbol } from '../layer/vectorSymbols.js';
  */
 class FeatureAtPixelInteraction extends AbstractInteraction {
   constructor() {
-    super();
+    super(EventType.ALL ^ EventType.MOVE, ModificationKeyType.ALL);
     /**
      * @type {EventType|number}
      * @private
@@ -47,19 +47,6 @@ class FeatureAtPixelInteraction extends AbstractInteraction {
      */
     this.hitTolerance = 10;
 
-    /**
-     * @inheritDoc
-     * @type {ModificationKeyType|number}
-     * @protected
-     */
-    this._defaultModificationKey = ModificationKeyType.ALL;
-    /**
-     * @inheritDoc
-     * @type {ModificationKeyType|number}
-     * @protected
-     */
-    this._defaultActive = EventType.ALL ^ EventType.MOVE;
-
     /**
      * @type {import("ol").Feature<import("ol/geom/Geometry").default>|Object|null}
      * @private
@@ -113,11 +100,11 @@ class FeatureAtPixelInteraction extends AbstractInteraction {
       this._draggingFeature = null;
     }
 
-    if (event.map.className === 'vcs.vcm.maps.Openlayers') {
+    if (event.map.className === 'OpenlayersMap') {
       await this._openlayersHandler(event);
-    } else if (event.map.className === 'vcs.vcm.maps.Oblique') {
+    } else if (event.map.className === 'ObliqueMap') {
       await this._obliqueHandler(event);
-    } else if (event.map.className === 'vcs.vcm.maps.Cesium') {
+    } else if (event.map.className === 'CesiumMap') {
       await this._cesiumHandler(event);
     }
     if (event.type & EventType.DRAGSTART && event.feature) {
@@ -152,7 +139,7 @@ class FeatureAtPixelInteraction extends AbstractInteraction {
     let found = null;
     /** @type {null|import("ol/layer/Layer").default} */
     let foundLayer = null;
-    /** @type {import("@vcmap/core").Openlayers} */ (event.map).olMap
+    /** @type {import("@vcmap/core").OpenlayersMap} */ (event.map).olMap
       .forEachFeatureAtPixel([event.windowPosition.x, event.windowPosition.y], (feat, layer) => {
         if (feat && (feat.get('olcs_allowPicking') == null || feat.get('olcs_allowPicking') === true)) {
           found = /** @type {import("ol").Feature<import("ol/geom/Geometry").default>} */ (feat);
@@ -180,7 +167,7 @@ class FeatureAtPixelInteraction extends AbstractInteraction {
     let found = null;
     /** @type {null|import("ol/layer/Layer").default} */
     let foundLayer = null;
-    /** @type {import("@vcmap/core").Oblique} */ (event.map).olMap
+    /** @type {import("@vcmap/core").ObliqueMap} */ (event.map).olMap
       .forEachFeatureAtPixel([event.windowPosition.x, event.windowPosition.y], (feat, layer) => {
         if (feat) {
           found = feat[originalFeatureSymbol] || feat;

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
@@ -356,4 +356,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/pointCloudCesium.js → layer/cesium/pointCloudCesiumImpl.js}

@@ -1,8 +1,8 @@
 import { Cesium3DTileStyle } from '@vcmap/cesium';
-import CesiumTilesetCesium from './cesiumTilesetCesium.js';
+import CesiumTilesetCesiumImpl from './cesiumTilesetCesiumImpl.js';
 
 /**
- * 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
@@ -11,11 +11,11 @@ import CesiumTilesetCesium from './cesiumTilesetCesium.js';
  *
  * @class
  * @export
- * @extends {CesiumTilesetCesium}
+ * @extends {CesiumTilesetCesiumImpl}
  * @api stable
  */
-class PointCloudCesium extends CesiumTilesetCesium {
-  static get className() { return 'vcs.vcm.layer.cesium.PointCloud'; }
+class PointCloudCesiumImpl extends CesiumTilesetCesiumImpl {
+  static get className() { return 'PointCloudCesiumImpl'; }
 
   /**
    * @param {import("@vcmap/core").CesiumMap} map
@@ -55,4 +55,4 @@ class PointCloudCesium extends CesiumTilesetCesium {
   }
 }
 
-export default PointCloudCesium;
+export default PointCloudCesiumImpl;

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
@@ -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;