@vcmap/core 6.1.11 → 6.2.0-rc.2

package/src/util/editor/transformation/transformationHandler.ts

@@ -14,12 +14,12 @@ import create3DHandlers from './create3DHandlers.js';
 import create2DHandlers from './create2DHandlers.js';
 import { obliqueGeometry } from '../../../layer/vectorSymbols.js';
 import type VectorLayer from '../../../layer/vectorLayer.js';
-import {
+import type {
   AxisAndPlanes,
   Handlers,
   TransformationHandler,
-  TransformationMode,
 } from './transformationTypes.js';
+import { TransformationMode } from './transformationTypes.js';
 import type VcsMap from '../../../map/vcsMap.js';
 import {
   isAbsoluteHeightReference,
@@ -30,7 +30,7 @@ import { mercatorToCartographic } from '../../math.js';
 import { is2DLayout } from '../../geometryHelpers.js';
 
 type FeatureCenterInfo = {
-  center: import('ol/coordinate.js').Coordinate;
+  center: Coordinate;
   greyOutZ: boolean;
   calculateHeight: boolean;
   offsetHeight: boolean;

package/src/util/editor/transformation/translateInteraction.ts

@@ -1,10 +1,10 @@
-import { Cartesian2, Plane, Scene, Transforms } from '@vcmap-cesium/engine';
+import type { Cartesian2, Scene } from '@vcmap-cesium/engine';
+import { Plane, Transforms } from '@vcmap-cesium/engine';
 import type { Coordinate } from 'ol/coordinate.js';
 import type { Feature } from 'ol/index.js';
 
-import AbstractInteraction, {
-  EventAfterEventHandler,
-} from '../../../interaction/abstractInteraction.js';
+import type { EventAfterEventHandler } from '../../../interaction/abstractInteraction.js';
+import AbstractInteraction from '../../../interaction/abstractInteraction.js';
 import { EventType } from '../../../interaction/interactionType.js';
 import { handlerSymbol } from '../editorSymbols.js';
 import {
@@ -15,12 +15,8 @@ import {
 import VcsEvent from '../../../vcsEvent.js';
 import Projection, { mercatorProjection } from '../../projection.js';
 import { cartographicToWgs84, mercatorToCartesian } from '../../math.js';
-import {
-  AxisAndPlanes,
-  is1DAxis,
-  is2DAxis,
-  TransformationHandler,
-} from './transformationTypes.js';
+import type { TransformationHandler } from './transformationTypes.js';
+import { AxisAndPlanes, is1DAxis, is2DAxis } from './transformationTypes.js';
 import CesiumMap from '../../../map/cesiumMap.js';
 
 /**
@@ -65,7 +61,7 @@ class TranslateInteraction extends AbstractInteraction {
       }
     } else if (
       event.type === EventType.DRAGSTART &&
-      (event?.feature as Feature)?.[handlerSymbol]
+      (event.feature as Feature | undefined)?.[handlerSymbol]
     ) {
       const axis = (event.feature as Feature)[handlerSymbol] as AxisAndPlanes;
       if (axis !== AxisAndPlanes.NONE) {

package/src/util/exclusiveManager.ts

@@ -5,7 +5,7 @@ import type { default as Layer, SplitLayer } from '../layer/layer.js';
  * Tracks layer exclusivity, added to every {@link LayerCollection}.
  */
 class ExclusiveManager {
-  layers: Map<string | symbol, Set<Layer>> = new Map();
+  layers = new Map<string | symbol, Set<Layer>>();
 
   /**
    * registers a Layer as Exclusive, the activation of a layer triggers the deactivation of all other exclusive Layers.

package/src/util/featureconverter/arcToCesium.ts

@@ -10,11 +10,9 @@ import {
   validateLineString,
   getGeometryOptions as getLineStringGeometryOptions,
 } from './lineStringToCesium.js';
-import {
-  mercatorToCartesianTransformerForHeightInfo,
-  VectorHeightInfo,
-} from './vectorHeightInfo.js';
-import {
+import type { VectorHeightInfo } from './vectorHeightInfo.js';
+import { mercatorToCartesianTransformerForHeightInfo } from './vectorHeightInfo.js';
+import type {
   PolylineGeometryOptions,
   VectorGeometryFactory,
 } from './vectorGeometryFactory.js';
@@ -37,7 +35,7 @@ function getGeometryOptions(
  * @param arcCoords - the coordinates of the arc to use instead of the geometries coordinates if height mode is absolute
  * @param altitudeMode
  */
-// eslint-disable-next-line import/prefer-default-export
+
 export function getArcGeometryFactory(
   arcCoords: Coordinate[],
   altitudeMode: HeightReference,

package/src/util/featureconverter/circleToCesium.ts

@@ -11,11 +11,9 @@ import {
   PolylineGeometry,
 } from '@vcmap-cesium/engine';
 import { parseNumber } from '@vcsuite/parsers';
-import {
-  mercatorToCartesianTransformerForHeightInfo,
-  VectorHeightInfo,
-} from './vectorHeightInfo.js';
-import {
+import type { VectorHeightInfo } from './vectorHeightInfo.js';
+import { mercatorToCartesianTransformerForHeightInfo } from './vectorHeightInfo.js';
+import type {
   CesiumGeometryOption,
   CircleGeometryOptions,
   VectorGeometryFactory,

package/src/util/featureconverter/clampedPrimitive.ts

@@ -1,12 +1,14 @@
+import type {
+  HeightReference,
+  Model,
+  Primitive,
+  Scene,
+} from '@vcmap-cesium/engine';
 import {
   Cartesian3,
   Cartographic,
   ClassificationPrimitive,
-  HeightReference,
   Matrix4,
-  Model,
-  Primitive,
-  Scene,
 } from '@vcmap-cesium/engine';
 import { mercatorToCartographic } from '../math.js';
 
@@ -76,7 +78,6 @@ function getUpdateClassificationHeightCallback(
   };
 }
 
-// eslint-disable-next-line import/prefer-default-export
 export function setupClampedPrimitive(
   scene: Scene,
   primitive: Primitive | Model | ClassificationPrimitive,

package/src/util/featureconverter/convert.ts

@@ -8,13 +8,11 @@ import {
   MultiLineString,
   MultiPolygon,
 } from 'ol/geom.js';
+import type { Model, Primitive, Scene } from '@vcmap-cesium/engine';
 import {
   ClassificationPrimitive,
   GroundPolylinePrimitive,
   GroundPrimitive,
-  Model,
-  Primitive,
-  Scene,
 } from '@vcmap-cesium/engine';
 import Style, { type StyleLike } from 'ol/style/Style.js';
 import type { Feature } from 'ol/index.js';
@@ -25,25 +23,26 @@ import {
   getArrowHeadPrimitives,
   getLineStringGeometryFactory,
 } from './lineStringToCesium.js';
-import {
-  BillboardOptions,
-  getPointPrimitives,
-  LabelOptions,
-  validatePoint,
-} from './pointToCesium.js';
+import type { BillboardOptions, LabelOptions } from './pointToCesium.js';
+import { getPointPrimitives, validatePoint } from './pointToCesium.js';
 import { getArcGeometryFactory } from './arcToCesium.js';
 import { featureArcStruct } from '../../style/arcStyle.js';
-import VectorProperties from '../../layer/vectorProperties.js';
+import type VectorProperties from '../../layer/vectorProperties.js';
 import { setupClampedPrimitive } from './clampedPrimitive.js';
+import type {
+  RelativeHeightReference,
+  VectorHeightInfo,
+} from './vectorHeightInfo.js';
 import {
   getHeightInfo,
   isClampedHeightReference,
   isRelativeHeightReference,
-  RelativeHeightReference,
-  VectorHeightInfo,
 } from './vectorHeightInfo.js';
-import {
+import type {
   CesiumGeometryOption,
+  VectorGeometryFactory,
+} from './vectorGeometryFactory.js';
+import {
   createClassificationPrimitiveItem,
   createGroundLinePrimitiveItem,
   createGroundPrimitiveItem,
@@ -51,7 +50,6 @@ import {
   createOutlinePrimitiveItem,
   createSolidPrimitiveItem,
   getCesiumGeometriesOptions,
-  VectorGeometryFactory,
 } from './vectorGeometryFactory.js';
 import ArrowStyle from '../../style/arrowStyle.js';
 
@@ -72,16 +70,16 @@ export type ConvertedItem<T extends ConvertedItemType = ConvertedItemType> =
         autoScale?: boolean;
       }
     : T extends 'billboard'
-    ? {
-        type: T;
-        item: BillboardOptions;
-      }
-    : T extends 'label'
-    ? {
-        type: T;
-        item: LabelOptions;
-      }
-    : never;
+      ? {
+          type: T;
+          item: BillboardOptions;
+        }
+      : T extends 'label'
+        ? {
+            type: T;
+            item: LabelOptions;
+          }
+        : never;
 
 type SingleGeometry = Point | Polygon | LineString | Circle;
 

package/src/util/featureconverter/extent3D.ts

@@ -7,15 +7,15 @@ import type {
 } from 'ol/geom.js';
 import type { Extent } from 'ol/extent.js';
 import type { Coordinate } from 'ol/coordinate.js';
-import { HeightReference } from '@vcmap-cesium/engine';
+import type { HeightReference } from '@vcmap-cesium/engine';
 
-import { VectorHeightInfo } from './vectorHeightInfo.js';
+import type { VectorHeightInfo } from './vectorHeightInfo.js';
 
 class Extent3D {
   static fromArray(
     array: [number, number, number, number, number, number],
   ): Extent3D {
-    check(array as [number, number, number, number, number, number], [Number]);
+    check(array, [Number]);
     check(array.length, 6);
     return new Extent3D(
       array[0],

package/src/util/featureconverter/lineStringToCesium.ts

@@ -1,11 +1,10 @@
+import type { HeightReference, Scene } from '@vcmap-cesium/engine';
 import {
   WallGeometry,
   WallOutlineGeometry,
   GroundPolylineGeometry,
   PolylineGeometry,
   Math as CesiumMath,
-  HeightReference,
-  type Scene,
   Cartesian3,
 } from '@vcmap-cesium/engine';
 import { Feature } from 'ol';
@@ -14,19 +13,20 @@ import type { Coordinate } from 'ol/coordinate.js';
 import type { Style } from 'ol/style.js';
 
 import { parseNumber } from '@vcsuite/parsers';
-import ArrowStyle, { ArrowEnd } from '../../style/arrowStyle.js';
+import type ArrowStyle from '../../style/arrowStyle.js';
+import { ArrowEnd } from '../../style/arrowStyle.js';
 import { getCartesianBearing, getCartesianPitch } from '../math.js';
 import { getPrimitiveOptions } from './pointHelpers.js';
 import type VectorProperties from '../../layer/vectorProperties.js';
-import { getWgs84CoordinatesForPoint } from './pointToCesium.js';
-import { ConvertedItem } from './convert.js';
+import type { ConvertedItem } from './convert.js';
+import type { VectorHeightInfo } from './vectorHeightInfo.js';
 import {
+  getWgs84CoordinatesForPoint,
   getHeightInfo,
-  VectorHeightInfo,
   mercatorToCartesianTransformerForHeightInfo,
   isAbsoluteHeightReference,
 } from './vectorHeightInfo.js';
-import {
+import type {
   CesiumGeometryOption,
   PolylineGeometryOptions,
   VectorGeometryFactory,

package/src/util/featureconverter/pointHelpers.ts

@@ -1,3 +1,4 @@
+import type { HeightReference, Scene } from '@vcmap-cesium/engine';
 import {
   BoxGeometry,
   BoxOutlineGeometry,
@@ -11,7 +12,6 @@ import {
   EllipsoidOutlineGeometry,
   GeometryInstance,
   HeadingPitchRoll,
-  HeightReference,
   Material,
   MaterialAppearance,
   Matrix4,
@@ -19,7 +19,6 @@ import {
   ModelAnimationLoop,
   PerInstanceColorAppearance,
   Primitive,
-  type Scene,
   SphereGeometry,
   SphereOutlineGeometry,
   Transforms,
@@ -27,24 +26,24 @@ import {
 import type { Feature } from 'ol/index.js';
 import { RegularShape, type Style } from 'ol/style.js';
 import { asColorLike } from 'ol/colorlike.js';
-import { Coordinate } from 'ol/coordinate.js';
-import { createSync } from '../../layer/vectorSymbols.js';
-import VectorProperties, {
+import type { Coordinate } from 'ol/coordinate.js';
+import { createSync, scaleSymbol } from '../../layer/vectorSymbols.js';
+import type { VectorPropertiesPrimitiveOptions } from '../../layer/vectorProperties.js';
+import type VectorProperties from '../../layer/vectorProperties.js';
+import {
   PrimitiveOptionsType,
   vectorPropertiesOfType,
-  VectorPropertiesPrimitiveOptions,
 } from '../../layer/vectorProperties.js';
 import { getCesiumColor } from '../../style/styleHelpers.js';
 import ModelFill from '../../style/modelFill.js';
-import { ColorType } from '../../style/vectorStyleItem.js';
+import type { ColorType } from '../../style/vectorStyleItem.js';
 import { wgs84ToCartographic } from '../math.js';
-import { ConvertedItem } from './convert.js';
-import {
-  isRelativeHeightReference,
+import type { ConvertedItem } from './convert.js';
+import type {
   RelativeHeightReference,
   VectorHeightInfo,
 } from './vectorHeightInfo.js';
-import { scaleSymbol } from '../../layer/cesium/vectorContext.js';
+import { isRelativeHeightReference } from './vectorHeightInfo.js';
 
 function makeOffsetAutoScalePrimitive(
   primitive: Primitive | Model,

package/src/util/featureconverter/pointToCesium.ts

@@ -1,14 +1,16 @@
+import type {
+  Billboard,
+  HeightReference,
+  Label,
+  Scene,
+} from '@vcmap-cesium/engine';
 import {
+  Cartesian2,
   Cartesian3,
   Color,
-  HeightReference,
-  VerticalOrigin,
-  Cartesian2,
-  LabelStyle,
   HorizontalOrigin,
-  type Scene,
-  Billboard,
-  Label,
+  LabelStyle,
+  VerticalOrigin,
 } from '@vcmap-cesium/engine';
 import { Icon, type Style } from 'ol/style.js';
 import type { Coordinate } from 'ol/coordinate.js';
@@ -20,16 +22,18 @@ import { parseNumber } from '@vcsuite/parsers';
 import { createLineGeometries } from './lineStringToCesium.js';
 import { getCesiumColor } from '../../style/styleHelpers.js';
 import { getModelOrPointPrimitiveOptions } from './pointHelpers.js';
-import VectorProperties from '../../layer/vectorProperties.js';
+import type VectorProperties from '../../layer/vectorProperties.js';
 import type { ColorType } from '../../style/vectorStyleItem.js';
-import { ConvertedItem } from './convert.js';
-import {
-  isClampedHeightReference,
-  mercatorToWgs84TransformerForHeightInfo,
+import type { ConvertedItem } from './convert.js';
+import type {
   RelativeHeightReference,
   VectorHeightInfo,
 } from './vectorHeightInfo.js';
-import { CesiumGeometryOption } from './vectorGeometryFactory.js';
+import {
+  getWgs84CoordinatesForPoint,
+  isClampedHeightReference,
+} from './vectorHeightInfo.js';
+import type { CesiumGeometryOption } from './vectorGeometryFactory.js';
 
 export type BillboardOptions = Billboard.ConstructorOptions;
 
@@ -57,7 +61,7 @@ export function getBillboardOptions(
               resolve(imageStyle.getImage(1));
               imageStyle.unlistenImageChange(imageChangeListener);
             } else if (imageStyle.getImageState() === ImageState.ERROR) {
-              reject();
+              reject(new Error('Image could not be loaded'));
               imageStyle.unlistenImageChange(imageChangeListener);
             }
           };
@@ -231,36 +235,6 @@ export function getLineGeometries(
   return createLineGeometries({ positions: linePositions }, heightInfo, style);
 }
 
-/**
- * Sets the correct height on the wgs84Coords depending on the height info
- * @param geometry
- * @param heightInfo
- */
-export function getWgs84CoordinatesForPoint(
-  geometry: Point,
-  heightInfo: VectorHeightInfo,
-): Coordinate {
-  const transformer = mercatorToWgs84TransformerForHeightInfo(heightInfo);
-  const wgs84Coords = transformer(geometry.getCoordinates());
-  if (!isClampedHeightReference(heightInfo.heightReference)) {
-    // points get rendered at the top of the extrusion. we must add this to the Z value
-    const extrusionHeight = (
-      heightInfo as VectorHeightInfo<
-        RelativeHeightReference | HeightReference.NONE
-      >
-    ).storeyHeightsAboveGround.reduce(
-      (sum, currentValue) => sum + currentValue,
-      0,
-    );
-
-    if (extrusionHeight) {
-      wgs84Coords[2] += extrusionHeight;
-    }
-  }
-
-  return wgs84Coords;
-}
-
 export async function getPointPrimitives(
   feature: Feature,
   geometry: Point,

package/src/util/featureconverter/polygonToCesium.ts

@@ -10,11 +10,9 @@ import {
 import type { Style } from 'ol/style.js';
 import type { Polygon } from 'ol/geom.js';
 import { parseNumber } from '@vcsuite/parsers';
-import {
-  mercatorToCartesianTransformerForHeightInfo,
-  VectorHeightInfo,
-} from './vectorHeightInfo.js';
-import {
+import type { VectorHeightInfo } from './vectorHeightInfo.js';
+import { mercatorToCartesianTransformerForHeightInfo } from './vectorHeightInfo.js';
+import type {
   CesiumGeometryOption,
   PolygonGeometryOptions,
   PolylineGeometryOptions,

package/src/util/featureconverter/storeyHelpers.ts

@@ -1,5 +1,5 @@
-import { HeightReference } from '@vcmap-cesium/engine';
-import {
+import type { HeightReference } from '@vcmap-cesium/engine';
+import type {
   RelativeHeightReference,
   VectorHeightInfo,
 } from './vectorHeightInfo.js';

package/src/util/featureconverter/vectorGeometryFactory.ts

@@ -1,7 +1,7 @@
 import type { Feature } from 'ol';
 import type { Fill, Style } from 'ol/style.js';
 import { getBottomLeft } from 'ol/extent.js';
-import { Circle, LineString, Polygon } from 'ol/geom.js';
+import type { Circle, LineString, Polygon } from 'ol/geom.js';
 import {
   Cartesian3,
   type CircleGeometry,
@@ -33,13 +33,15 @@ import type VectorProperties from '../../layer/vectorProperties.js';
 import type { ConvertedItem } from './convert.js';
 import { getCesiumColor } from '../../style/styleHelpers.js';
 import { createSync } from '../../layer/vectorSymbols.js';
+import type {
+  RelativeHeightReference,
+  VectorHeightInfo,
+} from './vectorHeightInfo.js';
 import {
   getGeometryHeight,
   isClampedHeightReference,
-  RelativeHeightReference,
-  VectorHeightInfo,
 } from './vectorHeightInfo.js';
-import { ColorType } from '../../style/vectorStyleItem.js';
+import type { ColorType } from '../../style/vectorStyleItem.js';
 import { getStoreyOptions } from './storeyHelpers.js';
 
 export type PolygonGeometryOptions = ConstructorParameters<
@@ -60,19 +62,19 @@ type GeometryOptionsForFactoryType<T extends GeometryFactoryType> =
   T extends 'polygon'
     ? PolygonGeometryOptions
     : T extends 'lineString' | 'arc'
-    ? PolylineGeometryOptions
-    : T extends 'circle'
-    ? CircleGeometryOptions
-    : never;
+      ? PolylineGeometryOptions
+      : T extends 'circle'
+        ? CircleGeometryOptions
+        : never;
 
 export type GeometryForFactoryType<T extends GeometryFactoryType> =
   T extends 'polygon'
     ? Polygon
     : T extends 'lineString' | 'arc'
-    ? LineString
-    : T extends 'circle'
-    ? Circle
-    : never;
+      ? LineString
+      : T extends 'circle'
+        ? Circle
+        : never;
 
 export type VectorGeometryFactory<
   T extends GeometryFactoryType = GeometryFactoryType,
@@ -131,33 +133,33 @@ export type CesiumGeometryOption<
       heightInfo: VectorHeightInfo;
     }
   : T extends 'fill'
-  ? {
-      type: T;
-      geometry: PolygonGeometry | CircleGeometry;
-      heightInfo: VectorHeightInfo;
-    }
-  : T extends 'outline'
-  ? {
-      type: T;
-      geometry:
-        | PolygonOutlineGeometry
-        | WallOutlineGeometry
-        | CircleOutlineGeometry;
-      heightInfo: VectorHeightInfo;
-    }
-  : T extends 'line'
-  ? {
-      type: T;
-      geometry: PolylineGeometry;
-      heightInfo: VectorHeightInfo;
-    }
-  : T extends 'groundLine'
-  ? {
-      type: T;
-      geometry: GroundPolylineGeometry;
-      heightInfo: VectorHeightInfo;
-    }
-  : never;
+    ? {
+        type: T;
+        geometry: PolygonGeometry | CircleGeometry;
+        heightInfo: VectorHeightInfo;
+      }
+    : T extends 'outline'
+      ? {
+          type: T;
+          geometry:
+            | PolygonOutlineGeometry
+            | WallOutlineGeometry
+            | CircleOutlineGeometry;
+          heightInfo: VectorHeightInfo;
+        }
+      : T extends 'line'
+        ? {
+            type: T;
+            geometry: PolylineGeometry;
+            heightInfo: VectorHeightInfo;
+          }
+        : T extends 'groundLine'
+          ? {
+              type: T;
+              geometry: GroundPolylineGeometry;
+              heightInfo: VectorHeightInfo;
+            }
+          : never;
 
 export function getMaterialAppearance(
   scene: Scene,