@vcmap/core 6.2.3 → 6.3.0-rc.1

package/src/util/flight/flightInstance.ts

@@ -69,9 +69,9 @@ class FlightInstance extends VcsObject {
   }
 
   constructor(options: FlightInstanceOptions) {
-    super(options);
-
     const defaultOptions = FlightInstance.getDefaultOptions();
+    super({ ...defaultOptions, ...options });
+
     const anchorsArray = (options.anchors ?? defaultOptions.anchors!)
       .map(anchorFromGeojsonFeature)
       .filter((a): a is FlightAnchor => !!a);
@@ -205,15 +205,16 @@ class FlightInstance extends VcsObject {
    * returns an options object for this flight. if this flight was configured via an URL, only the url will be configured.
    * @returns
    */
-  toJSON(): FlightInstanceOptions {
-    const config = super.toJSON() as FlightInstanceOptions;
+  toJSON(
+    defaultOptions = FlightInstance.getDefaultOptions(),
+  ): FlightInstanceOptions {
+    const config = super.toJSON(defaultOptions) as FlightInstanceOptions;
 
     if (this._url) {
       config.url = this._url;
       return config;
     }
 
-    const defaultOptions = FlightInstance.getDefaultOptions();
     if (this._multiplier !== defaultOptions.multiplier) {
       config.multiplier = this._multiplier;
     }

package/src/util/mapCollection.ts

@@ -22,6 +22,7 @@ import PanoramaImageSelection from '../interaction/panoramaImageSelection.js';
 import type { PanoramaImage } from '../panorama/panoramaImage.js';
 import type PanoramaMap from '../map/panoramaMap.js';
 import PanoramaFeatureHighlight from '../interaction/panoramaFeatureHighlight.js';
+import { EventType } from '../interaction/interactionType.js';
 
 export type MapCollectionInitializationError = {
   error: Error;
@@ -258,6 +259,23 @@ class MapCollection extends Collection<VcsMap> {
     return this._exclusiveMapControls?.id;
   }
 
+  /**
+   * Indicates whether panorama image selection is paused.
+   */
+  get pausePanoramaImageSelection(): boolean {
+    return (
+      this._panoramaImageSelection.active === EventType.NONE &&
+      this._panoramaTileHighlight.active === EventType.NONE
+    );
+  }
+
+  set pausePanoramaImageSelection(paused: boolean) {
+    check(paused, Boolean);
+    const active = paused ? false : undefined;
+    this._panoramaImageSelection.setActive(active);
+    this._panoramaTileHighlight.setActive(active);
+  }
+
   /**
    * Adds a map to the collection. This will set the collections target
    * and the collections  on the map.

package/src/util/renderScreenshot.ts

@@ -1,20 +1,16 @@
 import type { Size } from 'ol/size.js';
 import { getLogger } from '@vcsuite/logger';
-import CesiumMap from '../map/cesiumMap.js';
 import OpenlayersMap from '../map/openlayersMap.js';
 import ObliqueMap from '../map/obliqueMap.js';
-import PanoramaMap from '../map/panoramaMap.js';
 import type VcsApp from '../vcsApp.js';
+import BaseCesiumMap from '../map/baseCesiumMap.js';
 /**
  * Prepares the cesium map for the screenshot
  * @param map - The cesium map
  * @param scale - The factor to scale the map according to the required resolution
  * @returns The function to reset the applied scale.
  */
-function prepareCesiumMap(
-  map: CesiumMap | PanoramaMap,
-  scale: number,
-): () => void {
+function prepareCesiumMap(map: BaseCesiumMap, scale: number): () => void {
   const viewer = map.getCesiumWidget()!;
   const { resolutionScale } = viewer;
   viewer.resolutionScale = scale;
@@ -64,7 +60,7 @@ function prepareOlMap(
  * @returns A promise that resolves to the canvas element.
  */
 async function getImageFromCesium(
-  map: CesiumMap | PanoramaMap,
+  map: BaseCesiumMap,
 ): Promise<HTMLCanvasElement> {
   const { scene } = map.getCesiumWidget()!;
 
@@ -167,7 +163,7 @@ export default async function renderScreenshot(
   let resetMap: () => void;
   const map = app.maps.activeMap;
 
-  if (map instanceof CesiumMap || map instanceof PanoramaMap) {
+  if (map instanceof BaseCesiumMap) {
     const { canvas } = map.getCesiumWidget()!.scene;
     const canvasWidth = canvas.width;
     const canvasHeight = canvas.height;

package/src/util/viewpoint.ts

@@ -182,9 +182,9 @@ class Viewpoint extends VcsObject {
    * @param  options
    */
   constructor(options: ViewpointOptions) {
-    super(options);
-
     const defaultOptions = Viewpoint.getDefaultOptions();
+    super({ ...defaultOptions, ...options });
+
     this.cameraPosition = null;
     if (
       Array.isArray(options.cameraPosition) &&

package/src/vcsObject.ts

@@ -25,6 +25,14 @@ class VcsObject {
     return 'VcsObject';
   }
 
+  static getDefaultOptions(): VcsObjectOptions {
+    return {
+      type: undefined,
+      name: undefined,
+      properties: {},
+    };
+  }
+
   /**
    * unique Name
    */
@@ -50,7 +58,8 @@ class VcsObject {
     return getLogger(this.className);
   }
 
-  toJSON(): VcsObjectOptions {
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  toJSON(_defaultOptions?: VcsObjectOptions): VcsObjectOptions {
     const config: VcsObjectOptions = {
       type: this.className,
       name: this.name,

package/src/vectorCluster/vectorClusterGroup.ts

@@ -135,8 +135,8 @@ export default class VectorClusterGroup extends VcsObject {
   clusterDistance: number;
 
   constructor(options: VectorClusterGroupOptions) {
-    super(options);
     const defaultOptions = VectorClusterGroup.getDefaultOptions();
+    super({ ...defaultOptions, ...options });
 
     this._style = getStyleOrDefaultStyle(
       options.style,
@@ -445,9 +445,12 @@ export default class VectorClusterGroup extends VcsObject {
     }
   }
 
-  toJSON(): VectorClusterGroupOptions {
-    const config: Partial<VectorClusterGroupOptions> = super.toJSON();
-    const defaultOptions = VectorClusterGroup.getDefaultOptions();
+  toJSON(
+    defaultOptions = VectorClusterGroup.getDefaultOptions(),
+  ): VectorClusterGroupOptions {
+    const config: Partial<VectorClusterGroupOptions> = super.toJSON(
+      defaultOptions,
+    );
 
     if (!this.style.equals(new VectorClusterStyleItem({}))) {
       config.style = this.style.toJSON();

package/src/vectorCluster/vectorClusterStyleItem.ts

@@ -99,8 +99,8 @@ export default class VectorClusterStyleItem extends VcsObject {
   styleChanged = new VcsEvent<void>();
 
   constructor(options: VectorClusterStyleItemOptions) {
-    super(options);
     const defaultOptions = VectorClusterStyleItem.getDefaultOptions();
+    super({ ...defaultOptions, ...options });
 
     const configTemplate = Array.isArray(options.template)
       ? options.template.join('')
@@ -336,9 +336,13 @@ export default class VectorClusterStyleItem extends VcsObject {
     this._styleCache.clear();
   }
 
-  toJSON(): VectorClusterStyleItemOptions {
-    const config: Partial<VectorClusterStyleItemOptions> = super.toJSON();
-    const defaultOptions = VectorClusterStyleItem.getDefaultOptions();
+  toJSON(
+    defaultOptions = VectorClusterStyleItem.getDefaultOptions(),
+  ): VectorClusterStyleItemOptions {
+    const config: Partial<VectorClusterStyleItemOptions> = super.toJSON(
+      defaultOptions,
+    );
+
     if (this.template !== defaultOptions.template) {
       config.template = this.template;
     }

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

@@ -1,7 +0,0 @@
-import type { Camera, Scene, ScreenSpaceEventHandler } from '@vcmap-cesium/engine';
-import { Cartesian3 } from '@vcmap-cesium/engine';
-import Viewpoint from '../util/viewpoint.js';
-import type VcsMap from './vcsMap.js';
-export declare function setupCesiumInteractions(map: VcsMap, scene: Scene, screenSpaceEventHandler: ScreenSpaceEventHandler): () => void;
-export declare function getViewpointFromScene(scene: Scene): Viewpoint;
-export declare function getResolution(cartesian: Cartesian3, camera: Camera, mapElement: HTMLElement, latitude?: number): number;

package/dist/src/map/cesiumMapHelpers.js

@@ -1,144 +0,0 @@
-import { Cartesian3, Cartographic, Ellipsoid, KeyboardEventModifier, Math as CesiumMath, Ray, ScreenSpaceEventType, } from '@vcmap-cesium/engine';
-import { ModificationKeyType, PointerEventType, PointerKeyType, } from '../interaction/interactionType.js';
-import Viewpoint from '../util/viewpoint.js';
-function raisePointerInteraction(map, key, pointer, pointerEvent, csEvent, screenSpaceEventHandler) {
-    const multipleTouch = 
-    // eslint-disable-next-line no-underscore-dangle
-    (screenSpaceEventHandler?._positions?.length ?? 0) > 1;
-    const windowPosition = csEvent
-        .position
-        ? csEvent.position
-        : csEvent.endPosition;
-    map.pointerInteractionEvent.raiseEvent({
-        map,
-        windowPosition,
-        key,
-        pointer,
-        multipleTouch,
-        pointerEvent,
-    });
-}
-export function setupCesiumInteractions(map, scene, screenSpaceEventHandler) {
-    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,
-        },
-    ];
-    let lastEventFrameNumber = 0;
-    const screenSpaceListeners = types
-        .map(({ pointerEvent, pointer, type }) => {
-        return mods.map(({ csModifier, vcsModifier }) => {
-            const handler = type === ScreenSpaceEventType.MOUSE_MOVE
-                ? (csEvent) => {
-                    if (scene.frameState.frameNumber !== lastEventFrameNumber) {
-                        lastEventFrameNumber = scene.frameState.frameNumber;
-                        raisePointerInteraction(map, vcsModifier, pointer, pointerEvent, csEvent, screenSpaceEventHandler);
-                    }
-                }
-                : (csEvent) => {
-                    raisePointerInteraction(map, vcsModifier, pointer, pointerEvent, csEvent, screenSpaceEventHandler);
-                };
-            screenSpaceEventHandler.setInputAction?.(handler, type, csModifier);
-            return () => {
-                screenSpaceEventHandler.removeInputAction?.(type, csModifier);
-            };
-        });
-    })
-        .flat();
-    return () => {
-        screenSpaceListeners.forEach((removeListener) => {
-            removeListener();
-        });
-    };
-}
-export function getViewpointFromScene(scene) {
-    const cam = scene.camera;
-    const cameraPositionCartesian = cam.position;
-    let groundPosition;
-    let distance;
-    const groundPositionCartesian = scene.globe?.pick(new Ray(cam.position, cam.direction), 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),
-    });
-}
-export function getResolution(cartesian, camera, mapElement, latitude) {
-    const distance = Cartesian3.distance(cartesian, camera.position);
-    const usedLatitude = latitude ?? Cartographic.fromCartesian(cartesian).latitude;
-    const fov = Math.PI / 3.0;
-    const width = mapElement.offsetWidth;
-    const height = 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(usedLatitude));
-    const visibleMapUnits = visibleMeters / relativeCircumference;
-    return visibleMapUnits / height;
-}
-//# sourceMappingURL=cesiumMapHelpers.js.map

package/dist/src/map/cesiumMapHelpers.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"cesiumMapHelpers.js","sourceRoot":"","sources":["../../../src/map/cesiumMapHelpers.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,UAAU,EACV,YAAY,EACZ,SAAS,EACT,qBAAqB,EACrB,IAAI,IAAI,UAAU,EAClB,GAAG,EACH,oBAAoB,GACrB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,mBAAmB,EACnB,gBAAgB,EAChB,cAAc,GACf,MAAM,mCAAmC,CAAC;AAC3C,OAAO,SAAS,MAAM,sBAAsB,CAAC;AAG7C,SAAS,uBAAuB,CAC9B,GAAW,EACX,GAAwB,EACxB,OAAe,EACf,YAA8B,EAC9B,OAEuC,EACvC,uBAAgD;IAEhD,MAAM,aAAa;IACjB,gDAAgD;IAChD,CAAC,uBAAuB,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IACzD,MAAM,cAAc,GAAI,OAAmD;SACxE,QAAQ;QACT,CAAC,CAAE,OAAmD,CAAC,QAAQ;QAC/D,CAAC,CAAE,OAA+C,CAAC,WAAW,CAAC;IAEjE,GAAG,CAAC,uBAAuB,CAAC,UAAU,CAAC;QACrC,GAAG;QACH,cAAc;QACd,GAAG;QACH,OAAO;QACP,aAAa;QACb,YAAY;KACb,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,uBAAuB,CACrC,GAAW,EACX,KAAY,EACZ,uBAAgD;IAEhD,MAAM,IAAI,GAAG;QACX;YACE,UAAU,EAAE,qBAAqB,CAAC,GAAG;YACrC,WAAW,EAAE,mBAAmB,CAAC,GAAG;SACrC;QACD;YACE,UAAU,EAAE,qBAAqB,CAAC,IAAI;YACtC,WAAW,EAAE,mBAAmB,CAAC,IAAI;SACtC;QACD;YACE,UAAU,EAAE,qBAAqB,CAAC,KAAK;YACvC,WAAW,EAAE,mBAAmB,CAAC,KAAK;SACvC;QACD,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,EAAE,mBAAmB,CAAC,IAAI,EAAE;KACjE,CAAC;IAEF,MAAM,KAAK,GAAG;QACZ;YACE,IAAI,EAAE,oBAAoB,CAAC,SAAS;YACpC,YAAY,EAAE,gBAAgB,CAAC,IAAI;YACnC,OAAO,EAAE,cAAc,CAAC,IAAI;SAC7B;QACD;YACE,IAAI,EAAE,oBAAoB,CAAC,OAAO;YAClC,YAAY,EAAE,gBAAgB,CAAC,EAAE;YACjC,OAAO,EAAE,cAAc,CAAC,IAAI;SAC7B;QACD;YACE,IAAI,EAAE,oBAAoB,CAAC,UAAU;YACrC,YAAY,EAAE,gBAAgB,CAAC,IAAI;YACnC,OAAO,EAAE,cAAc,CAAC,KAAK;SAC9B;QACD;YACE,IAAI,EAAE,oBAAoB,CAAC,QAAQ;YACnC,YAAY,EAAE,gBAAgB,CAAC,EAAE;YACjC,OAAO,EAAE,cAAc,CAAC,KAAK;SAC9B;QACD;YACE,IAAI,EAAE,oBAAoB,CAAC,WAAW;YACtC,YAAY,EAAE,gBAAgB,CAAC,IAAI;YACnC,OAAO,EAAE,cAAc,CAAC,MAAM;SAC/B;QACD;YACE,IAAI,EAAE,oBAAoB,CAAC,SAAS;YACpC,YAAY,EAAE,gBAAgB,CAAC,EAAE;YACjC,OAAO,EAAE,cAAc,CAAC,MAAM;SAC/B;QACD;YACE,IAAI,EAAE,oBAAoB,CAAC,UAAU;YACrC,YAAY,EAAE,gBAAgB,CAAC,IAAI;YACnC,OAAO,EAAE,cAAc,CAAC,GAAG;SAC5B;KACF,CAAC;IACF,IAAI,oBAAoB,GAAG,CAAC,CAAC;IAC7B,MAAM,oBAAoB,GAAG,KAAK;SAC/B,GAAG,CAAC,CAAC,EAAE,YAAY,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE;QACvC,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,UAAU,EAAE,WAAW,EAAE,EAAE,EAAE;YAC9C,MAAM,OAAO,GAGX,IAAI,KAAK,oBAAoB,CAAC,UAAU;gBACtC,CAAC,CAAC,CAAC,OAA4C,EAAQ,EAAE;oBACrD,IAAI,KAAK,CAAC,UAAU,CAAC,WAAW,KAAK,oBAAoB,EAAE,CAAC;wBAC1D,oBAAoB,GAAG,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC;wBACpD,uBAAuB,CACrB,GAAG,EACH,WAAW,EACX,OAAO,EACP,YAAY,EACZ,OAAO,EACP,uBAAuB,CACxB,CAAC;oBACJ,CAAC;gBACH,CAAC;gBACH,CAAC,CAAC,CAAC,OAAgD,EAAQ,EAAE;oBACzD,uBAAuB,CACrB,GAAG,EACH,WAAW,EACX,OAAO,EACP,YAAY,EACZ,OAAO,EACP,uBAAuB,CACxB,CAAC;gBACJ,CAAC,CAAC;YAER,uBAAuB,CAAC,cAAc,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC;YACpE,OAAO,GAAS,EAAE;gBAChB,uBAAuB,CAAC,iBAAiB,EAAE,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;YAChE,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;SACD,IAAI,EAAE,CAAC;IAEV,OAAO,GAAS,EAAE;QAChB,oBAAoB,CAAC,OAAO,CAAC,CAAC,cAAc,EAAE,EAAE;YAC9C,cAAc,EAAE,CAAC;QACnB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,KAAY;IAChD,MAAM,GAAG,GAAG,KAAK,CAAC,MAAM,CAAC;IACzB,MAAM,uBAAuB,GAAG,GAAG,CAAC,QAAQ,CAAC;IAC7C,IAAI,cAAc,CAAC;IACnB,IAAI,QAAQ,CAAC;IAEb,MAAM,uBAAuB,GAAG,KAAK,CAAC,KAAK,EAAE,IAAI,CAC/C,IAAI,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,SAAS,CAAC,EACpC,KAAK,CACN,CAAC;IAEF,IAAI,uBAAuB,EAAE,CAAC;QAC5B,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAC5B,uBAAuB,EACvB,uBAAuB,CACxB,CAAC;QACF,MAAM,0BAA0B,GAAG,SAAS,CAAC,KAAK,CAAC,uBAAuB,CACxE,uBAAuB,CACxB,CAAC;QACF,cAAc,GAAG;YACf,UAAU,CAAC,SAAS,CAAC,0BAA0B,CAAC,SAAS,CAAC;YAC1D,UAAU,CAAC,SAAS,CAAC,0BAA0B,CAAC,QAAQ,CAAC;YACzD,0BAA0B,CAAC,MAAM;SAClC,CAAC;IACJ,CAAC;IAED,MAAM,0BAA0B,GAAG,GAAG,CAAC,oBAAoB,CAAC;IAC5D,MAAM,cAAc,GAAG;QACrB,UAAU,CAAC,SAAS,CAAC,0BAA0B,CAAC,SAAS,CAAC;QAC1D,UAAU,CAAC,SAAS,CAAC,0BAA0B,CAAC,QAAQ,CAAC;QACzD,0BAA0B,CAAC,MAAM;KAClC,CAAC;IAEF,OAAO,IAAI,SAAS,CAAC;QACnB,cAAc;QACd,cAAc;QACd,QAAQ;QACR,OAAO,EAAE,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC;QAC1C,KAAK,EAAE,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC;QACtC,IAAI,EAAE,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC;KACrC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,aAAa,CAC3B,SAAqB,EACrB,MAAc,EACd,UAAuB,EACvB,QAAiB;IAEjB,MAAM,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;IACjE,MAAM,YAAY,GAChB,QAAQ,IAAI,YAAY,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC;IAE7D,MAAM,GAAG,GAAG,IAAI,CAAC,EAAE,GAAG,GAAG,CAAC;IAC1B,MAAM,KAAK,GAAG,UAAU,CAAC,WAAW,CAAC;IACrC,MAAM,MAAM,GAAG,UAAU,CAAC,YAAY,CAAC;IACvC,MAAM,WAAW,GAAG,KAAK,GAAG,MAAM,CAAC;IACnC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,GAAG,CAAC,GAAG,WAAW,CAAC,GAAG,GAAG,CAAC;IAChE,MAAM,aAAa,GAAG,CAAC,GAAG,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC;IACxD,MAAM,qBAAqB,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC;IAC/D,MAAM,eAAe,GAAG,aAAa,GAAG,qBAAqB,CAAC;IAE9D,OAAO,eAAe,GAAG,MAAM,CAAC;AAClC,CAAC"}

package/src/map/cesiumMapHelpers.ts

@@ -1,219 +0,0 @@
-import type {
-  Camera,
-  Scene,
-  ScreenSpaceEventHandler,
-} from '@vcmap-cesium/engine';
-import {
-  Cartesian3,
-  Cartographic,
-  Ellipsoid,
-  KeyboardEventModifier,
-  Math as CesiumMath,
-  Ray,
-  ScreenSpaceEventType,
-} from '@vcmap-cesium/engine';
-import {
-  ModificationKeyType,
-  PointerEventType,
-  PointerKeyType,
-} from '../interaction/interactionType.js';
-import Viewpoint from '../util/viewpoint.js';
-import type VcsMap from './vcsMap.js';
-
-function raisePointerInteraction(
-  map: VcsMap,
-  key: ModificationKeyType,
-  pointer: number,
-  pointerEvent: PointerEventType,
-  csEvent:
-    | ScreenSpaceEventHandler.PositionedEvent
-    | ScreenSpaceEventHandler.MotionEvent,
-  screenSpaceEventHandler: ScreenSpaceEventHandler,
-): void {
-  const multipleTouch =
-    // eslint-disable-next-line no-underscore-dangle
-    (screenSpaceEventHandler?._positions?.length ?? 0) > 1;
-  const windowPosition = (csEvent as ScreenSpaceEventHandler.PositionedEvent)
-    .position
-    ? (csEvent as ScreenSpaceEventHandler.PositionedEvent).position
-    : (csEvent as ScreenSpaceEventHandler.MotionEvent).endPosition;
-
-  map.pointerInteractionEvent.raiseEvent({
-    map,
-    windowPosition,
-    key,
-    pointer,
-    multipleTouch,
-    pointerEvent,
-  });
-}
-
-export function setupCesiumInteractions(
-  map: VcsMap,
-  scene: Scene,
-  screenSpaceEventHandler: ScreenSpaceEventHandler,
-): () => void {
-  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,
-    },
-  ];
-  let lastEventFrameNumber = 0;
-  const screenSpaceListeners = types
-    .map(({ pointerEvent, pointer, type }) => {
-      return mods.map(({ csModifier, vcsModifier }) => {
-        const handler:
-          | ScreenSpaceEventHandler.PositionedEventCallback
-          | ScreenSpaceEventHandler.MotionEventCallback =
-          type === ScreenSpaceEventType.MOUSE_MOVE
-            ? (csEvent: ScreenSpaceEventHandler.MotionEvent): void => {
-                if (scene.frameState.frameNumber !== lastEventFrameNumber) {
-                  lastEventFrameNumber = scene.frameState.frameNumber;
-                  raisePointerInteraction(
-                    map,
-                    vcsModifier,
-                    pointer,
-                    pointerEvent,
-                    csEvent,
-                    screenSpaceEventHandler,
-                  );
-                }
-              }
-            : (csEvent: ScreenSpaceEventHandler.PositionedEvent): void => {
-                raisePointerInteraction(
-                  map,
-                  vcsModifier,
-                  pointer,
-                  pointerEvent,
-                  csEvent,
-                  screenSpaceEventHandler,
-                );
-              };
-
-        screenSpaceEventHandler.setInputAction?.(handler, type, csModifier);
-        return (): void => {
-          screenSpaceEventHandler.removeInputAction?.(type, csModifier);
-        };
-      });
-    })
-    .flat();
-
-  return (): void => {
-    screenSpaceListeners.forEach((removeListener) => {
-      removeListener();
-    });
-  };
-}
-
-export function getViewpointFromScene(scene: Scene): Viewpoint {
-  const cam = scene.camera;
-  const cameraPositionCartesian = cam.position;
-  let groundPosition;
-  let distance;
-
-  const groundPositionCartesian = scene.globe?.pick(
-    new Ray(cam.position, cam.direction),
-    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),
-  });
-}
-
-export function getResolution(
-  cartesian: Cartesian3,
-  camera: Camera,
-  mapElement: HTMLElement,
-  latitude?: number,
-): number {
-  const distance = Cartesian3.distance(cartesian, camera.position);
-  const usedLatitude =
-    latitude ?? Cartographic.fromCartesian(cartesian).latitude;
-
-  const fov = Math.PI / 3.0;
-  const width = mapElement.offsetWidth;
-  const height = 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(usedLatitude));
-  const visibleMapUnits = visibleMeters / relativeCircumference;
-
-  return visibleMapUnits / height;
-}