@vcmap/core 5.0.0-rc.0 → 5.0.0-rc.4

package/index.js

@@ -84,7 +84,7 @@ export { default as WMS } from './src/vcs/vcm/layer/wms.js';
 export { getWMSSource } from './src/vcs/vcm/layer/wmsHelpers.js';
 export { default as WMTS } from './src/vcs/vcm/layer/wmts.js';
 export { default as BaseOLMap } from './src/vcs/vcm/maps/baseOLMap.js';
-export { Mode, default as CameraLimiter } from './src/vcs/vcm/maps/cameraLimiter.js';
+export { CameraLimiterMode, default as CameraLimiter } from './src/vcs/vcm/maps/cameraLimiter.js';
 export { default as CesiumMap } from './src/vcs/vcm/maps/cesium.js';
 export { default as VcsMap } from './src/vcs/vcm/maps/map.js';
 export { default as MapState } from './src/vcs/vcm/maps/mapState.js';
@@ -98,7 +98,7 @@ export { default as ObliqueImageMeta } from './src/vcs/vcm/oblique/ObliqueImageM
 export { default as ObliqueProvider } from './src/vcs/vcm/oblique/ObliqueProvider.js';
 export { default as ObliqueView } from './src/vcs/vcm/oblique/ObliqueView.js';
 export { ObliqueViewDirection, obliqueViewDirectionNames, getDirectionName } from './src/vcs/vcm/oblique/ObliqueViewDirection.js';
-export { sortRealWordEdgeCoordinates, checkLineIntersection, transformCWIFC, transformToImage, transformFromImage, hasSameOrigin, destroyCesiumEvent } from './src/vcs/vcm/oblique/helpers.js';
+export { sortRealWordEdgeCoordinates, checkLineIntersection, transformCWIFC, transformToImage, transformFromImage, hasSameOrigin } from './src/vcs/vcm/oblique/helpers.js';
 export { getVersionFromImageJson, parseImageMeta, parseImageData, parseLegacyImageData } from './src/vcs/vcm/oblique/parseImageJson.js';
 export { default as ClippingObject } from './src/vcs/vcm/util/clipping/clippingObject.js';
 export { default as ClippingObjectManager } from './src/vcs/vcm/util/clipping/clippingObjectManager.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vcmap/core",
-  "version": "5.0.0-rc.0",
+  "version": "5.0.0-rc.4",
   "description": "",
   "main": "index.js",
   "type": "module",
@@ -28,7 +28,8 @@
     "src/",
     "LICENSE.md",
     "README.md",
-    "index.js"
+    "index.js",
+    "index.d.ts"
   ],
   "author": "Virtual City Systems",
   "license": "MIT",

package/src/vcs/vcm/interaction/coordinateAtPixel.js

@@ -85,7 +85,7 @@ class CoordinateAtPixel extends AbstractInteraction {
       if (Number.isFinite(pixel[0]) && Number.isFinite(pixel[1])) {
         return transformFromImage(image, pixel, {
           dontUseTerrain: !!move,
-          dataProjection: mercatorProjection.proj,
+          dataProjection: mercatorProjection,
         }).then((coordinates) => {
           event.obliqueParameters = { pixel };
           event.position = coordinates.coords;

package/src/vcs/vcm/layer/cesiumTileset.js

@@ -266,7 +266,7 @@ class CesiumTileset extends FeatureLayer {
       const threeDimExtent = getExtentFromTileset(impl.cesium3DTileset);
 
       const actualExtent = new Extent({
-        ...mercatorProjection.getConfigObject(),
+        projection: mercatorProjection.toJSON(),
         coordinates: threeDimExtent,
       });
 
@@ -309,9 +309,9 @@ class CesiumTileset extends FeatureLayer {
   /**
    * @returns {CesiumTilesetOptions}
    */
-  getConfigObject() {
+  toJSON() {
     /** @type {CesiumTilesetOptions} */
-    const config = super.getConfigObject();
+    const config = super.toJSON();
     const defaultOptions = CesiumTileset.getDefaultOptions();
     if (this.highlightStyle) {
       config.highlightStyle = this.highlightStyle[referenceableStyleSymbol] ?

package/src/vcs/vcm/layer/czml.js

@@ -102,8 +102,8 @@ class Czml extends DataSource {
    * @inheritDoc
    * @returns {CzmlOptions}
    */
-  getConfigObject() {
-    const config = /** @type {CzmlOptions} */ (super.getConfigObject());
+  toJSON() {
+    const config = /** @type {CzmlOptions} */ (super.toJSON());
     if (this.sourceUri) {
       config.sourceUri = this.sourceUri;
     }

package/src/vcs/vcm/layer/dataSource.js

@@ -235,8 +235,8 @@ class DataSource extends Layer {
    * @inheritDoc
    * @returns {DataSourceOptions}
    */
-  getConfigObject() {
-    const config = /** @type {DataSourceOptions} */ (super.getConfigObject());
+  toJSON() {
+    const config = /** @type {DataSourceOptions} */ (super.toJSON());
     if (Object.keys(this._genericFeatureProperties).length > 0) {
       config.genericFeatureProperties = { ...this._genericFeatureProperties };
     }

package/src/vcs/vcm/layer/featureLayer.js

@@ -229,8 +229,8 @@ class FeatureLayer extends Layer {
   /**
    * @returns {FeatureLayerOptions}
    */
-  getConfigObject() {
-    const config = /** @type {FeatureLayerOptions} */ (super.getConfigObject());
+  toJSON() {
+    const config = /** @type {FeatureLayerOptions} */ (super.toJSON());
     if (!this.getStyleOrDefaultStyle().equals(this._style)) {
       if (this._style[referenceableStyleSymbol]) {
         config.style = this.style.getReference();

package/src/vcs/vcm/layer/featureStore.js

@@ -93,7 +93,7 @@ class FeatureStore extends Vector {
       featureType: 'simple',
       features: [],
       ...Vector.getDefaultOptions(),
-      projection: mercatorProjection.getConfigObject(),
+      projection: mercatorProjection.toJSON(),
       staticRepresentation: {},
       hiddenStaticFeatureIds: [],
       vcsMeta: {
@@ -497,7 +497,7 @@ class FeatureStore extends Vector {
     }
 
     const actualExtent = new Extent({
-      ...mercatorProjection.getConfigObject(),
+      projection: mercatorProjection.toJSON(),
       coordinates: mercatorExtent,
     });
 
@@ -596,8 +596,8 @@ class FeatureStore extends Vector {
    * @inheritDoc
    * @returns {FeatureStoreOptions}
    */
-  getConfigObject() {
-    const config = /** @type {FeatureStoreOptions} */ (super.getConfigObject());
+  toJSON() {
+    const config = /** @type {FeatureStoreOptions} */ (super.toJSON());
     const defaultOptions = FeatureStore.getDefaultOptions();
 
     delete config.projection;

package/src/vcs/vcm/layer/geojson.js

@@ -33,7 +33,7 @@ class GeoJSON extends Vector {
   static getDefaultOptions() {
     return {
       ...Vector.getDefaultOptions(),
-      projection: wgs84Projection.getConfigObject(),
+      projection: wgs84Projection.toJSON(),
       features: undefined,
     };
   }
@@ -149,13 +149,13 @@ class GeoJSON extends Vector {
    * @inheritDoc
    * @returns {GeoJSONOptions}
    */
-  getConfigObject() {
-    const config = /** @type {GeoJSONOptions} */ (super.getConfigObject());
+  toJSON() {
+    const config = /** @type {GeoJSONOptions} */ (super.toJSON());
     const defaultOptions = GeoJSON.getDefaultOptions();
 
     const defaultProjection = new Projection(defaultOptions.projection);
     if (!this.projection.equals(defaultProjection)) {
-      config.projection = this.projection.getConfigObject();
+      config.projection = this.projection.toJSON();
     } else {
       delete config.projection;
     }

package/src/vcs/vcm/layer/layer.js

@@ -680,9 +680,9 @@ class Layer extends VcsObject {
   /**
    * @returns {LayerOptions}
    */
-  getConfigObject() {
+  toJSON() {
     /** @type {LayerOptions} */
-    const config = super.getConfigObject();
+    const config = super.toJSON();
     const defaultOptions = Layer.getDefaultOptions();
 
     if (this.activeOnStartup !== defaultOptions.activeOnStartup) {
@@ -706,7 +706,7 @@ class Layer extends VcsObject {
     }
 
     if (this.extent && this.extent.isValid()) {
-      config.extent = this.extent.getConfigObject();
+      config.extent = this.extent.toJSON();
     }
 
     if (this._exclusiveGroups.length > 0) {

package/src/vcs/vcm/layer/oblique/obliqueHelpers.js

@@ -91,7 +91,7 @@ export async function mercatorGeometryToImageGeometry(inputSourceGeometry, desti
   const coordinates = sourceGeometry.getCoordinates();
   /** type {Array.<import("ol/coordinate").Coordinate>} */
   const flattenCoordinates = getFlatCoordinatesFromGeometry(sourceGeometry, coordinates);
-  let transformer = getTransform(mercatorProjection.proj, image.meta.projection);
+  let transformer = getTransform(mercatorProjection.proj, image.meta.projection.proj);
 
   let updatedPositions = [];
   if (image.meta.terrainProvider) {
@@ -99,7 +99,7 @@ export async function mercatorGeometryToImageGeometry(inputSourceGeometry, desti
       Projection.mercatorToWgs84(coord, true);
       return Cartographic.fromDegrees(coord[0], coord[1]);
     });
-    transformer = getTransform(wgs84Projection.proj, image.meta.projection);
+    transformer = getTransform(wgs84Projection.proj, image.meta.projection.proj);
     updatedPositions = await sampleTerrainMostDetailed(image.meta.terrainProvider, cartographicCoordinates);
   }
 

package/src/vcs/vcm/layer/openStreetMap.js

@@ -160,8 +160,8 @@ class OpenStreetMap extends Layer {
    * @inheritDoc
    * @returns {OpenStreetMapOptions}
    */
-  getConfigObject() {
-    const config = /** @type {OpenStreetMapOptions} */ (super.getConfigObject());
+  toJSON() {
+    const config = /** @type {OpenStreetMapOptions} */ (super.toJSON());
     const defaultOptions = OpenStreetMap.getDefaultOptions();
 
     if (this._splitDirection !== ImagerySplitDirection.NONE) {

package/src/vcs/vcm/layer/pointCloud.js

@@ -146,8 +146,8 @@ class PointCloud extends CesiumTileset {
    * @inheritDoc
    * @returns {PointCloudOptions}
    */
-  getConfigObject() {
-    const config = /** @type {PointCloudOptions} */ (super.getConfigObject());
+  toJSON() {
+    const config = /** @type {PointCloudOptions} */ (super.toJSON());
     const defaultOptions = PointCloud.getDefaultOptions();
 
     if (this.defaultPointSize !== defaultOptions.pointSize) {

package/src/vcs/vcm/layer/rasterLayer.js

@@ -248,8 +248,8 @@ class RasterLayer extends Layer {
    * @inheritDoc
    * @returns {RasterLayerOptions}
    */
-  getConfigObject() {
-    const config = /** @type {RasterLayerOptions} */ (super.getConfigObject());
+  toJSON() {
+    const config = /** @type {RasterLayerOptions} */ (super.toJSON());
     const defaultOptions = RasterLayer.getDefaultOptions();
 
     if (this.extent.equals(new Extent())) {

package/src/vcs/vcm/layer/singleImage.js

@@ -6,6 +6,7 @@ import CesiumMap from '../maps/cesium.js';
 import Openlayers from '../maps/openlayers.js';
 import Extent from '../util/extent.js';
 import { VcsClassRegistry } from '../classRegistry.js';
+import { wgs84Projection } from '../util/projection.js';
 
 /**
  * @typedef {RasterLayerOptions} SingleImageOptions
@@ -50,7 +51,7 @@ class SingleImage extends RasterLayer {
     if (!this.extent.isValid()) {
       this.getLogger().warning(`layer ${this.name} was constructed with an invalid extent, defaulting to global extent`);
       this.extent = new Extent({
-        epsg: 'EPSG:4326',
+        projection: wgs84Projection.toJSON(),
         coordinates: [-180, -90, 180, 90],
       });
     }
@@ -103,8 +104,8 @@ class SingleImage extends RasterLayer {
    * @inheritDoc
    * @returns {SingleImageOptions}
    */
-  getConfigObject() {
-    const config = /** @type {SingleImageOptions} */ (super.getConfigObject());
+  toJSON() {
+    const config = /** @type {SingleImageOptions} */ (super.toJSON());
     delete config.tilingSchema;
 
     if (this.credit) {

package/src/vcs/vcm/layer/terrain.js

@@ -104,8 +104,8 @@ class Terrain extends Layer {
   /**
    * @returns {TerrainOptions}
    */
-  getConfigObject() {
-    const config = /** @type {TerrainOptions} */ (super.getConfigObject());
+  toJSON() {
+    const config = /** @type {TerrainOptions} */ (super.toJSON());
     const defaultOptions = Terrain.getDefaultOptions();
 
     if (this.requestVertexNormals !== defaultOptions.requestVertexNormals) {

package/src/vcs/vcm/layer/terrainHelpers.js

@@ -1,6 +1,6 @@
 import { CesiumTerrainProvider, Cartographic, Cartesian2, sampleTerrainMostDetailed, sampleTerrain } from '@vcmap/cesium';
 import { getTransform } from 'ol/proj.js';
-import Projection, { wgs84Projection } from '../util/projection.js';
+import { wgs84Projection } from '../util/projection.js';
 
 /**
  * @typedef {Object} TerrainProviderOptions
@@ -69,18 +69,14 @@ export function sampleCesiumTerrain(terrainProvider, level, positions) {
  * changes input coordinate Array in place, new height can also be accessed by coordinates[x][2]
  * @param {import("@vcmap/cesium").CesiumTerrainProvider} terrainProvider
  * @param {Array<import("ol/coordinate").Coordinate>} coordinates
- * @param {(import("@vcmap/core").Projection|import("ol/proj/Projection").default)=} optSourceProjection - if input is not WGS84
+ * @param {import("@vcmap/core").Projection=} optSourceProjection - if input is not WGS84
  * @param {Array<import("ol/coordinate").Coordinate>=} result
  * @returns {Promise<Array<import("ol/coordinate").Coordinate>>}
  */
 export function getHeightFromTerrainProvider(terrainProvider, coordinates, optSourceProjection, result) {
-  const usedProj = optSourceProjection instanceof Projection ?
-    optSourceProjection.proj :
-    optSourceProjection;
-
-  const sourceTransformer = usedProj ?
+  const sourceTransformer = optSourceProjection ?
     getTransform(
-      usedProj,
+      optSourceProjection.proj,
       wgs84Projection.proj,
     ) :
     null;

package/src/vcs/vcm/layer/tileProvider/tileProvider.js

@@ -530,8 +530,8 @@ class TileProvider extends VcsObject {
    * @returns {TileProviderOptions}
    * @api
    */
-  getConfigObject() {
-    const config = /** @type {TileProviderOptions} */ (super.getConfigObject());
+  toJSON() {
+    const config = /** @type {TileProviderOptions} */ (super.toJSON());
     const defaultOptions = TileProvider.getDefaultOptions();
 
     if (defaultOptions.tileCacheSize !== this.tileCacheSize) {

package/src/vcs/vcm/layer/tms.js

@@ -92,8 +92,8 @@ class TMS extends RasterLayer {
    * @inheritDoc
    * @returns {TMSOptions}
    */
-  getConfigObject() {
-    const config = /** @type {TMSOptions} */ (super.getConfigObject());
+  toJSON() {
+    const config = /** @type {TMSOptions} */ (super.toJSON());
     const defaultOptions = TMS.getDefaultOptions();
 
     if (this.tilingSchema !== defaultOptions.tilingSchema) {

package/src/vcs/vcm/layer/vector.js

@@ -538,7 +538,7 @@ class Vector extends FeatureLayer {
       return metaExtent;
     }
     const extent = new Extent({
-      ...mercatorProjection.getConfigObject(),
+      projection: mercatorProjection.toJSON(),
       coordinates: this.source.getExtent(),
     });
     if (extent.isValid()) {
@@ -573,12 +573,12 @@ class Vector extends FeatureLayer {
   /**
    * @returns {VectorOptions}
    */
-  getConfigObject() {
-    const config = /** @type {VectorOptions} */ (super.getConfigObject());
+  toJSON() {
+    const config = /** @type {VectorOptions} */ (super.toJSON());
     const defaultOptions = Vector.getDefaultOptions();
 
     if (this.projection.epsg !== getDefaultProjection().epsg) {
-      config.projection = this.projection.getConfigObject();
+      config.projection = this.projection.toJSON();
     }
 
     if (this.maxResolution !== defaultOptions.maxResolution) {

package/src/vcs/vcm/layer/vectorTile.js

@@ -448,8 +448,8 @@ class VectorTile extends FeatureLayer {
    * @inheritDoc
    * @returns {VectorTileOptions}
    */
-  getConfigObject() {
-    const config = /** @type {VectorTileOptions} */ (super.getConfigObject());
+  toJSON() {
+    const config = /** @type {VectorTileOptions} */ (super.toJSON());
     const defaultOptions = VectorTile.getDefaultOptions();
 
     if (this._maxLevel !== defaultOptions.maxLevel) {
@@ -466,7 +466,7 @@ class VectorTile extends FeatureLayer {
     }
 
     if (this.tileProvider) {
-      const tileProviderConfig = this.tileProvider.getConfigObject();
+      const tileProviderConfig = this.tileProvider.toJSON();
       config.tileProvider = tileProviderConfig;
     } else if (this._tileProviderOptions) {
       config.tileProvider = this._tileProviderOptions;

package/src/vcs/vcm/layer/wfs.js

@@ -40,7 +40,7 @@ class WFS extends Vector {
    * @param {WFSOptions} options
    */
   constructor(options) {
-    const proj = new Projection(options.projection).getConfigObject();
+    const proj = new Projection(options.projection).toJSON();
     proj.alias = [`http://www.opengis.net/gml/srs/epsg.xml#${/** @type {string} */ (proj.epsg).match(/\d+/)[0]}`];
     options.projection = proj;
     super(options);
@@ -148,8 +148,8 @@ class WFS extends Vector {
    * @inheritDoc
    * @returns {WFSOptions}
    */
-  getConfigObject() {
-    const config = /** @type {WFSOptions} */ (super.getConfigObject());
+  toJSON() {
+    const config = /** @type {WFSOptions} */ (super.toJSON());
 
     config.featureType = this.featureType.slice();
     config.featureNS = this.featureNS;

package/src/vcs/vcm/layer/wms.js

@@ -192,8 +192,8 @@ class WMS extends RasterLayer {
   /**
    * @returns {WMSOptions}
    */
-  getConfigObject() {
-    const config = /** @type {WMSOptions} */ (super.getConfigObject());
+  toJSON() {
+    const config = /** @type {WMSOptions} */ (super.toJSON());
     const defaultOptions = WMS.getDefaultOptions();
 
     if (this.parameters.LAYERS) {
@@ -229,7 +229,7 @@ class WMS extends RasterLayer {
     }
 
     if (this.featureProvider && this.featureProvider instanceof WMSFeatureProvider) {
-      const featureInfoConfig = this.featureProvider.getConfigObject();
+      const featureInfoConfig = this.featureProvider.toJSON();
       if (this.tileSize[0] === featureInfoConfig.tileSize[0] || this.tileSize[1] === featureInfoConfig.tileSize[1]) {
         delete featureInfoConfig.tileSize;
       }

package/src/vcs/vcm/layer/wmts.js

@@ -176,8 +176,8 @@ class WMTS extends RasterLayer {
    * @inheritDoc
    * @returns {WMTSOptions}
    */
-  getConfigObject() {
-    const config = /** @type {WMTSOptions} */ (super.getConfigObject());
+  toJSON() {
+    const config = /** @type {WMTSOptions} */ (super.toJSON());
     const defaultOptions = WMTS.getDefaultOptions();
 
     if (this.tilingSchema !== defaultOptions.tilingSchema) {

package/src/vcs/vcm/maps/cameraLimiter.js

@@ -23,7 +23,7 @@ import {
  * @property {string} HEIGHT
  * @property {string} DISTANCE
  */
-export const Mode = {
+export const CameraLimiterMode = {
   HEIGHT: 'height',
   DISTANCE: 'distance',
 };
@@ -42,7 +42,7 @@ class CameraLimiter {
    */
   static getDefaultOptions() {
     return {
-      mode: Mode.HEIGHT,
+      mode: CameraLimiterMode.HEIGHT,
       terrainUrl: undefined,
       limit: 200,
       level: 12,
@@ -56,10 +56,10 @@ class CameraLimiter {
     const defaultOptions = CameraLimiter.getDefaultOptions();
     /**
      * The mode to use. When using DISTANCE mode, be sure to have a terrainProvider set.
-     * @type {Mode}
+     * @type {CameraLimiterMode}
      * @api
      */
-    this.mode = parseEnumValue(options.mode, Mode, defaultOptions.mode);
+    this.mode = parseEnumValue(options.mode, CameraLimiterMode, defaultOptions.mode);
     /**
      * @type {string|null}
      * @private
@@ -170,7 +170,7 @@ class CameraLimiter {
     let promise = Promise.resolve();
     const cameraCartographic = Cartographic.fromCartesian(camera.position);
     if (cameraCartographic) {
-      if (this.mode === Mode.DISTANCE && this._terrainProvider) {
+      if (this.mode === CameraLimiterMode.DISTANCE && this._terrainProvider) {
         promise = this._updateTerrainHeight(cameraCartographic);
         if (this._terrainHeight && (cameraCartographic.height - this._terrainHeight) < this.limit) {
           const newHeight = this._terrainHeight + this.limit;
@@ -194,7 +194,7 @@ class CameraLimiter {
   /**
    * @returns {CameraLimiterOptions}
    */
-  getConfigObject() {
+  toJSON() {
     const config = {};
     const defaultOptions = CameraLimiter.getDefaultOptions();
     if (this.terrainUrl) {

package/src/vcs/vcm/maps/cesium.js

@@ -1096,8 +1096,8 @@ class CesiumMap extends VcsMap {
    * @returns {CesiumMapOptions}
    * @api
    */
-  getConfigObject() {
-    const config = /** @type {CesiumMapOptions} */ (super.getConfigObject());
+  toJSON() {
+    const config = /** @type {CesiumMapOptions} */ (super.toJSON());
     const defaultOptions = CesiumMap.getDefaultOptions();
 
     if (this.enableLightning !== defaultOptions.enableLightning) {
@@ -1117,7 +1117,7 @@ class CesiumMap extends VcsMap {
     }
 
     if (this._cameraLimiter) {
-      config.cameraLimiter = this._cameraLimiter.getConfigObject();
+      config.cameraLimiter = this._cameraLimiter.toJSON();
     } else if (this._cameraLimiterOptions && !this.initialized) {
       config.cameraLimiter = this._cameraLimiterOptions;
     }

package/src/vcs/vcm/maps/map.js

@@ -101,17 +101,9 @@ class VcsMap extends VcsObject {
      * @type {Array<Function>}
      * @private
      */
-    this._collectionListeners = [
-      this.layerCollection.moved.addEventListener((layer) => {
-        this.indexChanged(layer);
-      }),
-      this.layerCollection.added.addEventListener((layer) => {
-        this._layerAdded(layer);
-      }),
-      this.layerCollection.removed.addEventListener((layer) => {
-        this._layerRemoved(layer);
-      }),
-    ];
+    this._collectionListeners = [];
+
+    this._setLayerCollectionListeners();
 
     /** @type {boolean} */
     this.initialized = false;
@@ -221,6 +213,29 @@ class VcsMap extends VcsObject {
         l.mapActivated(this);
       });
     }
+
+    this._setLayerCollectionListeners();
+  }
+
+  /**
+   * @private
+   */
+  _setLayerCollectionListeners() {
+    this._collectionListeners.forEach((cb) => {
+      cb();
+    });
+
+    this._collectionListeners = [
+      this.layerCollection.moved.addEventListener((layer) => {
+        this.indexChanged(layer);
+      }),
+      this.layerCollection.added.addEventListener((layer) => {
+        this._layerAdded(layer);
+      }),
+      this.layerCollection.removed.addEventListener((layer) => {
+        this._layerRemoved(layer);
+      }),
+    ];
   }
 
   /**
@@ -464,8 +479,8 @@ class VcsMap extends VcsObject {
    * @returns {VcsMapOptions}
    * @api
    */
-  getConfigObject() {
-    const config = /** @type {VcsMapOptions} */ (super.getConfigObject());
+  toJSON() {
+    const config = /** @type {VcsMapOptions} */ (super.toJSON());
     if (this.fallbackMap) {
       config.fallbackMap = this.fallbackMap;
     }

package/src/vcs/vcm/maps/oblique.js

@@ -1,5 +1,5 @@
 import { boundingExtent, containsXY } from 'ol/extent.js';
-import { get as getProjection, getTransform, transform, transformExtent } from 'ol/proj.js';
+import { getTransform, transform, transformExtent } from 'ol/proj.js';
 import { check } from '@vcsuite/check';
 import { parseBoolean, parseNumber } from '@vcsuite/parsers';
 import Extent from '../util/extent.js';
@@ -243,7 +243,7 @@ class Oblique extends BaseOLMap {
   get collection() { return this._obliqueProvider.collection; }
 
   /**
-   * @type {import("@vcmap/cesium").Event}
+   * @type {import("@vcmap/core").VcsEvent<import("@vcmap/core").ObliqueImage>}
    * @readonly
    * @api
    */
@@ -294,13 +294,13 @@ class Oblique extends BaseOLMap {
     if (image) {
       const coords = boundingExtent(image.groundCoordinates);
       return new Extent({
-        coordinates: transformExtent(coords, image.meta.projection, mercatorProjection.proj),
-        epsg: 'EPSG:3857',
+        coordinates: transformExtent(coords, image.meta.projection.proj, mercatorProjection.proj),
+        projection: mercatorProjection.toJSON(),
       });
     }
     return new Extent({
       coordinates: [-18924313.4349, -15538711.0963, 18924313.4349, 15538711.0963],
-      epsg: 'EPSG:3857',
+      projection: mercatorProjection.toJSON(),
     });
   }
 
@@ -399,7 +399,7 @@ class Oblique extends BaseOLMap {
       return null;
     }
 
-    const transformationOptions = { dataProjection: getProjection('EPSG:4326') };
+    const transformationOptions = { dataProjection: wgs84Projection };
     const { coords } = await transformFromImage(image, viewCenter, transformationOptions);
     return this._computeViewpointInternal(coords);
   }
@@ -421,7 +421,7 @@ class Oblique extends BaseOLMap {
 
     const gpInternalProjection = image.transformImage2RealWorld(gpImageCoordinates, image.averageHeight);
 
-    const transfrom = getTransform(image.meta.projection, wgs84Projection.proj);
+    const transfrom = getTransform(image.meta.projection.proj, wgs84Projection.proj);
     const gpWGS84 = transfrom(gpInternalProjection.slice(0, 2));
     return this._computeViewpointInternal(gpWGS84);
   }
@@ -489,7 +489,7 @@ class Oblique extends BaseOLMap {
     const bl = image.transformImage2RealWorld([extent[0], extent[1]]);
     const ur = image.transformImage2RealWorld([extent[2], extent[3]]);
     const bbox = [bl[0], bl[1], ur[0], ur[1]];
-    const transformedBbox = transformExtent(bbox, image.meta.projection, wgs84Projection.proj);
+    const transformedBbox = transformExtent(bbox, image.meta.projection.proj, wgs84Projection.proj);
     return containsXY(transformedBbox, coords[0], coords[1]);
   }
 
@@ -497,8 +497,8 @@ class Oblique extends BaseOLMap {
    * @returns {ObliqueOptions}
    * @api
    */
-  getConfigObject() {
-    const config = /** @type {ObliqueOptions} */ (super.getConfigObject());
+  toJSON() {
+    const config = /** @type {ObliqueOptions} */ (super.toJSON());
     const defaultOptions = Oblique.getDefaultOptions();
 
     if (this.mapChangeEvent === 'movened') {

package/src/vcs/vcm/maps/openlayers.js

@@ -189,8 +189,8 @@ class Openlayers extends BaseOLMap {
    * @returns {OpenlayersOptions}
    * @api
    */
-  getConfigObject() {
-    const config = /** @type {OpenlayersOptions} */ (super.getConfigObject());
+  toJSON() {
+    const config = /** @type {OpenlayersOptions} */ (super.toJSON());
 
     const defaultOptions = Openlayers.getDefaultOptions();
     if (this.fixedNorthOrientation !== defaultOptions.fixedNorthOrientation) {