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

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

@@ -1,15 +1,16 @@
-import { Cartesian3, WallGeometry, WallOutlineGeometry, GroundPolylineGeometry, PolylineGeometry, Math as CesiumMath, HeightReference, } from '@vcmap-cesium/engine';
+import { WallGeometry, WallOutlineGeometry, GroundPolylineGeometry, PolylineGeometry, Math as CesiumMath, Cartesian3, } from '@vcmap-cesium/engine';
 import { Feature } from 'ol';
 import { Point } from 'ol/geom.js';
 import { parseNumber } from '@vcsuite/parsers';
-import Projection from '../projection.js';
-import { addPrimitivesToContext } from './featureconverterHelper.js';
-import { getFlatCoordinatesFromSimpleGeometry } from '../geometryHelpers.js';
-import ArrowStyle, { ArrowEnd } from '../../style/arrowStyle.js';
+import { ArrowEnd } from '../../style/arrowStyle.js';
 import { getCartesianBearing, getCartesianPitch } from '../math.js';
 import { getPrimitiveOptions } from './pointHelpers.js';
+import { getWgs84CoordinatesForPoint } from './pointToCesium.js';
+import { getHeightInfo, mercatorToCartesianTransformerForHeightInfo, isAbsoluteHeightReference, } from './vectorHeightInfo.js';
 function getArrowOptions(from, to, heightReference) {
-    let pitch = heightReference === HeightReference.NONE ? getCartesianPitch(to, from) : 0;
+    let pitch = isAbsoluteHeightReference(heightReference)
+        ? getCartesianPitch(to, from)
+        : 0;
     pitch += 90;
     return {
         location: to,
@@ -17,128 +18,107 @@ function getArrowOptions(from, to, heightReference) {
         heading: CesiumMath.toDegrees(getCartesianBearing(from, to) + CesiumMath.PI_OVER_TWO),
     };
 }
-export async function addArrowsToContext(feature, style, validGeometries, vectorProperties, scene, lineGeometryFactory, context) {
+export function getArrowHeadPrimitives(feature, style, geometry, vectorProperties, scene, inputCoordinates) {
     if (style.end === ArrowEnd.NONE || !style.primitiveOptions?.geometryOptions) {
-        return;
+        return [];
     }
     const arrowOptions = [];
     const heightReference = vectorProperties.getAltitudeMode(feature);
-    validGeometries.forEach((geom) => {
-        const coordinates = lineGeometryFactory.getCoordinates([geom]);
-        if (style.end === ArrowEnd.START || style.end === ArrowEnd.BOTH) {
-            arrowOptions.push(getArrowOptions(coordinates[1], coordinates[0], heightReference));
-        }
-        if (style.end === ArrowEnd.END || style.end === ArrowEnd.BOTH) {
-            arrowOptions.push(getArrowOptions(coordinates.at(-2), coordinates.at(-1), heightReference));
-        }
-    });
+    const coordinates = inputCoordinates ?? geometry.getCoordinates();
+    if (style.end === ArrowEnd.START || style.end === ArrowEnd.BOTH) {
+        arrowOptions.push(getArrowOptions(coordinates[1], coordinates[0], heightReference));
+    }
+    if (style.end === ArrowEnd.END || style.end === ArrowEnd.BOTH) {
+        arrowOptions.push(getArrowOptions(coordinates.at(-2), coordinates.at(-1), heightReference));
+    }
     if (arrowOptions.length === 0) {
-        return;
+        return [];
     }
     const usedStyle = style.getOlcsStyle();
-    const allowPicking = vectorProperties.getAllowPicking(feature);
-    await Promise.all(arrowOptions.map(async (arrowOption) => {
+    return arrowOptions
+        .map((arrowOption) => {
+        const arrowHeadGeometry = new Point(arrowOption.location);
         const arrowFeature = new Feature({
             ...feature.getProperties(),
             olcs_primitiveOptions: style.primitiveOptions,
             olcs_modelHeading: arrowOption.heading,
             olcs_modelPitch: arrowOption.pitch,
-            geometry: new Point(arrowOption.location),
+            geometry: arrowHeadGeometry,
             olcs_modelAutoScale: true,
         });
-        const wgs84Position = Projection.mercatorToWgs84(arrowOption.location);
-        const cartesianLocation = Cartesian3.fromDegrees(wgs84Position[0], wgs84Position[1], wgs84Position[2]);
-        const primitiveOptions = await getPrimitiveOptions(arrowFeature, usedStyle, [wgs84Position], [cartesianLocation], vectorProperties, scene);
-        if (primitiveOptions?.primitives) {
-            context.addScaledPrimitives(primitiveOptions.primitives, feature, allowPicking);
-        }
-    }));
+        const heightInfo = getHeightInfo(arrowFeature, arrowHeadGeometry, vectorProperties);
+        const wgs84Coords = getWgs84CoordinatesForPoint(arrowHeadGeometry, heightInfo);
+        const position = Cartesian3.fromDegrees(wgs84Coords[0], wgs84Coords[1], wgs84Coords[2]);
+        return getPrimitiveOptions(arrowFeature, usedStyle, position, wgs84Coords, vectorProperties, scene, heightInfo);
+    })
+        .flat();
 }
-export function createSolidGeometries(options, height, perPositionHeight, extrudedHeight) {
+export function createSolidGeometries(options, heightInfo, height, perPositionHeight, extrudedHeight) {
     return [
-        WallGeometry.fromConstantHeights({
-            ...options,
-            maximumHeight: !perPositionHeight ? height : undefined,
-            minimumHeight: extrudedHeight,
-        }),
+        {
+            type: 'solid',
+            geometry: WallGeometry.fromConstantHeights({
+                ...options,
+                maximumHeight: !perPositionHeight ? height : undefined,
+                minimumHeight: extrudedHeight,
+            }),
+            heightInfo,
+        },
     ];
 }
-export function createOutlineGeometries(options, height, perPositionHeight, extrudedHeight) {
+export function createOutlineGeometries(options, heightInfo, height, perPositionHeight, extrudedHeight) {
     // maxium and minimum are flipped, to create the same perPositionHeight behaviour as in polygons
     // WallGeometries extrudes down instead of up, so we switch the behaviour and extrude in the other direction
     return [
-        WallOutlineGeometry.fromConstantHeights({
-            ...options,
-            maximumHeight: !perPositionHeight ? height : undefined,
-            minimumHeight: extrudedHeight,
-        }),
+        {
+            type: 'outline',
+            geometry: WallOutlineGeometry.fromConstantHeights({
+                ...options,
+                maximumHeight: !perPositionHeight ? height : undefined,
+                minimumHeight: extrudedHeight,
+            }),
+            heightInfo,
+        },
     ];
 }
-export function createFillGeometries(_options, _height, _perPositionHeight) {
-    return [];
-}
-export function createGroundLineGeometries(options, style) {
+export function createGroundLineGeometries(options, heightInfo, style) {
     const width = parseNumber(style.getStroke().getWidth(), 1.0);
     return [
-        new GroundPolylineGeometry({
-            ...options,
-            width,
-        }),
+        {
+            type: 'groundLine',
+            geometry: new GroundPolylineGeometry({
+                ...options,
+                width,
+            }),
+            heightInfo,
+        },
     ];
 }
-export function createLineGeometries(options, style) {
+export function createLineGeometries(options, heightInfo, style) {
     const width = parseNumber(style.getStroke().getWidth(), 1.0);
     return [
-        new PolylineGeometry({
-            ...options,
-            width,
-        }),
+        {
+            type: 'line',
+            geometry: new PolylineGeometry({
+                ...options,
+                width,
+            }),
+            heightInfo,
+        },
     ];
 }
 /**
  * Creates the positions array for PolylineGeometry
  * @param  geometry
- * @param  positionHeightAdjustment
- * @param  perPositionHeight
- * @param  groundLevelOrMinHeight
+ * @param heightInfo
  * @private
  */
-export function getGeometryOptions(geometry, positionHeightAdjustment, perPositionHeight, groundLevelOrMinHeight) {
+export function getGeometryOptions(geometry, heightInfo) {
     const coords = geometry.getCoordinates();
-    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]);
-    });
+    const coordinateTransformer = mercatorToCartesianTransformerForHeightInfo(heightInfo);
+    const positions = coords.map(coordinateTransformer);
     return { positions };
 }
-export function getCoordinates(geometries) {
-    const coordinates = [];
-    geometries.forEach((lineString) => {
-        coordinates.push(...getFlatCoordinatesFromSimpleGeometry(lineString));
-    });
-    return coordinates;
-}
-let geometryFactory = null;
-function getGeometryFactory() {
-    if (!geometryFactory) {
-        geometryFactory = {
-            getCoordinates,
-            getGeometryOptions,
-            createSolidGeometries,
-            createOutlineGeometries,
-            createFillGeometries,
-            createGroundLineGeometries,
-            createLineGeometries,
-        };
-    }
-    return geometryFactory;
-}
 /**
  * validates if a lineString is renderable
  * @param  lineString
@@ -154,24 +134,22 @@ export function validateLineString(lineString) {
     }
     return false;
 }
-/**
- * converts a linestring to a a cesium primitive, with optional labels
- * @param  feature
- * @param  style
- * @param  geometries
- * @param  vectorProperties
- * @param  scene
- * @param  context
- */
-export default async function lineStringToCesium(feature, style, geometries, vectorProperties, scene, context) {
-    if (!style.getFill() && !style.getStroke()) {
-        return;
-    }
-    const lineGeometryFactory = getGeometryFactory();
-    const validGeometries = geometries.filter((lineString) => validateLineString(lineString));
-    addPrimitivesToContext(feature, style, validGeometries, vectorProperties, scene, lineGeometryFactory, context);
-    if (style instanceof ArrowStyle) {
-        await addArrowsToContext(feature, style, validGeometries, vectorProperties, scene, lineGeometryFactory, context);
+let geometryFactory;
+export function getLineStringGeometryFactory() {
+    if (!geometryFactory) {
+        geometryFactory = {
+            type: 'lineString',
+            getGeometryOptions,
+            createSolidGeometries,
+            createOutlineGeometries,
+            createFillGeometries() {
+                return [];
+            },
+            createGroundLineGeometries,
+            createLineGeometries,
+            validateGeometry: validateLineString,
+        };
     }
+    return geometryFactory;
 }
 //# sourceMappingURL=lineStringToCesium.js.map

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

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

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

@@ -1,13 +1,10 @@
-import { Cartesian3, Model, Primitive, type Scene } from '@vcmap-cesium/engine';
+import { Cartesian3, type Scene } from '@vcmap-cesium/engine';
 import type { Feature } from 'ol/index.js';
-import type { Coordinate } from 'ol/coordinate.js';
 import { type Style } from 'ol/style.js';
-import VectorProperties, { VectorPropertiesModelOptions, VectorPropertiesPrimitive } from '../../layer/vectorProperties.js';
-export declare function getModelOptions(feature: Feature, wgs84Positions: Coordinate[], positions: Cartesian3[], vectorProperties: VectorProperties, scene: Scene, style?: Style): Promise<null | {
-    primitives: Model[];
-    options: VectorPropertiesModelOptions;
-}>;
-export declare function getPrimitiveOptions(feature: Feature, style: Style, wgs84Positions: Coordinate[], positions: Cartesian3[], vectorProperties: VectorProperties, scene: Scene): Promise<null | {
-    primitives: Primitive[];
-    options: VectorPropertiesPrimitive;
-}>;
+import { Coordinate } from 'ol/coordinate.js';
+import VectorProperties from '../../layer/vectorProperties.js';
+import { ConvertedItem } from './convert.js';
+import { VectorHeightInfo } from './vectorHeightInfo.js';
+export declare function getModelOptions(feature: Feature, position: Cartesian3, wgs84Coords: Coordinate, vectorProperties: VectorProperties, scene: Scene, heightInfo: VectorHeightInfo, style?: Style): Promise<null | ConvertedItem<'primitive'>>;
+export declare function getPrimitiveOptions(feature: Feature, style: Style, position: Cartesian3, wgs84Coords: Coordinate, vectorProperties: VectorProperties, scene: Scene, heightInfo: VectorHeightInfo): ConvertedItem<'primitive'>[];
+export declare function getModelOrPointPrimitiveOptions(feature: Feature, style: Style, position: Cartesian3, wgs84Coords: Coordinate, vectorProperties: VectorProperties, heightInfo: VectorHeightInfo, scene: Scene): Promise<ConvertedItem<'primitive'>[]>;

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

@@ -1,10 +1,12 @@
-import { BoxGeometry, BoxOutlineGeometry, Cartesian3, Cartographic, Color, ColorGeometryInstanceAttribute, CylinderGeometry, CylinderOutlineGeometry, EllipsoidGeometry, EllipsoidOutlineGeometry, GeometryInstance, HeadingPitchRoll, HeightReference, Material, MaterialAppearance, Matrix4, Model, ModelAnimationLoop, PerInstanceColorAppearance, Primitive, sampleTerrainMostDetailed, SphereGeometry, SphereOutlineGeometry, Transforms, } from '@vcmap-cesium/engine';
+import { BoxGeometry, BoxOutlineGeometry, Cartesian3, Cartographic, Color, ColorGeometryInstanceAttribute, CylinderGeometry, CylinderOutlineGeometry, EllipsoidGeometry, EllipsoidOutlineGeometry, GeometryInstance, HeadingPitchRoll, Material, MaterialAppearance, Matrix4, Model, ModelAnimationLoop, PerInstanceColorAppearance, Primitive, SphereGeometry, SphereOutlineGeometry, Transforms, } from '@vcmap-cesium/engine';
 import { RegularShape } from 'ol/style.js';
 import { asColorLike } from 'ol/colorlike.js';
 import { createSync } from '../../layer/vectorSymbols.js';
 import { PrimitiveOptionsType, vectorPropertiesOfType, } from '../../layer/vectorProperties.js';
 import { getCesiumColor } from '../../style/styleHelpers.js';
 import ModelFill from '../../style/modelFill.js';
+import { wgs84ToCartographic } from '../math.js';
+import { isRelativeHeightReference, } from './vectorHeightInfo.js';
 function makeOffsetAutoScalePrimitive(primitive, transform, scale, offset) {
     const { modelMatrix } = primitive;
     let currentScale = scale.clone();
@@ -43,23 +45,33 @@ function makeScaledAutoScalePrimitive(primitive, scale) {
         },
     });
 }
-async function placePrimitiveOnTerrain(primitive, position, scene, offset) {
-    await sampleTerrainMostDetailed(scene.globe.terrainProvider, [
-        Cartographic.fromCartesian(position),
-    ])
-        .then(([cartoWithNewHeight]) => {
-        if (!primitive.isDestroyed()) {
-            const { modelMatrix } = primitive;
-            const newPosition = Cartographic.toCartesian(cartoWithNewHeight, undefined, position);
-            if (offset) {
-                Cartesian3.add(newPosition, offset, newPosition);
-            }
-            primitive.modelMatrix = Matrix4.setTranslation(modelMatrix, newPosition, modelMatrix);
+const scratchUpdateHeightCartesian = new Cartesian3();
+function makeClampedPrimitive(primitive, scale, headingPitchRoll, heightReference, scene, wgs84Coords, offset) {
+    const originCartographic = wgs84ToCartographic(wgs84Coords);
+    const updatePrimitiveHeight = (clampedPosition) => {
+        clampedPosition.height += wgs84Coords[2];
+        Cartographic.toCartesian(clampedPosition, undefined, scratchUpdateHeightCartesian);
+        const geometryModelMatrix = Matrix4.fromScale(scale);
+        if (offset) {
+            Matrix4.setTranslation(geometryModelMatrix, Cartesian3.multiplyComponents(offset, scale, new Cartesian3()), geometryModelMatrix);
         }
-    })
-        .catch(() => { });
+        const transform = Transforms.headingPitchRollToFixedFrame(scratchUpdateHeightCartesian, headingPitchRoll);
+        primitive.modelMatrix = Matrix4.multiply(transform, geometryModelMatrix, new Matrix4());
+    };
+    const callbackHandler = scene.updateHeight(originCartographic, updatePrimitiveHeight, heightReference);
+    const height = scene.getHeight(originCartographic, heightReference);
+    if (height) {
+        const updatedHeightCarto = originCartographic.clone();
+        updatedHeightCarto.height = height;
+        updatePrimitiveHeight(updatedHeightCarto);
+    }
+    const destroy = primitive.destroy.bind(primitive);
+    primitive.destroy = () => {
+        callbackHandler();
+        destroy();
+    };
 }
-export async function getModelOptions(feature, wgs84Positions, positions, vectorProperties, scene, style) {
+export async function getModelOptions(feature, position, wgs84Coords, vectorProperties, scene, heightInfo, style) {
     const options = vectorProperties.getModel(feature);
     if (!options) {
         return null;
@@ -75,44 +87,42 @@ export async function getModelOptions(feature, wgs84Positions, positions, vector
             color = Color.fromCssColorString(asColorLike(olColor));
         }
     }
-    const primitives = await Promise.all(positions.map(async (position, index) => {
-        const modelMatrix = Matrix4.multiply(Transforms.headingPitchRollToFixedFrame(position, headingPitchRoll), Matrix4.fromScale(scale), new Matrix4());
-        const additionalModelOptions = vectorProperties.getModelOptions(feature);
-        const heightReference = vectorProperties.getAltitudeMode(feature);
-        const model = await Model.fromGltfAsync({
-            asynchronous: !feature[createSync],
-            url: options.url,
-            modelMatrix,
-            allowPicking,
-            color,
-            ...additionalModelOptions,
+    const modelMatrix = Matrix4.multiply(Transforms.headingPitchRollToFixedFrame(position, headingPitchRoll), Matrix4.fromScale(scale), new Matrix4());
+    const additionalModelOptions = vectorProperties.getModelOptions(feature);
+    const model = await Model.fromGltfAsync({
+        asynchronous: !feature[createSync],
+        url: options.url,
+        modelMatrix,
+        allowPicking,
+        color,
+        ...additionalModelOptions,
+    });
+    const activateAnimations = () => {
+        model.activeAnimations.addAll({
+            loop: ModelAnimationLoop.REPEAT,
         });
-        if (wgs84Positions[index][2] == null ||
-            heightReference === HeightReference.CLAMP_TO_GROUND) {
-            await placePrimitiveOnTerrain(model, position, scene);
-        }
-        const activateAnimations = () => {
-            model.activeAnimations.addAll({
-                loop: ModelAnimationLoop.REPEAT,
-            });
-        };
-        if (model.ready) {
+    };
+    if (model.ready) {
+        activateAnimations();
+    }
+    else {
+        const listener = model.readyEvent.addEventListener(() => {
+            listener();
             activateAnimations();
-        }
-        else {
-            const listener = model.readyEvent.addEventListener(() => {
-                listener();
-                activateAnimations();
-            });
-        }
-        if (options.autoScale && !Cartesian3.ONE.equals(scale)) {
-            makeScaledAutoScalePrimitive(model, scale);
-        }
-        return model;
-    }));
+        });
+    }
+    if (options.autoScale && !Cartesian3.ONE.equals(scale)) {
+        makeScaledAutoScalePrimitive(model, scale);
+    }
+    if (isRelativeHeightReference(heightInfo.heightReference) &&
+        heightInfo.groundLevel ==
+            null) {
+        makeClampedPrimitive(model, scale, headingPitchRoll, heightInfo.heightReference, scene, wgs84Coords);
+    }
     return {
-        primitives,
-        options,
+        type: 'primitive',
+        item: model,
+        autoScale: options.autoScale,
     };
 }
 function getGeometryInstanceFromOptions(options, color, outline) {
@@ -159,10 +169,10 @@ function getGeometryInstanceFromOptions(options, color, outline) {
     }
     return null;
 }
-export async function getPrimitiveOptions(feature, style, wgs84Positions, positions, vectorProperties, scene) {
+export function getPrimitiveOptions(feature, style, position, wgs84Coords, vectorProperties, scene, heightInfo) {
     const options = vectorProperties.getPrimitive(feature);
     if (!options) {
-        return null;
+        return [];
     }
     const imageStyle = style.getImage();
     let fill;
@@ -177,7 +187,7 @@ export async function getPrimitiveOptions(feature, style, wgs84Positions, positi
         stroke = style.getStroke(); // XXX this makes it impossible to create an extruded un-stroked primitive with an icon in 2D or we add a new primitive option
     }
     if (!fill && !stroke) {
-        return null;
+        return [];
     }
     let fillColor;
     if (fill) {
@@ -190,76 +200,80 @@ export async function getPrimitiveOptions(feature, style, wgs84Positions, positi
     const scale = Cartesian3.fromArray(options.scale);
     const headingPitchRoll = HeadingPitchRoll.fromDegrees(options.heading, options.pitch, options.roll);
     const allowPicking = vectorProperties.getAllowPicking(feature);
-    const heightReference = vectorProperties.getAltitudeMode(feature);
-    const primitives = await Promise.all(positions.map(async (position, index) => {
-        const geometryModelMatrix = Matrix4.fromScale(scale);
-        let offset;
-        if (options.primitiveOptions.offset?.length === 3) {
-            offset = Cartesian3.fromArray(options.primitiveOptions.offset);
-            Matrix4.setTranslation(geometryModelMatrix, Cartesian3.multiplyComponents(offset, scale, new Cartesian3()), geometryModelMatrix);
-        }
-        const transform = Transforms.headingPitchRollToFixedFrame(position, headingPitchRoll);
-        const modelMatrix = Matrix4.multiply(transform, geometryModelMatrix, new Matrix4());
-        let depthFail;
-        if (options.primitiveOptions.depthFailColor) {
-            const depthFailColor = getCesiumColor(options.primitiveOptions.depthFailColor, [255, 255, 255, 0.4]);
-            depthFail = new MaterialAppearance({
-                translucent: depthFailColor.alpha < 1,
-                material: Material.fromType('Color', {
-                    color: depthFailColor,
-                }),
-            });
-        }
-        const createPrimitive = async (translucent, geometryInstances, depthFailAppearance) => {
-            const primitive = new Primitive({
-                asynchronous: !feature[createSync],
-                geometryInstances: geometryInstances.filter((g) => g),
-                modelMatrix,
-                appearance: new PerInstanceColorAppearance({
-                    translucent,
-                    flat: true,
-                }),
-                depthFailAppearance,
-                allowPicking,
-                ...options.primitiveOptions.additionalOptions,
-            });
-            if (wgs84Positions[index][2] == null ||
-                heightReference === HeightReference.CLAMP_TO_GROUND) {
-                await placePrimitiveOnTerrain(primitive, position, scene, offset);
-                Transforms.headingPitchRollToFixedFrame(position, headingPitchRoll, undefined, undefined, transform); // update transform for usage in offset auto scale
+    const geometryModelMatrix = Matrix4.fromScale(scale);
+    let offset;
+    if (options.primitiveOptions.offset?.length === 3) {
+        offset = Cartesian3.fromArray(options.primitiveOptions.offset);
+        Matrix4.setTranslation(geometryModelMatrix, Cartesian3.multiplyComponents(offset, scale, new Cartesian3()), geometryModelMatrix);
+    }
+    const transform = Transforms.headingPitchRollToFixedFrame(position, headingPitchRoll);
+    const modelMatrix = Matrix4.multiply(transform, geometryModelMatrix, new Matrix4());
+    let depthFail;
+    if (options.primitiveOptions.depthFailColor) {
+        const depthFailColor = getCesiumColor(options.primitiveOptions.depthFailColor, [255, 255, 255, 0.4]);
+        depthFail = new MaterialAppearance({
+            translucent: depthFailColor.alpha < 1,
+            material: Material.fromType('Color', {
+                color: depthFailColor,
+            }),
+        });
+    }
+    const createPrimitive = (translucent, geometryInstances, depthFailAppearance) => {
+        const primitive = new Primitive({
+            asynchronous: !feature[createSync],
+            geometryInstances: geometryInstances.filter((g) => g),
+            modelMatrix,
+            appearance: new PerInstanceColorAppearance({
+                translucent,
+                flat: true,
+            }),
+            depthFailAppearance,
+            allowPicking,
+            ...options.primitiveOptions.additionalOptions,
+        });
+        if (options.autoScale) {
+            if (offset) {
+                makeOffsetAutoScalePrimitive(primitive, transform, scale, offset);
             }
-            if (options.autoScale) {
-                if (offset) {
-                    makeOffsetAutoScalePrimitive(primitive, transform, scale, offset);
-                }
-                else if (!Cartesian3.ONE.equals(scale)) {
-                    makeScaledAutoScalePrimitive(primitive, scale);
-                }
+            else if (!Cartesian3.ONE.equals(scale)) {
+                makeScaledAutoScalePrimitive(primitive, scale);
             }
-            return primitive;
-        };
-        const fillAndOutline = [];
-        if (fillColor) {
-            fillAndOutline.push(createPrimitive(fillColor.alpha < 1 || !!depthFail, [
-                getGeometryInstanceFromOptions(options.primitiveOptions, fillColor),
-            ], depthFail));
-        }
-        else if (depthFail) {
-            const transparent = Color.TRANSPARENT;
-            fillAndOutline.push(createPrimitive(true, [
-                getGeometryInstanceFromOptions(options.primitiveOptions, transparent),
-            ], depthFail));
         }
-        if (strokeColor) {
-            fillAndOutline.push(createPrimitive(strokeColor.alpha < 1 || !!depthFail, [
-                getGeometryInstanceFromOptions(options.primitiveOptions, strokeColor, true),
-            ]));
+        if (isRelativeHeightReference(heightInfo.heightReference) &&
+            heightInfo.groundLevel ==
+                null) {
+            makeClampedPrimitive(primitive, scale, headingPitchRoll, heightInfo.heightReference, scene, wgs84Coords, offset);
         }
-        return Promise.all(fillAndOutline);
-    }));
-    return {
-        primitives: primitives.flatMap((p) => p),
-        options,
+        return primitive;
     };
+    const fillAndOutline = [];
+    if (fillColor) {
+        fillAndOutline.push(createPrimitive(fillColor.alpha < 1 || !!depthFail, [getGeometryInstanceFromOptions(options.primitiveOptions, fillColor)], depthFail));
+    }
+    else if (depthFail) {
+        const transparent = Color.TRANSPARENT;
+        fillAndOutline.push(createPrimitive(true, [getGeometryInstanceFromOptions(options.primitiveOptions, transparent)], depthFail));
+    }
+    if (strokeColor) {
+        fillAndOutline.push(createPrimitive(strokeColor.alpha < 1 || !!depthFail, [
+            getGeometryInstanceFromOptions(options.primitiveOptions, strokeColor, true),
+        ]));
+    }
+    return fillAndOutline.map((item) => ({
+        type: 'primitive',
+        item,
+        autoScale: options.autoScale,
+    }));
+}
+export async function getModelOrPointPrimitiveOptions(feature, style, position, wgs84Coords, vectorProperties, heightInfo, scene) {
+    const renderAs = vectorProperties.renderAs(feature);
+    if (renderAs === 'model') {
+        const modelOptions = await getModelOptions(feature, position, wgs84Coords, vectorProperties, scene, heightInfo, style);
+        return modelOptions ? [modelOptions] : [];
+    }
+    if (renderAs === 'primitive') {
+        return getPrimitiveOptions(feature, style, position, wgs84Coords, vectorProperties, scene, heightInfo);
+    }
+    return [];
 }
 //# sourceMappingURL=pointHelpers.js.map