@vcmap/core 5.0.0-rc.22 → 5.0.0-rc.23

package/index.d.ts

@@ -5002,6 +5002,10 @@ export class BaseOLMap extends VcsMap {
      * When setting the layer colleciton, the destroyLayerCollection flag is automatically set to false.
      */
     layerCollection: LayerCollection;
+    /**
+     * An event raised on the maps post render
+     */
+    readonly postRender: VcsEvent<VcsMapRenderEvent>;
     /**
      * unique Name
      */
@@ -5088,6 +5092,11 @@ export interface CesiumMapOptions extends VcsMapOptions {
     globeColor?: string | undefined;
 }
 
+export interface CesiumMapEvent {
+    scene: import("@vcmap/cesium").Scene;
+    time: import("@vcmap/cesium").JulianDate;
+}
+
 /**
  * Cesium Globe Map Class (3D map)
  */
@@ -5248,6 +5257,10 @@ export class CesiumMap extends VcsMap {
      * When setting the layer colleciton, the destroyLayerCollection flag is automatically set to false.
      */
     layerCollection: LayerCollection;
+    /**
+     * An event raised on the maps post render
+     */
+    readonly postRender: VcsEvent<VcsMapRenderEvent>;
     /**
      * unique Name
      */
@@ -5354,6 +5367,10 @@ export class ObliqueMap extends BaseOLMap {
      * When setting the layer colleciton, the destroyLayerCollection flag is automatically set to false.
      */
     layerCollection: LayerCollection;
+    /**
+     * An event raised on the maps post render
+     */
+    readonly postRender: VcsEvent<VcsMapRenderEvent>;
     /**
      * unique Name
      */
@@ -5426,6 +5443,10 @@ export class OpenlayersMap extends BaseOLMap {
      * When setting the layer colleciton, the destroyLayerCollection flag is automatically set to false.
      */
     layerCollection: LayerCollection;
+    /**
+     * An event raised on the maps post render
+     */
+    readonly postRender: VcsEvent<VcsMapRenderEvent>;
     /**
      * unique Name
      */
@@ -5460,6 +5481,11 @@ export interface ClickPosition {
     exactPosition?: boolean | undefined;
 }
 
+export interface VcsMapRenderEvent {
+    map: VcsMap;
+    originalEvent: import("ol").MapEvent | CesiumMapEvent;
+}
+
 /**
  * Map Base Class, each different map is derived from this abstract base class.
  */
@@ -5507,6 +5533,10 @@ export class VcsMap extends VcsObject {
      */
     readonly target: HTMLElement | null;
     layerCollection: any;
+    /**
+     * An event raised on the maps post render
+     */
+    readonly postRender: VcsEvent<VcsMapRenderEvent>;
     /**
      * Determines whether this map can show this viewpoint. Returns true in any other map then {@link Oblique}
      */
@@ -7562,6 +7592,10 @@ export class MapCollection extends Collection<VcsMap> {
      * Set split screen for these maps.
      */
     splitScreen: any;
+    /**
+     * Raised on the active maps post render event
+     */
+    readonly postRender: VcsEvent<VcsMapRenderEvent>;
     /**
      * Adds a map to the collection. This will set the collections target, {@link SplitScreen}
      * and the collections {@link LayerCollection} on the map.

package/package.json

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

package/src/featureProvider/wmsFeatureProvider.js

@@ -61,7 +61,7 @@ export function getFormat(responseType, options = {}) {
   if (responseType === 'application/vnd.ogc.gml') {
     return new GML2(options);
   }
-  if (responseType === 'application/vnd.ogc.gml/3.1.1') {
+  if (responseType === 'application/vnd.ogc.gml/3.1.1' || responseType === 'text/xml; subtype=gml/3.1.1') {
     return new GML3(options);
   }
   return null;

package/src/layer/wmsHelpers.js

@@ -60,6 +60,8 @@ export function getWMSSource(options) {
     } else {
       sourceOptions.projection = 'EPSG:4326';
     }
+  } else {
+    sourceOptions.projection = 'EPSG:3857';
   }
   return new TileWMS(sourceOptions);
 }

package/src/map/baseOLMap.js

@@ -128,7 +128,6 @@ class BaseOLMap extends VcsMap {
         }),
         target: this.mapElement,
       });
-
       // @ts-ignore
       const pointerDownListener = /** @type {import("ol/events").EventsKey} */ (this.olMap.on('pointerdown', (event) => {
         this._raisePointerInteraction(
@@ -143,11 +142,18 @@ class BaseOLMap extends VcsMap {
           PointerEventType.UP,
         );
       }));
-      // @ts-ignore
-      const pointerMoveListener = /** @type {import("ol/events").EventsKey} */ (this.olMap.on('pointermove', (event) => {
-        this._raisePointerInteraction(event, PointerEventType.MOVE);
-      }));
-      this._olListeners.push(pointerDownListener, pointerUpListener, pointerMoveListener);
+
+      const pointerMoveListener = /** @type {import("ol/events").EventsKey} */ (this.olMap
+        .on('pointermove', (event) => {
+          this._raisePointerInteraction(event, PointerEventType.MOVE);
+        }));
+
+      const postRenderListener = /** @type {import("ol/events").EventsKey} */ (this.olMap
+        .on('postrender', (originalEvent) => {
+          this.postRender.raiseEvent({ map: this, originalEvent });
+        }));
+
+      this._olListeners.push(pointerDownListener, pointerUpListener, pointerMoveListener, postRenderListener);
     }
   }
 

package/src/map/cesiumMap.js

@@ -50,6 +50,12 @@ import { mapClassRegistry } from '../classRegistry.js';
  * @api
  */
 
+/**
+ * @typedef {Object} CesiumMapEvent
+ * @property {import("@vcmap/cesium").Scene} scene
+ * @property {import("@vcmap/cesium").JulianDate} time
+ */
+
 /**
  * Ensures, a primitive/imageryLayer/entity is part of a collection and placed at the correct location
  * @param {import("@vcmap/cesium").PrimitiveCollection|import("@vcmap/cesium").ImageryLayerCollection} cesiumCollection
@@ -315,21 +321,11 @@ class CesiumMap extends VcsMap {
      * @private
      */
     this._cameraLimiterOptions = options.cameraLimiter || defaultOptions.cameraLimiter;
-    /**
-     * @type {Function}
-     * @private
-     */
-    this._terrainProviderChangedListener = null;
     /**
      * @type {Function}
      * @private
      */
     this._preUpdateListener = null;
-    /**
-     * @type {Function}
-     * @private
-     */
-    this._clockTickListener = null;
     /**
      * @type {Function}
      * @private
@@ -337,10 +333,10 @@ class CesiumMap extends VcsMap {
     this._clockSyncListener = null;
 
     /**
-     * @type {Function}
+     * @type {Array<function():void>}
      * @private
      */
-    this._removeClusterClockTickListener = null;
+    this._listeners = [];
 
     /**
      * @type {boolean}
@@ -513,11 +509,11 @@ class CesiumMap extends VcsMap {
 
       const { clock } = this._cesiumWidget;
       clock.shouldAnimate = true;
-      this._clockTickListener = clock.onTick.addEventListener(() => {
+      this._listeners.push(clock.onTick.addEventListener(() => {
         this.dataSourceDisplayClock.tick();
         const time = this.dataSourceDisplayClock.currentTime;
         this.dataSourceDisplay.update(time);
-      });
+      }));
 
       // deactivate cesium Requestthrottling let the browser manage that
       // RequestScheduler.throttleRequests = false;
@@ -556,8 +552,12 @@ class CesiumMap extends VcsMap {
 
       this.defaultTerrainProvider = this._cesiumWidget.scene.terrainProvider;
       this._terrainProvider = this.defaultTerrainProvider;
-      this._terrainProviderChangedListener =
-        this._cesiumWidget.scene.terrainProviderChanged.addEventListener(this._terrainProviderChanged.bind(this));
+      this._listeners.push(this._cesiumWidget.scene.terrainProviderChanged
+        .addEventListener(this._terrainProviderChanged.bind(this)));
+
+      this._listeners.push(this._cesiumWidget.scene.postRender.addEventListener((eventScene, time) => {
+        this.postRender.raiseEvent({ map: this, originalEvent: { scene: eventScene, time } });
+      }));
       if (this._debug) {
         this._setDebug();
       }
@@ -880,10 +880,9 @@ class CesiumMap extends VcsMap {
       visualizersCallback,
     });
 
-    this._removeClusterClockTickListener =
-      this._cesiumWidget.clock.onTick.addEventListener((clock) => {
-        this._clusterDataSourceDisplay.update(clock.currentTime);
-      });
+    this._listeners.push(this._cesiumWidget.clock.onTick.addEventListener((clock) => {
+      this._clusterDataSourceDisplay.update(clock.currentTime);
+    }));
 
     return dataSourceCollection;
   }
@@ -1132,17 +1131,12 @@ class CesiumMap extends VcsMap {
       this.screenSpaceEventHandler.destroy();
       this.screenSpaceEventHandler = null;
     }
-    if (this._terrainProviderChangedListener) {
-      this._terrainProviderChangedListener();
-      this._terrainProviderChangedListener = null;
-    }
+    this._listeners.forEach((cb) => { cb(); });
+    this._listeners = [];
+
     this._terrainProvider = null;
     this.defaultTerrainProvider = null;
 
-    if (this._clockTickListener) {
-      this._clockTickListener();
-      this._clockTickListener = null;
-    }
 
     if (this._clockSyncListener) {
       this._clockSyncListener();
@@ -1157,9 +1151,6 @@ class CesiumMap extends VcsMap {
     if (this._cameraLimiter) {
       this._cameraLimiter = null;
     }
-    if (this._removeClusterClockTickListener) {
-      this._removeClusterClockTickListener();
-    }
 
     [...this.layerCollection].forEach((l) => { l.removedFromMap(this); });
 

package/src/map/openlayersMap.js

@@ -117,8 +117,9 @@ class OpenlayersMap extends BaseOLMap {
     if (this.movementDisabled || !viewpoint.isValid()) {
       return Promise.resolve();
     }
+    let { heading } = viewpoint;
     if (this.fixedNorthOrientation) {
-      viewpoint.heading = 0;
+      heading = 0;
     }
     const view = this.olMap.getView();
     const fromLatLon = getTransform('EPSG:4326', view.getProjection());
@@ -148,8 +149,8 @@ class OpenlayersMap extends BaseOLMap {
 
     if (viewpoint.animate) {
       let rotation = 0;
-      if (!this.fixedNorthOrientation && viewpoint.heading != null) {
-        rotation = -CesiumMath.toRadians(viewpoint.heading);
+      if (!this.fixedNorthOrientation && heading != null) {
+        rotation = -CesiumMath.toRadians(heading);
       }
       return new Promise((resolve) => {
         view.animate({
@@ -163,8 +164,8 @@ class OpenlayersMap extends BaseOLMap {
     } else {
       view.setCenter(center);
       view.setResolution(resolution);
-      if (!this.fixedNorthOrientation && viewpoint.heading != null) {
-        view.setRotation(-CesiumMath.toRadians(viewpoint.heading));
+      if (!this.fixedNorthOrientation && heading != null) {
+        view.setRotation(-CesiumMath.toRadians(heading));
       }
     }
     return Promise.resolve();

package/src/map/vcsMap.js

@@ -31,6 +31,12 @@ import { mapClassRegistry } from '../classRegistry.js';
  * @api stable
  */
 
+/**
+ * @typedef {Object} VcsMapRenderEvent
+ * @property {VcsMap} map
+ * @property {import("ol").MapEvent|CesiumMapEvent} originalEvent
+ */
+
 /**
  * @type {Object}
  */
@@ -152,6 +158,12 @@ class VcsMap extends VcsObject {
      * @api
      */
     this.splitScreen = null;
+
+    /**
+     * @type {VcsEvent<VcsMapRenderEvent>}
+     * @private
+     */
+    this._postRender = new VcsEvent();
   }
 
   /**
@@ -217,6 +229,15 @@ class VcsMap extends VcsObject {
     this._setLayerCollectionListeners();
   }
 
+  /**
+   * An event raised on the maps post render
+   * @type {VcsEvent<VcsMapRenderEvent>}
+   * @readonly
+   */
+  get postRender() {
+    return this._postRender;
+  }
+
   /**
    * @private
    */
@@ -523,6 +544,7 @@ class VcsMap extends VcsObject {
       this.pointerInteractionEvent = null;
     }
     this._layerCollection = null;
+    this._postRender.destroy();
   }
 }
 

package/src/util/mapCollection.js

@@ -143,6 +143,16 @@ class MapCollection extends Collection {
      * @private
      */
     this._mapPointerListeners = [];
+    /**
+     * @type {VcsEvent<VcsMapRenderEvent>}
+     * @private
+     */
+    this._postRender = new VcsEvent();
+    /**
+     * @type {function():void}
+     * @private
+     */
+    this._postRenderListener = () => {};
   }
 
   /**
@@ -205,6 +215,15 @@ class MapCollection extends Collection {
     });
   }
 
+  /**
+   * Raised on the active maps post render event
+   * @type {VcsEvent<VcsMapRenderEvent>}
+   * @readonly
+   */
+  get postRender() {
+    return this._postRender;
+  }
+
   /**
    * Adds a map to the collection. This will set the collections target, {@link SplitScreen}
    * and the collections {@link LayerCollection} on the map.
@@ -231,6 +250,8 @@ class MapCollection extends Collection {
    */
   _remove(map) {
     if (this._activeMap === map) {
+      this._postRenderListener();
+      this._postRenderListener = () => {};
       this._cachedViewpoint = map.getViewpointSync();
       if (this._target) {
         const mapClassName = this._activeMap.className.split('.').pop();
@@ -380,6 +401,10 @@ class MapCollection extends Collection {
 
     this.clippingObjectManager.mapActivated(map);
     this._splitScreen.mapActivated(map);
+    this._postRenderListener();
+    this._postRenderListener = this._activeMap.postRender.addEventListener((event) => {
+      this.postRender.raiseEvent(event);
+    });
     this.mapActivated.raiseEvent(map);
     return Promise.resolve();
   }

package/tests/unit/helpers/cesiumHelpers.js

@@ -157,7 +157,9 @@ export function getMockScene() {
       depthTexture: true,
       stencilBuffer: true,
     },
-    render() {},
+    render(time) {
+      this.postRender.raiseEvent(this, time);
+    },
     pick() {},
     pickPosition() {},
     destroy() {