@vcmap/core 6.0.0-rc.4 → 6.0.0-rc.6

package/dist/src/util/featureconverter/arcToCesium.js

@@ -1,60 +1,33 @@
-import { ArcType, Cartesian3, HeightReference, } from '@vcmap-cesium/engine';
-import Projection from '../projection.js';
-import { addPrimitivesToContext } from './featureconverterHelper.js';
-import { createFillGeometries, createGroundLineGeometries, createLineGeometries, createOutlineGeometries, createSolidGeometries, validateLineString, getCoordinates as getLineStringCoordinates, getGeometryOptions as getLineStringGeometryOptions, addArrowsToContext, } from './lineStringToCesium.js';
-import { featureArcStruct } from '../../style/arcStyle.js';
+import { ArcType, HeightReference } from '@vcmap-cesium/engine';
+import { createGroundLineGeometries, createLineGeometries, createOutlineGeometries, createSolidGeometries, validateLineString, getGeometryOptions as getLineStringGeometryOptions, } from './lineStringToCesium.js';
+import { mercatorToCartesianTransformerForHeightInfo, } from './vectorHeightInfo.js';
 /**
  * Creates the positions & arcType option for the PolylineGeometry
  */
-export function getGeometryOptions(coords, _geometry, positionHeightAdjustment, perPositionHeight, groundLevelOrMinHeight) {
-    const positions = coords.map((coord) => {
-        const wgs84Coords = Projection.mercatorToWgs84(coord);
-        if (!perPositionHeight && groundLevelOrMinHeight) {
-            wgs84Coords[2] = groundLevelOrMinHeight;
-        }
-        else if (wgs84Coords[2] != null) {
-            wgs84Coords[2] += positionHeightAdjustment;
-        }
-        return Cartesian3.fromDegrees(wgs84Coords[0], wgs84Coords[1], wgs84Coords[2]);
-    });
+function getGeometryOptions(coords, _geometry, heightInfo) {
+    const coordinateTransformer = mercatorToCartesianTransformerForHeightInfo(heightInfo);
+    const positions = coords.map(coordinateTransformer);
     return { positions, arcType: ArcType.NONE };
 }
 /**
- * In this special case, the coordinates are not taken from the geometries array
+ * @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 no-unused-vars
-export function getCoordinates(coords, _geometries) {
-    return coords;
-}
-/**
- * @param  arcCoords - the coordinates of the arc to use instead of the geometries coordinates if height mode is absolute
- */
-function getGeometryFactory(arcCoords, altitudeMode) {
+// eslint-disable-next-line import/prefer-default-export
+export function getArcGeometryFactory(arcCoords, altitudeMode) {
     return {
-        getCoordinates: altitudeMode === HeightReference.NONE
-            ? getCoordinates.bind(null, arcCoords)
-            : getLineStringCoordinates,
+        type: 'arc',
         getGeometryOptions: altitudeMode === HeightReference.NONE
             ? getGeometryOptions.bind(null, arcCoords)
             : getLineStringGeometryOptions,
         createSolidGeometries,
         createOutlineGeometries,
-        createFillGeometries,
+        createFillGeometries() {
+            return [];
+        },
         createGroundLineGeometries,
         createLineGeometries,
+        validateGeometry: validateLineString,
     };
 }
-/**
- * converts a linestring with an ArcStyle to a a cesium primitive
- */
-export default async function arcToCesium(feature, style, geometries, vectorProperties, scene, context) {
-    if (!style.getFill() && !style.getStroke()) {
-        return;
-    }
-    const altitudeMode = vectorProperties.getAltitudeMode(feature);
-    const arcGeometryFactory = getGeometryFactory(feature[featureArcStruct].coordinates, altitudeMode);
-    const validGeometries = geometries.filter((lineString) => validateLineString(lineString));
-    addPrimitivesToContext(feature, style, validGeometries, vectorProperties, scene, arcGeometryFactory, context);
-    await addArrowsToContext(feature, style, validGeometries, vectorProperties, scene, arcGeometryFactory, context); // IDEA what about labels?
-}
 //# sourceMappingURL=arcToCesium.js.map

package/dist/src/util/featureconverter/arcToCesium.js.map

@@ -1 +1 @@
-{"version":3,"file":"arcToCesium.js","sourceRoot":"","sources":["../../../../src/util/featureconverter/arcToCesium.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"arcToCesium.js","sourceRoot":"","sources":["../../../../src/util/featureconverter/arcToCesium.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAIhE,OAAO,EACL,0BAA0B,EAC1B,oBAAoB,EACpB,uBAAuB,EACvB,qBAAqB,EACrB,kBAAkB,EAClB,kBAAkB,IAAI,4BAA4B,GACnD,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,2CAA2C,GAE5C,MAAM,uBAAuB,CAAC;AAM/B;;GAEG;AACH,SAAS,kBAAkB,CACzB,MAAoB,EACpB,SAAqB,EACrB,UAA4B;IAE5B,MAAM,qBAAqB,GACzB,2CAA2C,CAAC,UAAU,CAAC,CAAC;IAC1D,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;IACpD,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC;AAC9C,CAAC;AAED;;;GAGG;AACH,wDAAwD;AACxD,MAAM,UAAU,qBAAqB,CACnC,SAAuB,EACvB,YAA6B;IAE7B,OAAO;QACL,IAAI,EAAE,KAAK;QACX,kBAAkB,EAChB,YAAY,KAAK,eAAe,CAAC,IAAI;YACnC,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC;YAC1C,CAAC,CAAC,4BAA4B;QAClC,qBAAqB;QACrB,uBAAuB;QACvB,oBAAoB;YAClB,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,0BAA0B;QAC1B,oBAAoB;QACpB,gBAAgB,EAAE,kBAAkB;KACrC,CAAC;AACJ,CAAC"}

package/dist/src/util/featureconverter/circleToCesium.d.ts

@@ -1,32 +1,7 @@
-import type { Style } from 'ol/style.js';
 import type { Circle } from 'ol/geom.js';
-import type { Coordinate } from 'ol/coordinate.js';
-import type { Feature } from 'ol/index.js';
-import { Cartesian3, CircleGeometry, GroundPolylineGeometry, CircleOutlineGeometry, PolylineGeometry, type Scene } from '@vcmap-cesium/engine';
-import type VectorProperties from '../../layer/vectorProperties.js';
-import type { AsyncCesiumVectorContext } from '../../layer/cesium/vectorContext.js';
-export declare function createSolidGeometries(options: ConstructorParameters<typeof CircleGeometry>[0], height: number, _perPositionHeight: boolean, extrudedHeight?: number): CircleGeometry[];
-export declare function createOutlineGeometries(options: ConstructorParameters<typeof CircleGeometry>[0], height: number, _perPositionHeight: boolean, extrudedHeight?: number): CircleOutlineGeometry[];
-export declare function createFillGeometries(options: ConstructorParameters<typeof CircleGeometry>[0], height: number, perPositionHeight: boolean): CircleGeometry[];
-export declare function getLineGeometryOptions(options: ConstructorParameters<typeof CircleGeometry>[0], style: Style): {
-    width: number;
-    positions: Cartesian3[];
-};
-export declare function createGroundLineGeometries(options: ConstructorParameters<typeof CircleGeometry>[0], style: Style): GroundPolylineGeometry[];
-export declare function createLineGeometries(options: ConstructorParameters<typeof CircleGeometry>[0], style: Style): PolylineGeometry[];
-/**
- * extracts the center and radius from the CircleGeometry and converts it to Cartesian3/radius in m
- * @param  geometry
- * @param  positionHeightAdjustment
- * @param  perPositionHeight
- * @param  groundLevelOrMinHeight
- * @returns
- * @private
- */
-export declare function getGeometryOptions(geometry: Circle, positionHeightAdjustment: number, perPositionHeight: boolean, groundLevelOrMinHeight: number): ConstructorParameters<typeof CircleGeometry>[0];
-export declare function getCoordinates(geometries: Circle[]): Coordinate[];
+import { VectorGeometryFactory } from './vectorGeometryFactory.js';
 /**
  * validates if a point is renderable
  */
 export declare function validateCircle(circle: Circle): boolean;
-export default function circleToCesium(feature: Feature, style: Style, geometries: Circle[], vectorProperties: VectorProperties, scene: Scene, context: AsyncCesiumVectorContext): void;
+export declare function getCircleGeometryFactory(): VectorGeometryFactory<'circle'>;

package/dist/src/util/featureconverter/circleToCesium.js

@@ -1,32 +1,62 @@
 import { circular } from 'ol/geom/Polygon.js';
 import { Cartesian3, CircleGeometry, GroundPolylineGeometry, CircleOutlineGeometry, Math as CesiumMath, Cartographic, PolylineGeometry, } from '@vcmap-cesium/engine';
 import { parseNumber } from '@vcsuite/parsers';
-import { addPrimitivesToContext } from './featureconverterHelper.js';
-import Projection from '../projection.js';
-export function createSolidGeometries(options, height, _perPositionHeight, extrudedHeight) {
+import { mercatorToCartesianTransformerForHeightInfo, } from './vectorHeightInfo.js';
+function createCircleGeometry(options, height, perPositionHeight, extrudedHeight) {
+    const geometryOptions = {
+        ...options,
+        granularity: 0.02,
+        extrudedHeight,
+    };
+    if (!perPositionHeight) {
+        geometryOptions.height = height;
+    }
+    else {
+        const cartographic = Cartographic.fromCartesian(options.center);
+        geometryOptions.height = cartographic.height;
+    }
+    return new CircleGeometry(geometryOptions);
+}
+function createSolidGeometries(options, heightInfo, height, perPositionHeight, extrudedHeight) {
     return [
-        new CircleGeometry({
-            ...options,
-            height,
-            granularity: 0.02,
-            extrudedHeight,
-        }),
+        {
+            type: 'solid',
+            geometry: createCircleGeometry(options, height, perPositionHeight, extrudedHeight),
+            heightInfo,
+        },
     ];
 }
-export function createOutlineGeometries(options, height, _perPositionHeight, extrudedHeight) {
+function createOutlineGeometries(options, heightInfo, height, perPositionHeight, extrudedHeight) {
+    const geometryOptions = {
+        ...options,
+        granularity: 0.02,
+        extrudedHeight,
+    };
+    if (!perPositionHeight) {
+        geometryOptions.height = height;
+    }
+    else {
+        const cartographic = Cartographic.fromCartesian(options.center);
+        geometryOptions.height = cartographic.height;
+    }
     return [
-        new CircleOutlineGeometry({
-            ...options,
-            height,
-            extrudedHeight,
-            granularity: 0.02,
-        }),
+        {
+            type: 'outline',
+            geometry: new CircleOutlineGeometry(geometryOptions),
+            heightInfo,
+        },
     ];
 }
-export function createFillGeometries(options, height, perPositionHeight) {
-    return createSolidGeometries(options, height, perPositionHeight, undefined);
+function createFillGeometries(options, heightInfo, height, perPositionHeight) {
+    return [
+        {
+            type: 'fill',
+            geometry: createCircleGeometry(options, height, perPositionHeight),
+            heightInfo,
+        },
+    ];
 }
-export function getLineGeometryOptions(options, style) {
+function getLineGeometryOptions(options, style) {
     const width = parseNumber(style.getStroke()?.getWidth(), 1.0);
     const { center, radius } = options;
     const cartographic = Cartographic.fromCartesian(center);
@@ -45,39 +75,42 @@ export function getLineGeometryOptions(options, style) {
         width,
     };
 }
-export function createGroundLineGeometries(options, style) {
+function createGroundLineGeometries(options, heightInfo, style) {
     const lineOptions = getLineGeometryOptions(options, style);
-    return [new GroundPolylineGeometry(lineOptions)];
+    return [
+        {
+            type: 'groundLine',
+            geometry: new GroundPolylineGeometry(lineOptions),
+            heightInfo,
+        },
+    ];
 }
-export function createLineGeometries(options, style) {
+function createLineGeometries(options, heightInfo, style) {
     const lineOptions = getLineGeometryOptions(options, style);
-    return [new PolylineGeometry(lineOptions)];
+    return [
+        {
+            type: 'line',
+            geometry: new PolylineGeometry(lineOptions),
+            heightInfo,
+        },
+    ];
 }
 /**
  * extracts the center and radius from the CircleGeometry and converts it to Cartesian3/radius in m
  * @param  geometry
- * @param  positionHeightAdjustment
- * @param  perPositionHeight
- * @param  groundLevelOrMinHeight
+ * @param heightInfo
  * @returns
  * @private
  */
-export function getGeometryOptions(geometry, positionHeightAdjustment, perPositionHeight, groundLevelOrMinHeight) {
+function getGeometryOptions(geometry, heightInfo) {
     // olCoordinates of center and radius in WGS84
     const olCenter = geometry.getCenter();
     const olPoint = olCenter.slice();
     olPoint[0] += geometry.getRadius();
-    const wgs84Center = Projection.mercatorToWgs84(olCenter, true);
-    if (!perPositionHeight && groundLevelOrMinHeight) {
-        wgs84Center[2] = groundLevelOrMinHeight;
-    }
-    else if (wgs84Center[2] != null) {
-        wgs84Center[2] += positionHeightAdjustment;
-    }
-    const wgs84Point = Projection.mercatorToWgs84(olPoint, true);
+    const coordinateTransformer = mercatorToCartesianTransformerForHeightInfo(heightInfo);
     // Cesium coordinates of center and radius
-    const center = Cartesian3.fromDegrees(wgs84Center[0], wgs84Center[1], wgs84Center[2]);
-    const point = Cartesian3.fromDegrees(wgs84Point[0], wgs84Point[1], wgs84Center[2]);
+    const center = coordinateTransformer(olCenter);
+    const point = coordinateTransformer(olPoint);
     // Computation of radius in Cesium 3D
     const radius = Cartesian3.distance(center, point);
     return {
@@ -85,26 +118,6 @@ export function getGeometryOptions(geometry, positionHeightAdjustment, perPositi
         center,
     };
 }
-export function getCoordinates(geometries) {
-    return geometries.map((circle) => {
-        return circle.getCenter();
-    });
-}
-let geometryFactory = null;
-function getGeometryFactory() {
-    if (!geometryFactory) {
-        geometryFactory = {
-            getCoordinates,
-            getGeometryOptions,
-            createSolidGeometries,
-            createOutlineGeometries,
-            createFillGeometries,
-            createGroundLineGeometries,
-            createLineGeometries,
-        };
-    }
-    return geometryFactory;
-}
 /**
  * validates if a point is renderable
  */
@@ -122,12 +135,20 @@ export function validateCircle(circle) {
     }
     return false;
 }
-export default function circleToCesium(feature, style, geometries, vectorProperties, scene, context) {
-    if (!style.getFill() && !style.getStroke()) {
-        return;
+let geometryFactory;
+export function getCircleGeometryFactory() {
+    if (!geometryFactory) {
+        geometryFactory = {
+            type: 'circle',
+            getGeometryOptions,
+            createSolidGeometries,
+            createOutlineGeometries,
+            createFillGeometries,
+            createGroundLineGeometries,
+            createLineGeometries,
+            validateGeometry: validateCircle,
+        };
     }
-    const circleGeometryFactory = getGeometryFactory();
-    const validGeometries = geometries.filter((circle) => validateCircle(circle));
-    addPrimitivesToContext(feature, style, validGeometries, vectorProperties, scene, circleGeometryFactory, context);
+    return geometryFactory;
 }
 //# sourceMappingURL=circleToCesium.js.map

package/dist/src/util/featureconverter/circleToCesium.js.map

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

package/dist/src/util/featureconverter/clampedPrimitive.d.ts

@@ -0,0 +1,2 @@
+import { HeightReference, Model, Primitive, Scene } from '@vcmap-cesium/engine';
+export declare function setupClampedPrimitive(scene: Scene, primitive: Primitive | Model, origin: [number, number], heightReference: HeightReference): void;

package/dist/src/util/featureconverter/clampedPrimitive.js

@@ -0,0 +1,29 @@
+import { Cartesian3, Cartographic, Matrix4, } from '@vcmap-cesium/engine';
+import { mercatorToCartographic } from '../math.js';
+const scratchUpdateHeightCartesian = new Cartesian3();
+function getUpdateHeightCallback(primitive, originalPosition) {
+    return function updatePrimitiveHeight(clampedPosition) {
+        Cartographic.toCartesian(clampedPosition, undefined, scratchUpdateHeightCartesian);
+        Cartesian3.subtract(scratchUpdateHeightCartesian, originalPosition, scratchUpdateHeightCartesian);
+        const { modelMatrix } = primitive;
+        primitive.modelMatrix = Matrix4.setTranslation(modelMatrix, scratchUpdateHeightCartesian, new Matrix4());
+    };
+}
+// eslint-disable-next-line import/prefer-default-export
+export function setupClampedPrimitive(scene, primitive, origin, heightReference) {
+    const destroy = primitive.destroy.bind(primitive);
+    const originCartographic = mercatorToCartographic(origin);
+    const callback = getUpdateHeightCallback(primitive, Cartographic.toCartesian(originCartographic));
+    const callbackHandler = scene.updateHeight(originCartographic, callback, heightReference);
+    const height = scene.getHeight(originCartographic, heightReference);
+    if (height) {
+        const updatedHeightCarto = originCartographic.clone();
+        updatedHeightCarto.height = height;
+        callback(updatedHeightCarto);
+    }
+    primitive.destroy = () => {
+        callbackHandler();
+        destroy();
+    };
+}
+//# sourceMappingURL=clampedPrimitive.js.map

package/dist/src/util/featureconverter/clampedPrimitive.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"clampedPrimitive.js","sourceRoot":"","sources":["../../../../src/util/featureconverter/clampedPrimitive.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,YAAY,EAEZ,OAAO,GAIR,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;AAEpD,MAAM,4BAA4B,GAAG,IAAI,UAAU,EAAE,CAAC;AAEtD,SAAS,uBAAuB,CAC9B,SAA4B,EAC5B,gBAA4B;IAE5B,OAAO,SAAS,qBAAqB,CAAC,eAA6B;QACjE,YAAY,CAAC,WAAW,CACtB,eAAe,EACf,SAAS,EACT,4BAA4B,CAC7B,CAAC;QAEF,UAAU,CAAC,QAAQ,CACjB,4BAA4B,EAC5B,gBAAgB,EAChB,4BAA4B,CAC7B,CAAC;QAEF,MAAM,EAAE,WAAW,EAAE,GAAG,SAAS,CAAC;QAClC,SAAS,CAAC,WAAW,GAAG,OAAO,CAAC,cAAc,CAC5C,WAAW,EACX,4BAA4B,EAC5B,IAAI,OAAO,EAAE,CACd,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAED,wDAAwD;AACxD,MAAM,UAAU,qBAAqB,CACnC,KAAY,EACZ,SAA4B,EAC5B,MAAwB,EACxB,eAAgC;IAEhC,MAAM,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAClD,MAAM,kBAAkB,GAAG,sBAAsB,CAAC,MAAM,CAAC,CAAC;IAC1D,MAAM,QAAQ,GAAG,uBAAuB,CACtC,SAAS,EACT,YAAY,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAC7C,CAAC;IACF,MAAM,eAAe,GAAG,KAAK,CAAC,YAAY,CACxC,kBAAkB,EAClB,QAAQ,EACR,eAAe,CAChB,CAAC;IAEF,MAAM,MAAM,GAAG,KAAK,CAAC,SAAS,CAAC,kBAAkB,EAAE,eAAe,CAAC,CAAC;IACpE,IAAI,MAAM,EAAE;QACV,MAAM,kBAAkB,GAAG,kBAAkB,CAAC,KAAK,EAAE,CAAC;QACtD,kBAAkB,CAAC,MAAM,GAAG,MAAM,CAAC;QACnC,QAAQ,CAAC,kBAAkB,CAAC,CAAC;KAC9B;IAED,SAAS,CAAC,OAAO,GAAG,GAAS,EAAE;QAC7B,eAAe,EAAE,CAAC;QAClB,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC;AACJ,CAAC"}

package/dist/src/util/featureconverter/convert.d.ts

@@ -1,16 +1,35 @@
-import type { 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';
-import type VectorProperties from '../../layer/vectorProperties.js';
-import type { AsyncCesiumVectorContext } from '../../layer/cesium/vectorContext.js';
+import { BillboardOptions, LabelOptions } from './pointToCesium.js';
+import VectorProperties from '../../layer/vectorProperties.js';
+export type PrimitiveType = Primitive | GroundPrimitive | GroundPolylinePrimitive | ClassificationPrimitive | Model;
+export type ConvertedItemType = 'primitive' | 'billboard' | 'label';
+export type ConvertedItem<T extends ConvertedItemType = ConvertedItemType> = T extends 'primitive' ? {
+    type: T;
+    item: PrimitiveType;
+    autoScale?: boolean;
+} : T extends 'billboard' ? {
+    type: T;
+    item: BillboardOptions;
+} : T extends 'label' ? {
+    type: T;
+    item: LabelOptions;
+} : never;
 export declare function getStylesArray(style: StyleLike, feature: Feature, resolution?: number): Style[];
 /**
- * function to convert a feature to an array of Cesium.Primitives given a style and default properties. the resulting primitives
- * must be added to the modules collections here
+ * Converts a feature and all its associated geometries to items which can be added to
+ * cesium collections directly: Primitives, BillboardOptions or LabelOptions. This is
+ * an internal API, typically it is enough to simple use a `VectorLayer` to handle conversions for you.
+ * 1. All styles provided by the style like are flattened.
+ * 2. All single OL geometries which should be rendered with each style are extracted
+ * 3. Cesium geometry options are extracted from each OL geometry based on the geometry, feature & vector properties
+ * 4. Cesium geometries which can be batched into a single primitive (for instance, an extruded volume would have all its solids batched and all its outlines batched
+ *    In case of relativeTo* altitude modes, primitives are batched based _on the clamp origin_
+ * 5. The converted items are returned, typically to the vector context which called convert in the first place.
  * @param  feature
  * @param  style
  * @param  vectorProperties
- * @param  context
  * @param  scene
  */
-export default function convert(feature: Feature, style: StyleLike, vectorProperties: VectorProperties, context: AsyncCesiumVectorContext, scene: Scene): Promise<void>;
+export default function convert(feature: Feature, style: StyleLike, vectorProperties: VectorProperties, scene: Scene): Promise<ConvertedItem[]>;