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

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

@@ -8,13 +8,13 @@ import Circle from 'ol/geom/Circle.js';
 import { getDistance as haversineDistance } from 'ol/sphere.js';
 import { getLogger as getLoggerByName } from '@vcsuite/logger';
 import Projection, { mercatorProjection, wgs84Projection } from '../util/projection.js';
-import VectorStyleItem, { defaultVectorStyle, vectorStyleSymbol } from '../util/style/vectorStyleItem.js';
-import { parseColor } from '../util/style/styleHelpers.js';
-import Vector from './vector.js';
-import { featureStoreStateSymbol } from './featureStoreState.js';
-import { StyleType } from '../util/style/styleItem.js';
-import writeStyle, { embedIconsInStyle } from '../util/style/writeStyle.js';
-import DeclarativeStyleItem from '../util/style/declarativeStyleItem.js';
+import VectorStyleItem, { defaultVectorStyle, vectorStyleSymbol } from '../style/vectorStyleItem.js';
+import { parseColor } from '../style/styleHelpers.js';
+import VectorLayer from './vectorLayer.js';
+import { featureStoreStateSymbol } from './featureStoreLayerState.js';
+import { StyleType } from '../style/styleItem.js';
+import { embedIconsInStyle } from '../style/writeStyle.js';
+import DeclarativeStyleItem from '../style/declarativeStyleItem.js';
 import { vcsMetaVersion } from './layer.js';
 import Extent3D from '../util/featureconverter/extent3D.js';
 import { styleCollection } from '../globalCollections.js';
@@ -42,7 +42,7 @@ function getFormat() {
  * @returns {import("@vcsuite/logger").Logger}
  */
 function getLogger() {
-  return getLoggerByName('vcs.vcm.layer.GeoJSONHelper');
+  return getLoggerByName('GeoJSONHelper');
 }
 
 /**
@@ -92,7 +92,7 @@ export function getEPSGCodeFromGeojson(geojson) {
     if (crs.type === 'name') {
       return crs.properties.name;
     } else if (crs.type === 'EPSG') {
-      // 'EPSG' is not part of the GeoJSON specification, but is generated by
+      // 'EPSG' is not part of the GeojsonLayer specification, but is generated by
       // GeoServer.
       // TODO: remove this when http://jira.codehaus.org/browse/GEOS-5996
       // is fixed and widely deployed.
@@ -141,7 +141,7 @@ export function updateLegacyFeature(feature) {
 function readGeometry(geometryObj, options) {
   const geometry = getFormat().readGeometry(geometryObj, options.formatOptions);
   if (String(options.formatOptions.featureProjection) === 'EPSG:3857') {
-    geometry[Vector.alreadyTransformedToMercator] = true;
+    geometry[VectorLayer.alreadyTransformedToMercator] = true;
   }
   removeEndingVertexFromGeometry(geometry);
   return new Feature({ geometry });
@@ -246,7 +246,7 @@ function readFeature(featureObj, options) {
     geometry = circleFromCenterRadius(coordinates, radius);
   }
   if (String(options.formatOptions.featureProjection) === 'EPSG:3857') {
-    geometry[Vector.alreadyTransformedToMercator] = true;
+    geometry[VectorLayer.alreadyTransformedToMercator] = true;
   }
 
   featureObj.vcsMeta = featureObj.vcsMeta || {};
@@ -288,7 +288,7 @@ function readFeature(featureObj, options) {
 }
 
 /**
- * parses a string to GeoJSON
+ * parses a string to GeojsonLayer
  * @param {string|Object} input
  * @param {GeoJSONreadOptions=} readOptions
  * @returns {GeoJSONData}
@@ -425,7 +425,7 @@ export function writeGeoJSONFeature(feature, options = {}, embeddedIcons) {
 }
 
 /**
- * Writes all the features of the current layer to GeoJSON
+ * Writes all the features of the current layer to GeojsonLayer
  * @param {GeoJSONData} data
  * @param {GeoJSONwriteOptions=} options
  * @returns {string|Object}
@@ -441,10 +441,5 @@ export function writeGeoJSON(data, options = {}) { // how to handel embedded ico
     vcsMeta,
   };
 
-  if (options.writeStyle && data.style) { // legacy fallback for plugin use
-    getLogger().deprecate('data.style', 'use layer.getVcsMeta and pass that in instead');
-    writeStyle(data.style, obj.vcsMeta);
-  }
-
   return options.asObject ? obj : JSON.stringify(obj, null, options.prettyPrint ? 2 : null);
 }

package/src/{vcs/vcm/layer/geojson.js → layer/geojsonLayer.js}

@@ -1,4 +1,4 @@
-import Vector from './vector.js';
+import VectorLayer from './vectorLayer.js';
 import { parseGeoJSON, writeGeoJSONFeature } from './geojsonHelpers.js';
 import Projection, { wgs84Projection } from '../util/projection.js';
 import { VcsClassRegistry } from '../classRegistry.js';
@@ -6,7 +6,7 @@ import { requestJson } from '../util/fetch.js';
 
 /**
  * @typedef {VectorOptions} GeoJSONOptions
- * @property {Array<Object>|undefined} features - an array of GeoJSON features to parse
+ * @property {Array<Object>|undefined} features - an array of GeojsonLayer features to parse
  * @api
  */
 
@@ -18,21 +18,21 @@ export const featureFromOptions = Symbol('featureFromOptions');
 
 
 /**
- * GeoJSON layer for Cesium, Openlayers and Oblique
+ * GeojsonLayer layer for Cesium, OpenlayersMap and ObliqueMap
  * @class
  * @export
- * @extends {Vector}
+ * @extends {VectorLayer}
  * @api stable
  */
-class GeoJSON extends Vector {
-  static get className() { return 'vcs.vcm.layer.GeoJSON'; }
+class GeoJSONLayer extends VectorLayer {
+  static get className() { return 'GeoJSONLayer'; }
 
   /**
    * @returns {GeoJSONOptions}
    */
   static getDefaultOptions() {
     return {
-      ...Vector.getDefaultOptions(),
+      ...VectorLayer.getDefaultOptions(),
       projection: wgs84Projection.toJSON(),
       features: undefined,
     };
@@ -42,7 +42,7 @@ class GeoJSON extends Vector {
    * @param {GeoJSONOptions} options
    */
   constructor(options) {
-    const defaultOptions = GeoJSON.getDefaultOptions();
+    const defaultOptions = GeoJSONLayer.getDefaultOptions();
     options.projection = options.projection || defaultOptions.projection;
 
     super(options);
@@ -149,7 +149,7 @@ class GeoJSON extends Vector {
    */
   toJSON() {
     const config = /** @type {GeoJSONOptions} */ (super.toJSON());
-    const defaultOptions = GeoJSON.getDefaultOptions();
+    const defaultOptions = GeoJSONLayer.getDefaultOptions();
 
     const defaultProjection = new Projection(defaultOptions.projection);
     if (!this.projection.equals(defaultProjection)) {
@@ -179,5 +179,5 @@ class GeoJSON extends Vector {
   }
 }
 
-VcsClassRegistry.registerClass(GeoJSON.className, GeoJSON);
-export default GeoJSON;
+VcsClassRegistry.registerClass(GeoJSONLayer.className, GeoJSONLayer);
+export default GeoJSONLayer;

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

@@ -1,5 +1,4 @@
 import { check } from '@vcsuite/check';
-import { getLogger } from '@vcsuite/logger';
 import {
   globalHidden,
   hideFeature,
@@ -7,7 +6,7 @@ import {
   showFeature,
   FeatureVisibilityAction,
 } from './featureVisibility.js';
-import VcsEvent from '../event/vcsEvent.js';
+import VcsEvent from '../vcsEvent.js';
 
 /**
  * @type {GlobalHider}
@@ -145,13 +144,4 @@ export function getGlobalHider() {
   return instance;
 }
 
-/**
- * @returns {GlobalHider}
- * @deprecated v4.1
- */
-export function getInstance() {
-  getLogger('vcs.vcm.layer.GlobalHider').deprecate('getInstance', 'use getGlobalHider instead');
-  return getGlobalHider();
-}
-
 export default GlobalHider;

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

@@ -1,11 +1,11 @@
 import { check } from '@vcsuite/check';
 import { parseBoolean, parseInteger } from '@vcsuite/parsers';
-import VcsObject from '../object.js';
+import VcsObject from '../vcsObject.js';
 import Extent from '../util/extent.js';
 import { getGlobalHider } from './globalHider.js';
 import { vcsLayerName } from './layerSymbols.js';
 import LayerState from './layerState.js';
-import VcsEvent from '../event/vcsEvent.js';
+import VcsEvent from '../vcsEvent.js';
 import { getCurrentLocale, getLocaleChangedEvent } from '../util/locale.js';
 import { VcsClassRegistry } from '../classRegistry.js';
 
@@ -106,7 +106,7 @@ export const vcsMetaVersion = '2.0';
  */
 class Layer extends VcsObject {
   /** @type {string} */
-  static get className() { return 'vcs.vcm.layer.Layer'; }
+  static get className() { return 'Layer'; }
 
   /**
    * Symbol to declare a layers name on its visualizations, e.g. ol.layer.Layer, Cesium.Cesium3DTileset

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

@@ -1,4 +1,4 @@
-import VcsObject from '../object.js';
+import VcsObject from '../vcsObject.js';
 import LayerState from './layerState.js';
 
 /**
@@ -11,7 +11,7 @@ import LayerState from './layerState.js';
  * @template {import("@vcmap/core").VcsMap} T
  */
 class LayerImplementation extends VcsObject {
-  static get className() { return 'vcs.vcm.layer.LayerImplementation'; }
+  static get className() { return 'LayerImplementation'; }
 
   /**
    * @param {T} map

package/src/{vcs/vcm/layer/oblique/layerOblique.js → layer/oblique/layerObliqueImpl.js}

@@ -3,12 +3,12 @@ import { vcsLayerName } from '../layerSymbols.js';
 
 /**
  * @class
- * @extends {LayerImplementation<import("@vcmap/core").Oblique>}}
+ * @extends {LayerImplementation<import("@vcmap/core").ObliqueMap>}}
  * @abstract
  */
-class LayerOblique extends LayerImplementation {
+class LayerObliqueImpl extends LayerImplementation {
   /**
-   * @param {import("@vcmap/core").Oblique} map
+   * @param {import("@vcmap/core").ObliqueMap} map
    * @param {LayerImplementationOptions} options
    */
   constructor(map, options) {
@@ -73,4 +73,4 @@ class LayerOblique extends LayerImplementation {
   }
 }
 
-export default LayerOblique;
+export default LayerObliqueImpl;

package/src/{vcs/vcm/layer/oblique/vectorOblique.js → layer/oblique/vectorObliqueImpl.js}

@@ -13,21 +13,21 @@ import {
   obliqueGeometry,
   originalFeatureSymbol,
 } from '../vectorSymbols.js';
-import LayerOblique from './layerOblique.js';
+import LayerObliqueImpl from './layerObliqueImpl.js';
 import { synchronizeFeatureVisibilityWithSource } from '../vectorHelpers.js';
 
 /**
  * represents a specific vector layer for oblique.
  * @class
  * @export
- * @extends {LayerOblique}
+ * @extends {LayerObliqueImpl}
  * @implements {FeatureLayerImplementation}
  */
-class VectorOblique extends LayerOblique {
-  static get className() { return 'vcs.vcm.layer.oblique.VectorOblique'; }
+class VectorObliqueImpl extends LayerObliqueImpl {
+  static get className() { return 'VectorObliqueImpl'; }
 
   /**
-   * @param {import("@vcmap/core").Oblique} map
+   * @param {import("@vcmap/core").ObliqueMap} map
    * @param {VectorImplementationOptions} options
    */
   constructor(map, options) {
@@ -466,4 +466,4 @@ class VectorOblique extends LayerOblique {
   }
 }
 
-export default VectorOblique;
+export default VectorObliqueImpl;

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

@@ -2,11 +2,11 @@ import { ImagerySplitDirection } 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 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 { VcsClassRegistry } from '../classRegistry.js';
 
 /**
@@ -18,15 +18,15 @@ 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,7 +45,7 @@ class OpenStreetMap extends Layer {
    */
   constructor(options) {
     super(options);
-    const defaultOptions = OpenStreetMap.getDefaultOptions();
+    const defaultOptions = OpenStreetMapLayer.getDefaultOptions();
     /**
      * @type {import("@vcmap/cesium").ImagerySplitDirection}
      * @private
@@ -60,7 +60,7 @@ class OpenStreetMap extends Layer {
 
     this._supportedMaps = [
       CesiumMap.className,
-      Openlayers.className,
+      OpenlayersMap.className,
     ];
 
     /**
@@ -97,7 +97,7 @@ class OpenStreetMap extends Layer {
     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 +119,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 +143,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,7 +162,7 @@ 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 ?
@@ -190,5 +190,5 @@ class OpenStreetMap extends Layer {
   }
 }
 
-VcsClassRegistry.registerClass(OpenStreetMap.className, OpenStreetMap);
-export default OpenStreetMap;
+VcsClassRegistry.registerClass(OpenStreetMapLayer.className, OpenStreetMapLayer);
+export default OpenStreetMapLayer;

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

@@ -5,13 +5,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 +76,4 @@ class LayerOpenlayers extends LayerImplementation {
   }
 }
 
-export default LayerOpenlayers;
+export default LayerOpenlayersImpl;

package/src/layer/openlayers/openStreetMapOpenlayersImpl.js

@@ -0,0 +1,27 @@
+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
+ * @export
+ * @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,19 +1,19 @@
 import { ImagerySplitDirection } 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) {
@@ -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,7 +93,8 @@ 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();
@@ -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,6 +1,6 @@
 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';
 
@@ -8,13 +8,13 @@ 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 +46,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,16 @@
 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 +36,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,21 @@
 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 +59,4 @@ class TMSOpenlayers extends RasterLayerOpenlayers {
   }
 }
 
-export default TMSOpenlayers;
+export default TmsOpenlayersImpl;

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

@@ -1,5 +1,5 @@
 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';
 
@@ -8,13 +8,13 @@ import { getGlobalHider } from '../globalHider.js';
  * @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) {
@@ -115,4 +115,4 @@ class VectorOpenlayers extends LayerOpenlayers {
   }
 }
 
-export default VectorOpenlayers;
+export default VectorOpenlayersImpl;

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

@@ -1,7 +1,7 @@
 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';
 
 /**
@@ -9,13 +9,13 @@ import { mercatorProjection } from '../../util/projection.js';
  * @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 +174,4 @@ class VectorTileOpenlayers extends LayerOpenlayers {
   }
 }
 
-export default VectorTileOpenlayers;
+export default VectorTileOpenlayersImpl;