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

package/index.d.ts

@@ -4731,7 +4731,7 @@ export interface CameraLimiterOptions {
 /**
  * Enumeration of camera limiter modes.
  */
-export const enum Mode {
+export const enum CameraLimiterMode {
     HEIGHT,
     DISTANCE
 }
@@ -4745,7 +4745,7 @@ export class CameraLimiter {
     /**
      * The mode to use. When using DISTANCE mode, be sure to have a terrainProvider set.
      */
-    mode: Mode;
+    mode: CameraLimiterMode;
     /**
      * The minimum height/distance to the terrain the camera must maintain
      */
@@ -6179,11 +6179,16 @@ export class ExclusiveManager {
 
 /**
  */
-export interface ExtentOptions extends ProjectionOptions {
+export interface ExtentOptions {
+    type?: string;
     /**
      * if not specified, the extent of the projection is used
     */
     coordinates?: import("ol/extent").Extent | undefined;
+    /**
+     * if not specified the default projection is assumed
+    */
+    projection?: ProjectionOptions;
 }
 
 /**

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vcmap/core",
-  "version": "5.0.0-rc.3",
+  "version": "5.0.0-rc.4",
   "description": "",
   "main": "index.js",
   "type": "module",

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.toJSON(),
+        projection: mercatorProjection.toJSON(),
         coordinates: threeDimExtent,
       });
 

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

@@ -497,7 +497,7 @@ class FeatureStore extends Vector {
     }
 
     const actualExtent = new Extent({
-      ...mercatorProjection.toJSON(),
+      projection: mercatorProjection.toJSON(),
       coordinates: mercatorExtent,
     });
 

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],
       });
     }

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

@@ -538,7 +538,7 @@ class Vector extends FeatureLayer {
       return metaExtent;
     }
     const extent = new Extent({
-      ...mercatorProjection.toJSON(),
+      projection: mercatorProjection.toJSON(),
       coordinates: this.source.getExtent(),
     });
     if (extent.isValid()) {

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;

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);
+      }),
+    ];
   }
 
   /**

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

@@ -295,12 +295,12 @@ class Oblique extends BaseOLMap {
       const coords = boundingExtent(image.groundCoordinates);
       return new Extent({
         coordinates: transformExtent(coords, image.meta.projection.proj, mercatorProjection.proj),
-        epsg: 'EPSG:3857',
+        projection: mercatorProjection.toJSON(),
       });
     }
     return new Extent({
       coordinates: [-18924313.4349, -15538711.0963, 18924313.4349, 15538711.0963],
-      epsg: 'EPSG:3857',
+      projection: mercatorProjection.toJSON(),
     });
   }
 

package/src/vcs/vcm/object.js

@@ -15,7 +15,7 @@ import { getLogger } from '@vcsuite/logger';
  * @api stable
  */
 class VcsObject {
-  static get className() { return 'vcs.vcm.Framework'; }
+  static get className() { return 'vcs.vcm.VcsObject'; }
 
   /**
    * @param {VcsObjectOptions} options

package/src/vcs/vcm/util/extent.js

@@ -1,8 +1,10 @@
 import Projection from './projection.js';
 
 /**
- * @typedef {ProjectionOptions} ExtentOptions
- * @property {import("ol/extent").Extent|undefined} coordinates - if not specified, the extent of the projection is used
+ * @typedef {Object} ExtentOptions
+ * @property {string} [type]
+ * @property {import("ol/extent").Extent|undefined} [coordinates] - if not specified, the extent of the projection is used
+ * @property {ProjectionOptions} [projection] - if not specified the default projection is assumed
  * @api
  */
 
@@ -45,12 +47,7 @@ class Extent {
    */
   constructor(options = {}) {
     /** @type {Projection} */
-    this.projection = new Projection({
-      epsg: options.epsg,
-      proj4: options.proj4,
-      alias: options.alias,
-      prefix: options.prefix,
-    });
+    this.projection = new Projection(options.projection);
 
     /** @type {import("ol/extent").Extent|null} */
     this.extent = options.coordinates || this.projection.proj.getExtent();
@@ -87,7 +84,7 @@ class Extent {
   toJSON() {
     return {
       coordinates: this.extent.slice(),
-      ...this.projection.toJSON(),
+      projection: this.projection.toJSON(),
       type: Extent.className,
     };
   }
@@ -122,7 +119,7 @@ class Extent {
    * @api
    */
   static validateOptions(options) {
-    return Projection.validateOptions(options) && checkExtentValidity(options.coordinates);
+    return Projection.validateOptions(options.projection || {}) && checkExtentValidity(options.coordinates);
   }
 
   /**