@vcmap/core 6.1.11 → 6.2.0-rc.2

package/dist/src/map/baseOLMap.d.ts

@@ -3,7 +3,7 @@ import type { Layer as OLLayer } from 'ol/layer.js';
 import type { Coordinate } from 'ol/coordinate.js';
 import VcsMap from './vcsMap.js';
 import type Layer from '../layer/layer.js';
-import { DisableMapControlOptions } from '../util/mapCollection.js';
+import type { DisableMapControlOptions } from '../util/mapCollection.js';
 /**
  * @group Map
  */

package/dist/src/map/baseOLMap.js

@@ -45,6 +45,21 @@ function ensureLayerInCollection(layers, layer, layerCollection) {
         }
     }
 }
+function getPointerKeyType(button) {
+    if (button === 0) {
+        return PointerKeyType.LEFT;
+    }
+    if (button === 2) {
+        return PointerKeyType.RIGHT;
+    }
+    if (button === 1) {
+        return PointerKeyType.MIDDLE;
+    }
+    if (button === -1) {
+        return PointerKeyType.ALL;
+    }
+    return PointerKeyType.LEFT;
+}
 /**
  * @group Map
  */
@@ -65,12 +80,6 @@ class BaseOLMap extends VcsMap {
         return this._olMap;
     }
     _raisePointerInteraction(olEvent, pointerEvent) {
-        const pointerMap = {
-            '-1': PointerKeyType.ALL,
-            0: PointerKeyType.LEFT,
-            1: PointerKeyType.MIDDLE,
-            2: PointerKeyType.RIGHT,
-        };
         let key = olEvent.originalEvent.shiftKey
             ? ModificationKeyType.SHIFT
             : ModificationKeyType.NONE;
@@ -87,7 +96,7 @@ class BaseOLMap extends VcsMap {
             positionOrPixel: position,
             windowPosition: Cartesian2.fromArray(olEvent.pixel, 0, new Cartesian2()),
             key,
-            pointer: pointerMap[olEvent.originalEvent.button || 0],
+            pointer: getPointerKeyType(olEvent.originalEvent.button),
             pointerEvent,
         });
     }
@@ -175,7 +184,7 @@ class BaseOLMap extends VcsMap {
             });
         }
     }
-    // eslint-disable-next-line no-unused-vars
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     getCurrentResolution(_coordinate) {
         const view = this.olMap ? this.olMap.getView() : null;
         if (view) {

package/dist/src/map/baseOLMap.js.map

@@ -1 +1 @@
-{"version":3,"file":"baseOLMap.js","sourceRoot":"","sources":["../../../src/map/baseOLMap.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"baseOLMap.js","sourceRoot":"","sources":["../../../src/map/baseOLMap.ts"],"names":[],"mappings":"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"}

package/dist/src/map/cameraLimiter.d.ts

@@ -1,4 +1,5 @@
-import { Camera, Cartographic } from '@vcmap-cesium/engine';
+import type { Camera } from '@vcmap-cesium/engine';
+import { Cartographic } from '@vcmap-cesium/engine';
 /**
  * Enumeration of camera limiter modes.
  */

package/dist/src/map/cameraLimiter.js.map

@@ -1 +1 @@
-{"version":3,"file":"cameraLimiter.js","sourceRoot":"","sources":["../../../src/map/cameraLimiter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cameraLimiter.js","sourceRoot":"","sources":["../../../src/map/cameraLimiter.ts"],"names":[],"mappings":"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"}

package/dist/src/map/cesiumMap.d.ts

@@ -1,12 +1,13 @@
 import { JulianDate, Clock, DataSourceClock, Color, CesiumWidget, DataSourceDisplay, DataSourceCollection, ScreenSpaceEventHandler, Cartesian3, CustomDataSource, ImageryLayer, PrimitiveCollection, type Scene, type ImageryLayerCollection, type Cesium3DTileset, type TerrainProvider, type Event as CesiumEvent, type CzmlDataSource, type EntityCollection, type ShadowMap, type ContextOptions } from '@vcmap-cesium/engine';
 import type { Coordinate } from 'ol/coordinate.js';
 import VcsMap, { type VcsMapOptions } from './vcsMap.js';
-import Viewpoint from '../util/viewpoint.js';
-import CameraLimiter, { CameraLimiterOptions } from './cameraLimiter.js';
+import type Viewpoint from '../util/viewpoint.js';
+import type { CameraLimiterOptions } from './cameraLimiter.js';
+import CameraLimiter from './cameraLimiter.js';
 import type LayerCollection from '../util/layerCollection.js';
 import type Layer from '../layer/layer.js';
 import VcsEvent from '../vcsEvent.js';
-import { DisableMapControlOptions } from '../util/mapCollection.js';
+import type { DisableMapControlOptions } from '../util/mapCollection.js';
 export type CesiumMapOptions = VcsMapOptions & {
     /**
      * if true, lighting will be activated.
@@ -113,7 +114,7 @@ declare class CesiumMap extends VcsMap<CesiumVisualisationType> {
     enableLightning: boolean;
     tileCacheSize: number;
     screenSpaceEventHandler: ScreenSpaceEventHandler | null;
-    private _screenSpaceListeners;
+    private _screenSpaceListener;
     defaultJDate: JulianDate;
     /**
      * The defaultShadowMap which is created when calling the constructor of the CesiumWidet in {@link initialize}. This is a reference, not a clone.
@@ -135,7 +136,6 @@ declare class CesiumMap extends VcsMap<CesiumVisualisationType> {
     private _preUpdateListener;
     private _clockSyncListener;
     private _listeners;
-    private _lastEventFrameNumber;
     private _lightIntensity;
     private _contextOptions;
     constructor(options: CesiumMapOptions);
@@ -157,8 +157,6 @@ declare class CesiumMap extends VcsMap<CesiumVisualisationType> {
     get cameraLimiter(): CameraLimiter | null;
     set cameraLimiter(limiter: CameraLimiter | null);
     private _setupPreUpdateListener;
-    private _raisePointerInteraction;
-    private _setupInteractions;
     initialize(): Promise<void>;
     activate(): Promise<void>;
     deactivate(): void;

package/dist/src/map/cesiumMap.js

@@ -1,16 +1,15 @@
-import { JulianDate, Clock, DataSourceClock, Color, CesiumWidget, ShadowMode, DataSourceDisplay, DataSourceCollection, RequestScheduler, Ellipsoid, ScreenSpaceEventHandler, Cartesian3, Ray, Math as CesiumMath, Camera, BillboardVisualizer, LabelVisualizer, PointVisualizer, CustomDataSource, BoundingSphere, Intersect, ImageryLayer, PrimitiveCollection, KeyboardEventModifier, ScreenSpaceEventType, Cartographic, } from '@vcmap-cesium/engine';
+import { JulianDate, Clock, DataSourceClock, Color, CesiumWidget, ShadowMode, DataSourceDisplay, DataSourceCollection, RequestScheduler, ScreenSpaceEventHandler, Cartesian3, Math as CesiumMath, Camera, BillboardVisualizer, LabelVisualizer, PointVisualizer, CustomDataSource, BoundingSphere, Intersect, ImageryLayer, PrimitiveCollection, } from '@vcmap-cesium/engine';
 import { check, maybe } from '@vcsuite/check';
 import { parseBoolean, parseInteger, parseNumber } from '@vcsuite/parsers';
 import VcsMap from './vcsMap.js';
-import Viewpoint from '../util/viewpoint.js';
 import Projection, { mercatorProjection } from '../util/projection.js';
 import { getHeightFromTerrainProvider } from '../layer/terrainHelpers.js';
 import { vcsLayerName } from '../layer/layerSymbols.js';
-import { ModificationKeyType, PointerEventType, PointerKeyType, } from '../interaction/interactionType.js';
 import CameraLimiter from './cameraLimiter.js';
 import { mapClassRegistry } from '../classRegistry.js';
 import VcsEvent from '../vcsEvent.js';
 import { vectorClusterGroupName } from '../vectorCluster/vectorClusterSymbols.js';
+import { getResolution, getViewpointFromScene, setupCesiumInteractions, } from './cesiumMapHelpers.js';
 /**
  * Ensures, a primitive/imageryLayer/entity is part of a collection and placed at the correct location
  * @param  cesiumCollection
@@ -161,8 +160,8 @@ class CesiumMap extends VcsMap {
             contextOptions: undefined,
         };
     }
-    _cesiumWidget;
-    dataSourceDisplay;
+    _cesiumWidget = null;
+    dataSourceDisplay = null;
     /**
      * clock for animated data
      */
@@ -175,66 +174,49 @@ class CesiumMap extends VcsMap {
      * clocks of active data sources
      * the last clock of the array corresponds to the active dataSourceDisplayClock
      */
-    _dataSourceClocks;
+    _dataSourceClocks = [];
     enableLightning;
     tileCacheSize;
-    screenSpaceEventHandler;
-    _screenSpaceListeners;
+    screenSpaceEventHandler = null;
+    _screenSpaceListener;
     defaultJDate;
     /**
      * The defaultShadowMap which is created when calling the constructor of the CesiumWidet in {@link initialize}. This is a reference, not a clone.
      */
-    _defaultShadowMap;
+    _defaultShadowMap = null;
     /**
      * A cache of the shadowMap that is set, before {@link initialize} is called. It is applied as soon the instance is initialized.
      */
     _initialShadowMap;
-    shadowMapChanged;
+    shadowMapChanged = new VcsEvent();
     webGLaa;
     globeColor;
     _clusterDataSourceDisplay;
-    _terrainProvider;
-    defaultTerrainProvider;
+    _terrainProvider = null;
+    defaultTerrainProvider = null;
     useOriginalCesiumShader;
-    _cameraLimiter;
+    _cameraLimiter = null;
     _cameraLimiterOptions;
     _preUpdateListener;
     _clockSyncListener;
-    _listeners;
-    _lastEventFrameNumber;
+    _listeners = [];
     _lightIntensity;
     _contextOptions;
     constructor(options) {
         super(options);
         const defaultOptions = CesiumMap.getDefaultOptions();
-        this._cesiumWidget = null;
-        this.dataSourceDisplay = null;
         this.dataSourceDisplayClock = new Clock({ shouldAnimate: true });
         const defaultClock = new DataSourceClock();
         defaultClock.currentTime = this.dataSourceDisplayClock.currentTime;
         this._defaultClock = defaultClock;
-        this._dataSourceClocks = [];
         this.enableLightning = parseBoolean(options.enableLightning, defaultOptions.enableLightning);
         this.tileCacheSize = parseInteger(options.tileCacheSize, defaultOptions.tileCacheSize);
-        this.screenSpaceEventHandler = null;
-        this._screenSpaceListeners = [];
         this.defaultJDate = JulianDate.fromDate(new Date(2014, 6, 20, 13, 0, 0, 0));
-        this._defaultShadowMap = null;
-        this._initialShadowMap = null;
-        this.shadowMapChanged = new VcsEvent();
         this.webGLaa = parseBoolean(options.webGLaa, defaultOptions.webGLaa);
         this.useOriginalCesiumShader = parseBoolean(options.useOriginalCesiumShader, defaultOptions.useOriginalCesiumShader);
         this.globeColor = Color.fromCssColorString(options.globeColor || defaultOptions.globeColor);
-        this._clusterDataSourceDisplay = null;
-        this._terrainProvider = null;
-        this.defaultTerrainProvider = null;
-        this._cameraLimiter = null;
         this._cameraLimiterOptions =
             options.cameraLimiter || defaultOptions.cameraLimiter;
-        this._preUpdateListener = null;
-        this._clockSyncListener = null;
-        this._listeners = [];
-        this._lastEventFrameNumber = null;
         this._lightIntensity = parseNumber(options.lightIntensity, defaultOptions.lightIntensity);
         this._contextOptions = structuredClone(options.contextOptions);
     }
@@ -285,7 +267,7 @@ class CesiumMap extends VcsMap {
             }
             else if (!this._cameraLimiter && this._preUpdateListener) {
                 this._preUpdateListener();
-                this._preUpdateListener = null;
+                this._preUpdateListener = undefined;
             }
         }
     }
@@ -300,114 +282,13 @@ class CesiumMap extends VcsMap {
                 });
         }
     }
-    _raisePointerInteraction(key, pointer, pointerEvent, csEvent) {
-        const multipleTouch = 
-        // eslint-disable-next-line no-underscore-dangle
-        (this.screenSpaceEventHandler?._positions?.length ?? 0) > 1;
-        const windowPosition = csEvent
-            .position
-            ? csEvent.position
-            : csEvent.endPosition;
-        this.pointerInteractionEvent.raiseEvent({
-            map: this,
-            windowPosition,
-            key,
-            pointer,
-            multipleTouch,
-            pointerEvent,
-        });
-    }
-    _setupInteractions() {
-        if (!(this._cesiumWidget && this.screenSpaceEventHandler)) {
-            throw new Error('Cannot setup interactions on uninitailized map');
-        }
-        const mods = [
-            {
-                csModifier: KeyboardEventModifier.ALT,
-                vcsModifier: ModificationKeyType.ALT,
-            },
-            {
-                csModifier: KeyboardEventModifier.CTRL,
-                vcsModifier: ModificationKeyType.CTRL,
-            },
-            {
-                csModifier: KeyboardEventModifier.SHIFT,
-                vcsModifier: ModificationKeyType.SHIFT,
-            },
-            { csModifier: undefined, vcsModifier: ModificationKeyType.NONE },
-        ];
-        const types = [
-            {
-                type: ScreenSpaceEventType.LEFT_DOWN,
-                pointerEvent: PointerEventType.DOWN,
-                pointer: PointerKeyType.LEFT,
-            },
-            {
-                type: ScreenSpaceEventType.LEFT_UP,
-                pointerEvent: PointerEventType.UP,
-                pointer: PointerKeyType.LEFT,
-            },
-            {
-                type: ScreenSpaceEventType.RIGHT_DOWN,
-                pointerEvent: PointerEventType.DOWN,
-                pointer: PointerKeyType.RIGHT,
-            },
-            {
-                type: ScreenSpaceEventType.RIGHT_UP,
-                pointerEvent: PointerEventType.UP,
-                pointer: PointerKeyType.RIGHT,
-            },
-            {
-                type: ScreenSpaceEventType.MIDDLE_DOWN,
-                pointerEvent: PointerEventType.DOWN,
-                pointer: PointerKeyType.MIDDLE,
-            },
-            {
-                type: ScreenSpaceEventType.MIDDLE_UP,
-                pointerEvent: PointerEventType.UP,
-                pointer: PointerKeyType.MIDDLE,
-            },
-            {
-                type: ScreenSpaceEventType.MOUSE_MOVE,
-                pointerEvent: PointerEventType.MOVE,
-                pointer: PointerKeyType.ALL,
-            },
-        ];
-        this._screenSpaceListeners = types
-            .map(({ pointerEvent, pointer, type }) => {
-            return mods.map(({ csModifier, vcsModifier }) => {
-                const handler = type === ScreenSpaceEventType.MOUSE_MOVE
-                    ? (csEvent) => {
-                        const widget = this._cesiumWidget;
-                        if (widget.scene.frameState.frameNumber !==
-                            this._lastEventFrameNumber) {
-                            this._lastEventFrameNumber =
-                                widget.scene.frameState.frameNumber;
-                            this._raisePointerInteraction(vcsModifier, pointer, pointerEvent, csEvent);
-                        }
-                    }
-                    : (csEvent) => {
-                        this._raisePointerInteraction(vcsModifier, pointer, pointerEvent, csEvent);
-                    };
-                this.screenSpaceEventHandler?.setInputAction?.(handler, type, csModifier);
-                return () => {
-                    this?.screenSpaceEventHandler?.removeInputAction?.(type, csModifier);
-                };
-            });
-        })
-            .flat();
-    }
     initialize() {
         if (!this.initialized) {
             if (!this.useOriginalCesiumShader) {
-                // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-                // @ts-ignore
                 globalThis.useVcsCustomShading = true;
-                // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-                // @ts-ignore
             }
             else if (globalThis.useVcsCustomShading) {
-                console.error('Cannot activate Original Cesium Shader, flag to use VCS Shader is already set by another Cesium Map or VCMap Instance');
+                this.getLogger().error('Cannot activate Original Cesium Shader, flag to use VCS Shader is already set by another Cesium Map or VCMap Instance');
             }
             const contextOptions = {
                 ...this._contextOptions,
@@ -471,7 +352,7 @@ class CesiumMap extends VcsMap {
                 this._setupPreUpdateListener();
             }
             this.screenSpaceEventHandler = new ScreenSpaceEventHandler(this._cesiumWidget.scene.canvas);
-            this._setupInteractions();
+            this._screenSpaceListener = setupCesiumInteractions(this, this._cesiumWidget.scene, this.screenSpaceEventHandler);
             this.initialized = true;
             this.defaultTerrainProvider = this._cesiumWidget.scene.terrainProvider;
             this._terrainProvider = this.defaultTerrainProvider;
@@ -485,7 +366,7 @@ class CesiumMap extends VcsMap {
             this._defaultShadowMap = this._cesiumWidget.scene.shadowMap;
             if (this._initialShadowMap) {
                 this.setShadowMap(this._initialShadowMap);
-                this._initialShadowMap = null;
+                this._initialShadowMap = undefined;
             }
         }
         return Promise.resolve();
@@ -525,35 +406,7 @@ class CesiumMap extends VcsMap {
         if (!this._cesiumWidget || !this._cesiumWidget.scene || !this.target) {
             return null;
         }
-        const cam = this._cesiumWidget.scene.camera;
-        const cameraPositionCartesian = cam.position;
-        let groundPosition;
-        let distance;
-        const ray = new Ray(cam.position, cam.direction);
-        const groundPositionCartesian = this._cesiumWidget.scene.globe.pick(ray, this._cesiumWidget.scene);
-        if (groundPositionCartesian) {
-            distance = Cartesian3.distance(groundPositionCartesian, cameraPositionCartesian);
-            const groundPositionCartographic = Ellipsoid.WGS84.cartesianToCartographic(groundPositionCartesian);
-            groundPosition = [
-                CesiumMath.toDegrees(groundPositionCartographic.longitude),
-                CesiumMath.toDegrees(groundPositionCartographic.latitude),
-                groundPositionCartographic.height,
-            ];
-        }
-        const cameraPositionCartographic = cam.positionCartographic;
-        const cameraPosition = [
-            CesiumMath.toDegrees(cameraPositionCartographic.longitude),
-            CesiumMath.toDegrees(cameraPositionCartographic.latitude),
-            cameraPositionCartographic.height,
-        ];
-        return new Viewpoint({
-            groundPosition,
-            cameraPosition,
-            distance,
-            heading: CesiumMath.toDegrees(cam.heading),
-            pitch: CesiumMath.toDegrees(cam.pitch),
-            roll: CesiumMath.toDegrees(cam.roll),
-        });
+        return getViewpointFromScene(this._cesiumWidget.scene);
     }
     async gotoViewpoint(viewpoint, optMaximumHeight) {
         if (this.movementApiCallsDisabled ||
@@ -638,17 +491,7 @@ class CesiumMap extends VcsMap {
         if (!this._cesiumWidget) {
             return 1;
         }
-        const cam = this._cesiumWidget.scene.camera;
-        const distance = Cartesian3.distance(cartesian, cam.position);
-        const fov = Math.PI / 3.0;
-        const width = this.mapElement.offsetWidth;
-        const height = this.mapElement.offsetHeight;
-        const aspectRatio = width / height;
-        const fovy = Math.atan(Math.tan(fov * 0.5) / aspectRatio) * 2.0;
-        const visibleMeters = 2 * distance * Math.tan(fovy / 2);
-        const relativeCircumference = Math.cos(Math.abs(latitude));
-        const visibleMapUnits = visibleMeters / relativeCircumference;
-        return visibleMapUnits / height;
+        return getResolution(cartesian, this._cesiumWidget.camera, this.mapElement, latitude);
     }
     getCurrentResolution(coordinate) {
         const wgs84Coordinate = Projection.mercatorToWgs84(coordinate);
@@ -656,7 +499,7 @@ class CesiumMap extends VcsMap {
         return this._getCurrentResolutionFromCartesianLatitude(cartesian, CesiumMath.toRadians(wgs84Coordinate[1]));
     }
     getCurrentResolutionFromCartesian(cartesian) {
-        return this._getCurrentResolutionFromCartesianLatitude(cartesian, Cartographic.fromCartesian(cartesian).latitude);
+        return this._getCurrentResolutionFromCartesianLatitude(cartesian);
     }
     disableMovement(prevent) {
         super.disableMovement(prevent);
@@ -673,7 +516,7 @@ class CesiumMap extends VcsMap {
         if (clock !== activeClock) {
             if (this._clockSyncListener) {
                 this._clockSyncListener();
-                this._clockSyncListener = null;
+                this._clockSyncListener = undefined;
             }
             this._clockSyncListener = synchronizeClock(clock, this.dataSourceDisplayClock);
         }
@@ -691,7 +534,7 @@ class CesiumMap extends VcsMap {
                     this._defaultClock;
                 if (this._clockSyncListener) {
                     this._clockSyncListener();
-                    this._clockSyncListener = null;
+                    this._clockSyncListener = undefined;
                 }
                 this._clockSyncListener = synchronizeClock(activeClock, this.dataSourceDisplayClock);
             }
@@ -739,7 +582,7 @@ class CesiumMap extends VcsMap {
      */
     setDefaultShadowMap() {
         if (!this._cesiumWidget || !this._defaultShadowMap) {
-            this._initialShadowMap = null;
+            this._initialShadowMap = undefined;
             return;
         }
         this.setShadowMap(this._defaultShadowMap);
@@ -1002,9 +845,7 @@ class CesiumMap extends VcsMap {
         if (this.dataSourceDisplay && !this.dataSourceDisplay.isDestroyed()) {
             this.dataSourceDisplay.destroy();
         }
-        this._screenSpaceListeners.forEach((cb) => {
-            cb();
-        });
+        this._screenSpaceListener?.();
         if (this.screenSpaceEventHandler) {
             this.screenSpaceEventHandler.destroy();
             this.screenSpaceEventHandler = null;
@@ -1017,11 +858,11 @@ class CesiumMap extends VcsMap {
         this.defaultTerrainProvider = null;
         if (this._clockSyncListener) {
             this._clockSyncListener();
-            this._clockSyncListener = null;
+            this._clockSyncListener = undefined;
         }
         if (this._preUpdateListener) {
             this._preUpdateListener();
-            this._preUpdateListener = null;
+            this._preUpdateListener = undefined;
         }
         if (this._cameraLimiter) {
             this._cameraLimiter = null;
@@ -1036,7 +877,7 @@ class CesiumMap extends VcsMap {
             this._cesiumWidget.destroy();
             this._cesiumWidget = null;
         }
-        this._initialShadowMap = null;
+        this._initialShadowMap = undefined;
         this._defaultShadowMap = null;
         this.shadowMapChanged.destroy();
         super.destroy();