npm - @vcmap/core - Versions diffs - 5.0.0-rc.37 → 5.0.0-rc.39 - Mend

@vcmap/core 5.0.0-rc.37 → 5.0.0-rc.39

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (81) hide show

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

@@ -57,7 +57,7 @@ async function placePrimitiveOnTerrain(primitive, position, scene, offset) {
     })
         .catch(() => { });
 }
-export function getModelOptions(feature, wgs84Positions, positions, vectorProperties, scene) {
+export async function getModelOptions(feature, wgs84Positions, positions, vectorProperties, scene) {
     const options = vectorProperties.getModel(feature);
     if (!options) {
         return null;
@@ -65,11 +65,11 @@ export function getModelOptions(feature, wgs84Positions, positions, vectorProper
     const scale = Cartesian3.fromArray(options.scale);
     const headingPitchRoll = HeadingPitchRoll.fromDegrees(options.heading, options.pitch, options.roll);
     const allowPicking = vectorProperties.getAllowPicking(feature);
-    const primitives = positions.map((position, index) => {
+    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 = Model.fromGltf({
+        const model = await Model.fromGltfAsync({
             asynchronous: !feature[createSync],
             url: options.url,
             modelMatrix,
@@ -78,20 +78,27 @@ export function getModelOptions(feature, wgs84Positions, positions, vectorProper
         });
         if (wgs84Positions[index][2] == null ||
             heightReference === HeightReference.CLAMP_TO_GROUND) {
-            // eslint-disable-next-line no-void
-            void placePrimitiveOnTerrain(model, position, scene);
+            await placePrimitiveOnTerrain(model, position, scene);
         }
-        // eslint-disable-next-line no-void
-        void model.readyPromise.then(() => {
+        const activateAnimations = () => {
             model.activeAnimations.addAll({
                 loop: ModelAnimationLoop.REPEAT,
             });
-        });
+        };
+        if (model.ready) {
+            activateAnimations();
+        }
+        else {
+            const listener = model.readyEvent.addEventListener(() => {
+                listener();
+                activateAnimations();
+            });
+        }
         if (options.autoScale && !Cartesian3.ONE.equals(scale)) {
             makeScaledAutoScalePrimitive(model, scale);
         }
         return model;
-    });
+    }));
     return {
         primitives,
         options,
@@ -141,7 +148,7 @@ function getGeometryInstanceFromOptions(options, color, outline) {
     }
     return null;
 }
-export function getPrimitiveOptions(feature, style, wgs84Positions, positions, vectorProperties, scene) {
+export async function getPrimitiveOptions(feature, style, wgs84Positions, positions, vectorProperties, scene) {
     const options = vectorProperties.getPrimitive(feature);
     if (!options) {
         return null;
@@ -172,7 +179,8 @@ export function getPrimitiveOptions(feature, style, wgs84Positions, positions, v
     const scale = Cartesian3.fromArray(options.scale);
     const headingPitchRoll = HeadingPitchRoll.fromDegrees(options.heading, options.pitch, options.roll);
     const allowPicking = vectorProperties.getAllowPicking(feature);
-    const primitives = positions.flatMap((position, index) => {
+    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) {
@@ -191,7 +199,7 @@ export function getPrimitiveOptions(feature, style, wgs84Positions, positions, v
                 }),
             });
         }
-        const createPrimitive = (translucent, geometryInstances, depthFailAppearance) => {
+        const createPrimitive = async (translucent, geometryInstances, depthFailAppearance) => {
             const primitive = new Primitive({
                 asynchronous: !feature[createSync],
                 geometryInstances: geometryInstances.filter((g) => g),
@@ -204,11 +212,10 @@ export function getPrimitiveOptions(feature, style, wgs84Positions, positions, v
                 allowPicking,
                 ...options.primitiveOptions.additionalOptions,
             });
-            if (!wgs84Positions[index][2]) {
-                // eslint-disable-next-line no-void
-                void placePrimitiveOnTerrain(primitive, position, scene, offset).then(() => {
-                    Transforms.headingPitchRollToFixedFrame(position, headingPitchRoll, undefined, undefined, transform); // update transform for usage in offset auto scale
-                });
+            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
             }
             if (options.autoScale) {
                 if (offset) {
@@ -222,7 +229,9 @@ export function getPrimitiveOptions(feature, style, wgs84Positions, positions, v
         };
         const fillAndOutline = [];
         if (fillColor) {
-            fillAndOutline.push(createPrimitive(fillColor.alpha < 1 || !!depthFail, [getGeometryInstanceFromOptions(options.primitiveOptions, fillColor)], depthFail));
+            fillAndOutline.push(createPrimitive(fillColor.alpha < 1 || !!depthFail, [
+                getGeometryInstanceFromOptions(options.primitiveOptions, fillColor),
+            ], depthFail));
         }
         else if (depthFail) {
             const transparent = Color.TRANSPARENT;
@@ -235,10 +244,10 @@ export function getPrimitiveOptions(feature, style, wgs84Positions, positions, v
                 getGeometryInstanceFromOptions(options.primitiveOptions, strokeColor, true),
             ]));
         }
-        return fillAndOutline;
-    });
+        return Promise.all(fillAndOutline);
+    }));
     return {
-        primitives,
+        primitives: primitives.flatMap((p) => p),
         options,
     };
 }

package/dist/src/util/featureconverter/pointHelpers.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"pointHelpers.js","sourceRoot":"","sources":["../../../../src/util/featureconverter/pointHelpers.ts"],"names":[],"mappings":"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~~CAC7B~~,OAAgB,EAChB,cAA4B,EAC5B,SAAuB,EACvB,gBAAkC,EAClC,KAAY;~~IAEZ~~,MAAM,OAAO,GAAG,gBAAgB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACnD,IAAI,CAAC,OAAO,EAAE;QACZ,OAAO,IAAI,CAAC;KACb;IACD,MAAM,KAAK,GAAG,UAAU,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAClD,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,WAAW,CACnD,OAAO,CAAC,OAAO,EACf,OAAO,CAAC,KAAK,EACb,OAAO,CAAC,IAAI,CACb,CAAC;IACF,MAAM,YAAY,GAAG,gBAAgB,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;IAC/D,MAAM,UAAU,GAAG,~~SAAS~~,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,KAAK,EAAE,EAAE;~~QACnD~~,MAAM,WAAW,GAAG,OAAO,CAAC,QAAQ,CAClC,UAAU,CAAC,4BAA4B,CAAC,QAAQ,EAAE,gBAAgB,CAAC,EACnE,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,EACxB,IAAI,OAAO,EAAE,CACd,CAAC;QAEF,MAAM,sBAAsB,GAAG,gBAAgB,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;QACzE,MAAM,eAAe,GAAG,gBAAgB,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;QAClE,MAAM,KAAK,GAAG,KAAK,CAAC,~~QAAQ~~,CAAC;~~YAC3B~~,YAAY,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC;YAClC,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,WAAW;YACX,YAAY;YACZ,GAAG,sBAAsB;SAC1B,CAAC,CAAC;QAEH,IACE,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI;YAChC,eAAe,KAAK,eAAe,CAAC,eAAe,EACnD;YACA,~~mCAAmC;YACnC~~,~~KAAK,~~uBAAuB,CAAC,KAAK,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;~~SACtD~~;QAED,~~mCAAmC~~;~~QACnC~~,KAAK,~~KAAK,~~CAAC,~~YAAY~~,CAAC,~~IAAI~~,CAAC,~~GAAG~~,EAAE~~;YAChC~~,~~KAAK~~,CAAC,~~gBAAgB~~,CAAC,~~MAAM~~,CAAC;~~gBAC5B~~,IAAI,EAAE,kBAAkB,CAAC,MAAM;~~aAChC~~,CAAC,CAAC;~~QACL~~,CAAC,CAAC,CAAC;~~QAEH~~,IAAI,OAAO,CAAC,SAAS,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;YACtD,4BAA4B,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;SAC5C;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC,CAAC;~~IAEH~~,OAAO;QACL,UAAU;QACV,OAAO;KACR,CAAC;AACJ,CAAC;AAED,SAAS,8BAA8B,CACrC,OAAyC,EACzC,KAAY,EACZ,OAAiB;IAEjB,IAAI,QAAQ,CAAC;IACb,IAAI,sBAAsB,CAAC,OAAO,EAAE,oBAAoB,CAAC,QAAQ,CAAC,EAAE;QAClE,QAAQ,GAAG,OAAO;YAChB,CAAC,CAAC,IAAI,uBAAuB,CAAC,OAAO,CAAC,eAAe,CAAC;YACtD,CAAC,CAAC,IAAI,gBAAgB,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;KACnD;SAAM,IAAI,sBAAsB,CAAC,OAAO,EAAE,oBAAoB,CAAC,SAAS,CAAC,EAAE;QAC1E,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,eAAe,EAAE,KAAK,CAAC,EAAE;YACjD,OAAO,CAAC,eAAgB,CAAC,KAAK,GAAG,UAAU,CAAC,SAAS,CACnD,OAAO,CAAC,eAAgB,CAAC,KAAK,CAC/B,CAAC;SACH;QACD,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,eAAe,EAAE,UAAU,CAAC,EAAE;YACtD,OAAO,CAAC,eAAgB,CAAC,UAAU,GAAG,UAAU,CAAC,SAAS,CACxD,OAAO,CAAC,eAAgB,CAAC,UAAU,CACpC,CAAC;SACH;QACD,QAAQ,GAAG,OAAO;YAChB,CAAC,CAAC,IAAI,wBAAwB,CAAC,OAAO,CAAC,eAAe,CAAC;YACvD,CAAC,CAAC,IAAI,iBAAiB,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;KACpD;IACD,IAAI,sBAAsB,CAAC,OAAO,EAAE,oBAAoB,CAAC,MAAM,CAAC,EAAE;QAChE,QAAQ,GAAG,OAAO;YAChB,CAAC,CAAC,IAAI,qBAAqB,CAAC,OAAO,CAAC,eAAe,CAAC;YACpD,CAAC,CAAC,IAAI,cAAc,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;KACjD;IACD,IAAI,sBAAsB,CAAC,OAAO,EAAE,oBAAoB,CAAC,GAAG,CAAC,EAAE;QAC7D,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE;YAClD,OAAO,CAAC,eAAe,CAAC,OAAO,GAAG,UAAU,CAAC,SAAS,CACpD,OAAO,CAAC,eAAe,CAAC,OAAO,CAChC,CAAC;SACH;QACD,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE;YAClD,OAAO,CAAC,eAAe,CAAC,OAAO,GAAG,UAAU,CAAC,SAAS,CACpD,OAAO,CAAC,eAAe,CAAC,OAAO,CAChC,CAAC;SACH;QACD,QAAQ,GAAG,OAAO;YAChB,CAAC,CAAC,IAAI,kBAAkB,CAAC,OAAO,CAAC,eAAe,CAAC;YACjD,CAAC,CAAC,IAAI,WAAW,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;KAC9C;IAED,IAAI,QAAQ,EAAE;QACZ,OAAO,IAAI,gBAAgB,CAAC;YAC1B,QAAQ;YACR,UAAU,EAAE;gBACV,KAAK,EAAE,8BAA8B,CAAC,SAAS,CAAC,KAAK,CAAC;aACvD;SACF,CAAC,CAAC;KACJ;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,mBAAmB,~~CACjC~~,OAAgB,EAChB,KAAY,EACZ,cAA4B,EAC5B,SAAuB,EACvB,gBAAkC,EAClC,KAAY;~~IAEZ~~,MAAM,OAAO,GAAG,gBAAgB,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;IACvD,IAAI,CAAC,OAAO,EAAE;QACZ,OAAO,IAAI,CAAC;KACb;IAED,MAAM,UAAU,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC;IACpC,IAAI,IAAI,CAAC;IACT,IAAI,MAAM,CAAC;IACX,IAAI,UAAU,YAAY,YAAY,EAAE;QACtC,IAAI,GAAG,UAAU,CAAC,OAAO,EAAE,CAAC;QAC5B,MAAM,GAAG,UAAU,CAAC,SAAS,EAAE,CAAC;KACjC;SAAM,IAAI,UAAU,EAAE;QACrB,+EAA+E;QAC/E,IAAI,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC;QACvB,MAAM,GAAG,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC,8HAA8H;KAC3J;IAED,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE;QACpB,OAAO,IAAI,CAAC;KACb;IACD,IAAI,SAA4B,CAAC;IACjC,IAAI,IAAI,EAAE;QACR,SAAS,GAAG,cAAc,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;KACnE;IACD,IAAI,WAA8B,CAAC;IACnC,IAAI,MAAM,EAAE;QACV,WAAW,GAAG,cAAc,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;KACvE;IAED,MAAM,KAAK,GAAG,UAAU,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAClD,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,WAAW,CACnD,OAAO,CAAC,OAAO,EACf,OAAO,CAAC,KAAK,EACb,OAAO,CAAC,IAAI,CACb,CAAC;IACF,MAAM,YAAY,GAAG,gBAAgB,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;~~IAE~~/D,MAAM,~~UAAU~~,GAAG,~~SAAS~~,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,KAAK,EAAE,EAAE;~~QACvD~~,MAAM,mBAAmB,GAAG,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QACrD,IAAI,MAA8B,CAAC;QACnC,IAAI,OAAO,CAAC,gBAAgB,CAAC,MAAM,EAAE,MAAM,KAAK,CAAC,EAAE;YACjD,MAAM,GAAG,UAAU,CAAC,SAAS,CAAC,OAAO,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;YAC/D,OAAO,CAAC,cAAc,CACpB,mBAAmB,EACnB,UAAU,CAAC,kBAAkB,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,UAAU,EAAE,CAAC,EAC9D,mBAAmB,CACpB,CAAC;SACH;QACD,MAAM,SAAS,GAAG,UAAU,CAAC,4BAA4B,CACvD,QAAQ,EACR,gBAAgB,CACjB,CAAC;QACF,MAAM,WAAW,GAAG,OAAO,CAAC,QAAQ,CAClC,SAAS,EACT,mBAAmB,EACnB,IAAI,OAAO,EAAE,CACd,CAAC;QAEF,IAAI,SAAS,CAAC;QACd,IAAI,OAAO,CAAC,gBAAgB,CAAC,cAAc,EAAE;YAC3C,MAAM,cAAc,GAAG,cAAc,CACnC,OAAO,CAAC,gBAAgB,CAAC,cAAc,EACvC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CACrB,CAAC;YACF,SAAS,GAAG,IAAI,kBAAkB,CAAC;gBACjC,WAAW,EAAE,cAAc,CAAC,KAAK,GAAG,CAAC;gBACrC,QAAQ,EAAE,QAAQ,CAAC,QAAQ,CAAC,OAAO,EAAE;oBACnC,KAAK,EAAE,cAAc;iBACtB,CAAC;aACH,CAAC,CAAC;SACJ;QAED,MAAM,eAAe,GAAG,~~CACtB~~,WAAoB,EACpB,iBAA8C,EAC9C,mBAAwC,~~EAC7B~~,EAAE;~~YACb~~,MAAM,SAAS,GAAG,IAAI,SAAS,CAAC;gBAC9B,YAAY,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC;gBAClC,iBAAiB,EAAE,iBAAiB,CAAC,MAAM,CACzC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CACa;gBACvB,WAAW;gBACX,UAAU,EAAE,IAAI,0BAA0B,CAAC;oBACzC,WAAW;oBACX,IAAI,EAAE,IAAI;iBACX,CAAC;gBACF,mBAAmB;gBACnB,YAAY;gBACZ,GAAG,OAAO,CAAC,gBAAgB,CAAC,iBAAiB;aAC9C,CAAC,CAAC;YAEH,~~IAAI~~,~~CAAC,~~cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,~~EAAE;gBAC7B~~,~~mCAAmC~~;~~gBACnC~~,KAAK,uBAAuB,CAAC,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC~~,IAAI,CACnE,GAAG,EAAE~~;~~oBACH~~,UAAU,CAAC,4BAA4B,CACrC,QAAQ,EACR,gBAAgB,EAChB,SAAS,EACT,SAAS,EACT,SAAS,CACV,CAAC,CAAC,kDAAkD;~~gBACvD,CAAC,CACF,CAAC~~;~~aACH;~~YAED,IAAI,OAAO,CAAC,SAAS,EAAE;gBACrB,IAAI,MAAM,EAAE;oBACV,4BAA4B,CAAC,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;iBACnE;qBAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;oBACxC,4BAA4B,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;iBAChD;aACF;YACD,OAAO,SAAS,CAAC;QACnB,CAAC,CAAC;QAEF,MAAM,cAAc,GAAG,EAAE,CAAC;QAC1B,IAAI,SAAS,EAAE;YACb,cAAc,CAAC,IAAI,CACjB,eAAe,CACb,SAAS,CAAC,KAAK,GAAG,CAAC,IAAI,CAAC,CAAC,SAAS,EAClC,~~CAAC,~~8BAA8B,~~CAAC~~,OAAO,CAAC,gBAAgB,~~EAAE~~,SAAS,~~CAAC~~,~~CAAC~~,~~EACrE,~~SAAS,CACV,CACF,CAAC;SACH;aAAM,IAAI,SAAS,EAAE;YACpB,MAAM,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC;YACtC,cAAc,CAAC,IAAI,CACjB,eAAe,CACb,IAAI,EACJ;gBACE,8BAA8B,CAC5B,OAAO,CAAC,gBAAgB,EACxB,WAAW,CACZ;aACF,EACD,SAAS,CACV,CACF,CAAC;SACH;QACD,IAAI,WAAW,EAAE;YACf,cAAc,CAAC,IAAI,CACjB,eAAe,CAAC,WAAW,CAAC,KAAK,GAAG,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE;gBACpD,8BAA8B,CAC5B,OAAO,CAAC,gBAAgB,EACxB,WAAW,EACX,IAAI,CACL;aACF,CAAC,CACH,CAAC;SACH;QACD,OAAO,cAAc,CAAC;~~IACxB~~,CAAC,CAAC,CAAC;~~IAEH~~,OAAO;QACL,UAAU;~~QACV~~,OAAO;KACR,CAAC;AACJ,CAAC"}
1	+ {"version":3,"file":"pointHelpers.js","sourceRoot":"","sources":["../../../../src/util/featureconverter/pointHelpers.ts"],"names":[],"mappings":"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"}

package/dist/src/util/featureconverter/pointToCesium.d.ts CHANGED Viewed

@@ -33,4 +33,4 @@ export declare function getCartesian3AndWGS84FromCoordinates(coordinates: Coordi
     wgs84Positions: Coordinate[];
 };
 export declare function getLineGeometries(wgs84Positions: Coordinate[], heightInfo: VectorHeightInfo, positions: Cartesian3[], style: Style): PolylineGeometry[];
-export default function pointToCesium(feature: Feature, style: Style, geometries: Point[], vectorProperties: VectorProperties, scene: Scene, context: CesiumVectorContext): void;
+export default function pointToCesium(feature: Feature, style: Style, geometries: Point[], vectorProperties: VectorProperties, scene: Scene, context: CesiumVectorContext): Promise<void>;

package/dist/src/util/featureconverter/pointToCesium.js CHANGED Viewed

@@ -194,7 +194,7 @@ export function getLineGeometries(wgs84Positions, heightInfo, positions, style)
     }
     return lineGeometries;
 }
-export default function pointToCesium(feature, style, geometries, vectorProperties, scene, context) {
+export default async function pointToCesium(feature, style, geometries, vectorProperties, scene, context) {
     if (!style.getImage() && !(style.getText() && style.getText().getText())) {
         return;
     }
@@ -210,15 +210,15 @@ export default function pointToCesium(feature, style, geometries, vectorProperti
     const { positions, wgs84Positions } = getCartesian3AndWGS84FromCoordinates(coordinates, heightInfo);
     let modelOrPrimitiveOptions = null;
     if (feature.get('olcs_modelUrl')) {
-        modelOrPrimitiveOptions = getModelOptions(feature, wgs84Positions, positions, vectorProperties, scene);
+        modelOrPrimitiveOptions = await getModelOptions(feature, wgs84Positions, positions, vectorProperties, scene);
     }
     else if (feature.get('olcs_primitiveOptions')) {
-        modelOrPrimitiveOptions = getPrimitiveOptions(feature, style, wgs84Positions, positions, vectorProperties, scene);
+        modelOrPrimitiveOptions = await getPrimitiveOptions(feature, style, wgs84Positions, positions, vectorProperties, scene);
     }
     else {
         modelOrPrimitiveOptions =
-            getModelOptions(feature, wgs84Positions, positions, vectorProperties, scene) ??
-                getPrimitiveOptions(feature, style, wgs84Positions, positions, vectorProperties, scene);
+            (await getModelOptions(feature, wgs84Positions, positions, vectorProperties, scene)) ??
+                (await getPrimitiveOptions(feature, style, wgs84Positions, positions, vectorProperties, scene));
     }
     if (heightInfo.extruded && style.getStroke()) {
         const lineGeometries = getLineGeometries(wgs84Positions, heightInfo, positions, style);

package/dist/src/util/featureconverter/pointToCesium.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"pointToCesium.js","sourceRoot":"","sources":["../../../../src/util/featureconverter/pointToCesium.ts"],"names":[],"mappings":"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~~CACnC~~,OAAgB,EAChB,KAAY,EACZ,UAAmB,EACnB,gBAAkC,EAClC,KAAY,EACZ,OAA4B;IAE5B,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,CAAC,EAAE;QACxE,OAAO;KACR;IACD,MAAM,eAAe,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;IAE3E,iCAAiC;IACjC,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE;QAC3B,OAAO;KACR;IAED,MAAM,WAAW,GAAG,cAAc,CAAC,eAAe,CAAC,CAAC;IACpD,MAAM,UAAU,GAAG,aAAa,CAAC,OAAO,EAAE,gBAAgB,EAAE,WAAW,CAAC,CAAC;IACzE,IAAI,EAAE,eAAe,EAAE,GAAG,UAAU,CAAC;IACrC,MAAM,YAAY,GAAG,gBAAgB,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;IAE/D,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,GAAG,oCAAoC,CACxE,WAAW,EACX,UAAU,CACX,CAAC;IAEF,IAAI,uBAAuB,GAAG,IAAI,CAAC;IACnC,IAAI,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,EAAE;QAChC,uBAAuB,GAAG,eAAe,~~CACvC~~,OAAO,EACP,cAAc,EACd,SAAS,EACT,gBAAgB,EAChB,KAAK,CACN,CAAC;KACH;SAAM,IAAI,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,EAAE;QAC/C,uBAAuB,GAAG,mBAAmB,~~CAC3C~~,OAAO,EACP,KAAK,EACL,cAAc,EACd,SAAS,EACT,gBAAgB,EAChB,KAAK,CACN,CAAC;KACH;SAAM;QACL,uBAAuB;YACrB,eAAe,~~CACb~~,OAAO,EACP,cAAc,EACd,SAAS,EACT,gBAAgB,EAChB,KAAK,CACN;~~gBACD~~,mBAAmB,~~CACjB~~,OAAO,EACP,KAAK,EACL,cAAc,EACd,SAAS,EACT,gBAAgB,EAChB,KAAK,CACN,CAAC;~~KACL~~;IAED,IAAI,UAAU,CAAC,QAAQ,IAAI,KAAK,CAAC,SAAS,EAAE,EAAE;QAC5C,MAAM,cAAc,GAAG,iBAAiB,CACtC,cAAc,EACd,UAAU,EACV,SAAS,EACT,KAAK,CACN,CAAC;QACF,IAAI,cAAc,CAAC,MAAM,EAAE;YACzB,eAAe,GAAG,eAAe,CAAC,IAAI,CAAC;YACvC,MAAM,aAAa,GAAG,mBAAmB,CACvC,KAAK,EACL,gBAAgB,EAChB,YAAY,EACZ,OAAO,EACP,cAAc,EACd,KAAK,EACL,KAAK,CACN,CAAC;YACF,IAAI,aAAa,EAAE;gBACjB,OAAO,CAAC,aAAa,CAAC,CAAC,aAAa,CAAC,EAAE,OAAO,EAAE,YAAY,CAAC,CAAC;aAC/D;SACF;KACF;IACD,IAAI,uBAAuB,EAAE;QAC3B,IAAI,uBAAuB,CAAC,OAAO,CAAC,SAAS,EAAE;YAC7C,OAAO,CAAC,mBAAmB,CACzB,uBAAuB,CAAC,UAAU,EAClC,OAAO,EACP,YAAY,CACb,CAAC;SACH;aAAM;YACL,OAAO,CAAC,aAAa,CACnB,uBAAuB,CAAC,UAAU,EAClC,OAAO,EACP,YAAY,CACb,CAAC;SACH;KACF;SAAM;QACL,MAAM,SAAS,GAAG,mBAAmB,CACnC,OAAO,EACP,KAAK,EACL,eAAe,EACf,gBAAgB,CACjB,CAAC;QACF,IAAI,SAAS,EAAE;YACb,MAAM,oBAAoB,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;gBACtD,OAAO,EAAE,GAAG,SAAS,EAAE,QAAQ,EAAE,CAAC;YACpC,CAAC,CAAC,CAAC;YACH,OAAO,CAAC,aAAa,CAAC,oBAAoB,EAAE,OAAO,EAAE,YAAY,CAAC,CAAC;SACpE;QAED,MAAM,YAAY,GAAG,eAAe,CAClC,OAAO,EACP,KAAK,EACL,eAAe,EACf,gBAAgB,CACjB,CAAC;QACF,IAAI,YAAY,EAAE;YAChB,MAAM,uBAAuB,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;gBACzD,OAAO,EAAE,GAAG,YAAY,EAAE,QAAQ,EAAE,CAAC;YACvC,CAAC,CAAC,CAAC;YACH,OAAO,CAAC,SAAS,CAAC,uBAAuB,EAAE,OAAO,EAAE,YAAY,CAAC,CAAC;SACnE;KACF;AACH,CAAC"}
1	+ {"version":3,"file":"pointToCesium.js","sourceRoot":"","sources":["../../../../src/util/featureconverter/pointToCesium.ts"],"names":[],"mappings":"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"}

package/dist/src/util/featureconverter/polygonToCesium.d.ts CHANGED Viewed

@@ -10,9 +10,9 @@ export type PolylineGeometryOptions = ConstructorParameters<typeof PolylineGeome
 export declare function createSolidGeometries(options: PolygonGeometryOptions, height: number, perPositionHeight: boolean, extrudedHeight?: number): PolygonGeometry[];
 export declare function createOutlineGeometries(options: PolygonGeometryOptions, height: number, perPositionHeight: boolean, extrudedHeight?: number): PolygonOutlineGeometry[];
 export declare function createFillGeometries(options: PolygonGeometryOptions, height: number, perPositionHeight: boolean): PolygonGeometry[];
-export declare function getLineGeometryOptions(options: PolygonGeometryOptions, style: Style): PolylineGeometryOptions[];
+export declare function getLineGeometryOptions(options: PolygonGeometryOptions, style: Style, groundLevel?: number): PolylineGeometryOptions[];
 export declare function createGroundLineGeometries(options: PolygonGeometryOptions, style: Style): GroundPolylineGeometry[];
-export declare function createLineGeometries(options: PolygonGeometryOptions, style: Style): PolylineGeometry[];
+export declare function createLineGeometries(options: PolygonGeometryOptions, style: Style, groundLevel?: number): PolylineGeometry[];
 export declare function getGeometryOptions(geometry: Polygon, positionHeightAdjustment: number): PolygonGeometryOptions;
 export declare function getCoordinates(geometries: Polygon[]): Coordinate[];
 /**

package/dist/src/util/featureconverter/polygonToCesium.js CHANGED Viewed

@@ -1,4 +1,4 @@
-import { Cartesian3, PolygonGeometry, PerInstanceColorAppearance, PolygonOutlineGeometry, GroundPolylineGeometry, PolygonHierarchy, PolylineGeometry, } from '@vcmap-cesium/engine';
+import { Cartesian3, PolygonGeometry, PerInstanceColorAppearance, PolygonOutlineGeometry, GroundPolylineGeometry, PolygonHierarchy, PolylineGeometry, Cartographic, } from '@vcmap-cesium/engine';
 import { parseNumber } from '@vcsuite/parsers';
 import { addPrimitivesToContext } from './featureconverterHelper.js';
 import Projection from '../projection.js';
@@ -28,7 +28,7 @@ export function createOutlineGeometries(options, height, perPositionHeight, extr
 export function createFillGeometries(options, height, perPositionHeight) {
     return createSolidGeometries(options, height, perPositionHeight, undefined);
 }
-export function getLineGeometryOptions(options, style) {
+export function getLineGeometryOptions(options, style, groundLevel) {
     const width = parseNumber(style.getStroke().getWidth(), 1.0);
     const geometryOptions = [];
     geometryOptions.push({
@@ -41,6 +41,15 @@ export function getLineGeometryOptions(options, style) {
             width,
         });
     });
+    if (groundLevel) {
+        geometryOptions.forEach((polylineOptions) => {
+            polylineOptions.positions = polylineOptions.positions.map((c) => {
+                const geographic = Cartographic.fromCartesian(c);
+                geographic.height = groundLevel;
+                return Cartographic.toCartesian(geographic);
+            });
+        });
+    }
     return geometryOptions;
 }
 export function createGroundLineGeometries(options, style) {
@@ -48,8 +57,8 @@ export function createGroundLineGeometries(options, style) {
         return new GroundPolylineGeometry(option);
     });
 }
-export function createLineGeometries(options, style) {
-    return getLineGeometryOptions(options, style).map((option) => {
+export function createLineGeometries(options, style, groundLevel) {
+    return getLineGeometryOptions(options, style, groundLevel).map((option) => {
         return new PolylineGeometry(option);
     });
 }

package/dist/src/util/featureconverter/polygonToCesium.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"polygonToCesium.js","sourceRoot":"","sources":["../../../../src/util/featureconverter/polygonToCesium.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,eAAe,EACf,0BAA0B,EAC1B,sBAAsB,EACtB,sBAAsB,EACtB,gBAAgB,EAChB,gBAAgB,~~GAEjB~~,MAAM,sBAAsB,CAAC;AAK9B,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,UAAU,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,oCAAoC,EAAE,MAAM,uBAAuB,CAAC;AAa7E,MAAM,UAAU,qBAAqB,CACnC,OAA+B,EAC/B,MAAc,EACd,iBAA0B,EAC1B,cAAuB;IAEvB,MAAM,cAAc,GAA2B;QAC7C,GAAG,OAAO;QACV,iBAAiB;QACjB,cAAc;KACf,CAAC;IACF,IAAI,CAAC,iBAAiB,EAAE;QACtB,cAAc,CAAC,MAAM,GAAG,MAAM,CAAC;KAChC;IACD,OAAO,CAAC,IAAI,eAAe,CAAC,cAAc,CAAC,CAAC,CAAC;AAC/C,CAAC;AAED,MAAM,UAAU,uBAAuB,CACrC,OAA+B,EAC/B,MAAc,EACd,iBAA0B,EAC1B,cAAuB;IAEvB,OAAO;QACL,IAAI,sBAAsB,CAAC;YACzB,GAAG,OAAO;YACV,MAAM,EAAE,iBAAiB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM;YAC9C,cAAc;YACd,iBAAiB;YACjB,YAAY,EAAE,0BAA0B,CAAC,kBAAkB;SAC5D,CAAC;KACH,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,oBAAoB,CAClC,OAA+B,EAC/B,MAAc,EACd,iBAA0B;IAE1B,OAAO,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,iBAAiB,EAAE,SAAS,CAAC,CAAC;AAC9E,CAAC;AAED,MAAM,UAAU,sBAAsB,CACpC,OAA+B,EAC/B,KAAY;~~IAEZ~~,MAAM,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,QAAQ,EAAE,EAAE,GAAG,CAAC,CAAC;IAC7D,MAAM,eAAe,GAA8B,EAAE,CAAC;~~IACtD~~,eAAe,CAAC,IAAI,CAAC;QACnB,SAAS,EAAE,OAAO,CAAC,gBAAgB,CAAC,SAAS;QAC7C,KAAK;KACN,CAAC,CAAC;~~IACH~~,OAAO,CAAC,gBAAgB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,gBAAgB,EAAE,EAAE;QAC1D,eAAe,CAAC,IAAI,CAAC;YACnB,SAAS,EAAE,gBAAgB,CAAC,SAAS;YACrC,KAAK;SACN,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;~~IACH~~,OAAO,eAAe,CAAC;AACzB,CAAC;AAED,MAAM,UAAU,0BAA0B,CACxC,OAA+B,EAC/B,KAAY;IAEZ,OAAO,sBAAsB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QAC3D,OAAO,IAAI,sBAAsB,CAAC,MAAM,CAAC,CAAC;IAC5C,CAAC,CAAC,CAAC;AACL,CAAC;AACD,MAAM,UAAU,oBAAoB,CAClC,OAA+B,EAC/B,KAAY;~~IAEZ~~,OAAO,sBAAsB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;~~QAC3D~~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"}
1	+ {"version":3,"file":"polygonToCesium.js","sourceRoot":"","sources":["../../../../src/util/featureconverter/polygonToCesium.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,eAAe,EACf,0BAA0B,EAC1B,sBAAsB,EACtB,sBAAsB,EACtB,gBAAgB,EAChB,gBAAgB,EAEhB,YAAY,GACb,MAAM,sBAAsB,CAAC;AAK9B,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,UAAU,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,oCAAoC,EAAE,MAAM,uBAAuB,CAAC;AAa7E,MAAM,UAAU,qBAAqB,CACnC,OAA+B,EAC/B,MAAc,EACd,iBAA0B,EAC1B,cAAuB;IAEvB,MAAM,cAAc,GAA2B;QAC7C,GAAG,OAAO;QACV,iBAAiB;QACjB,cAAc;KACf,CAAC;IACF,IAAI,CAAC,iBAAiB,EAAE;QACtB,cAAc,CAAC,MAAM,GAAG,MAAM,CAAC;KAChC;IACD,OAAO,CAAC,IAAI,eAAe,CAAC,cAAc,CAAC,CAAC,CAAC;AAC/C,CAAC;AAED,MAAM,UAAU,uBAAuB,CACrC,OAA+B,EAC/B,MAAc,EACd,iBAA0B,EAC1B,cAAuB;IAEvB,OAAO;QACL,IAAI,sBAAsB,CAAC;YACzB,GAAG,OAAO;YACV,MAAM,EAAE,iBAAiB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM;YAC9C,cAAc;YACd,iBAAiB;YACjB,YAAY,EAAE,0BAA0B,CAAC,kBAAkB;SAC5D,CAAC;KACH,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,oBAAoB,CAClC,OAA+B,EAC/B,MAAc,EACd,iBAA0B;IAE1B,OAAO,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,iBAAiB,EAAE,SAAS,CAAC,CAAC;AAC9E,CAAC;AAED,MAAM,UAAU,sBAAsB,CACpC,OAA+B,EAC/B,KAAY,EACZ,WAAoB;IAEpB,MAAM,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,QAAQ,EAAE,EAAE,GAAG,CAAC,CAAC;IAC7D,MAAM,eAAe,GAA8B,EAAE,CAAC;IAEtD,eAAe,CAAC,IAAI,CAAC;QACnB,SAAS,EAAE,OAAO,CAAC,gBAAgB,CAAC,SAAS;QAC7C,KAAK;KACN,CAAC,CAAC;IAEH,OAAO,CAAC,gBAAgB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,gBAAgB,EAAE,EAAE;QAC1D,eAAe,CAAC,IAAI,CAAC;YACnB,SAAS,EAAE,gBAAgB,CAAC,SAAS;YACrC,KAAK;SACN,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,IAAI,WAAW,EAAE;QACf,eAAe,CAAC,OAAO,CAAC,CAAC,eAAe,EAAE,EAAE;YAC1C,eAAe,CAAC,SAAS,GAAG,eAAe,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;gBAC9D,MAAM,UAAU,GAAG,YAAY,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;gBACjD,UAAU,CAAC,MAAM,GAAG,WAAW,CAAC;gBAChC,OAAO,YAAY,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;YAC9C,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;KACJ;IACD,OAAO,eAAe,CAAC;AACzB,CAAC;AAED,MAAM,UAAU,0BAA0B,CACxC,OAA+B,EAC/B,KAAY;IAEZ,OAAO,sBAAsB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QAC3D,OAAO,IAAI,sBAAsB,CAAC,MAAM,CAAC,CAAC;IAC5C,CAAC,CAAC,CAAC;AACL,CAAC;AACD,MAAM,UAAU,oBAAoB,CAClC,OAA+B,EAC/B,KAAY,EACZ,WAAoB;IAEpB,OAAO,sBAAsB,CAAC,OAAO,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QACxE,OAAO,IAAI,gBAAgB,CAAC,MAAM,CAAC,CAAC;IACtC,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,kBAAkB,CAChC,QAAiB,EACjB,wBAAgC;IAEhC,IAAI,gBAAgB,CAAC;IACrB,MAAM,KAAK,GAAG,EAAE,CAAC;IACjB,MAAM,KAAK,GAAG,QAAQ,CAAC,cAAc,EAAE,CAAC;IACxC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACrC,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,cAAc,EAAE,CAAC;QACzC,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YACrC,MAAM,WAAW,GAAG,UAAU,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;YACtD,IAAI,WAAW,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE;gBAC1B,WAAW,CAAC,CAAC,CAAC,IAAI,wBAAwB,CAAC;aAC5C;YACD,OAAO,UAAU,CAAC,WAAW,CAC3B,WAAW,CAAC,CAAC,CAAC,EACd,WAAW,CAAC,CAAC,CAAC,EACd,WAAW,CAAC,CAAC,CAAC,CACf,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,oDAAoD;QACpD,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,EAAE;YACrE,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;SAC9B;QACD,IAAI,CAAC,KAAK,CAAC,EAAE;YACX,gBAAgB,GAAG,SAAS,CAAC;SAC9B;aAAM;YACL,KAAK,CAAC,IAAI,CAAC,IAAI,gBAAgB,CAAC,SAAS,CAAC,CAAC,CAAC;SAC7C;KACF;IACD,OAAO;QACL,gBAAgB,EAAE,IAAI,gBAAgB,CAAC,gBAAgB,EAAE,KAAK,CAAC;KAChE,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,UAAqB;IAClD,MAAM,WAAW,GAAiB,EAAE,CAAC;IACrC,UAAU,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7B,WAAW,CAAC,IAAI,CAAC,GAAG,oCAAoC,CAAC,OAAO,CAAC,CAAC,CAAC;IACrE,CAAC,CAAC,CAAC;IACH,OAAO,WAAW,CAAC;AACrB,CAAC;AAED,IAAI,eAAe,GAAqC,IAAI,CAAC;AAE7D,SAAS,kBAAkB;IACzB,IAAI,CAAC,eAAe,EAAE;QACpB,eAAe,GAAG;YAChB,cAAc;YACd,kBAAkB;YAClB,qBAAqB;YACrB,uBAAuB;YACvB,oBAAoB;YACpB,0BAA0B;YAC1B,oBAAoB;SACrB,CAAC;KACH;IACD,OAAO,eAAe,CAAC;AACzB,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,eAAe,CAAC,OAAgB;IAC9C,IAAI,OAAO,CAAC,OAAO,EAAE,KAAK,SAAS,EAAE;QACnC,OAAO,KAAK,CAAC;KACd;IACD,MAAM,eAAe,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC;IACrD,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAC/B,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;IACnC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;QACtC,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC7C,MAAM,eAAe,GAAG,GAAG,GAAG,QAAQ,CAAC;QACvC,OAAO,eAAe,IAAI,MAAM,GAAG,CAAC,CAAC;IACvC,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,KAAK,CAAC;KACd;IACD,gGAAgG;IAChG,MAAM,aAAa,GAAG,MAAM,GAAG,CAAC,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC;IAChE,IACE,eAAe;QACf,eAAe,CAAC,MAAM,IAAI,aAAa;QACvC,OAAO,CAAC,kBAAkB,EAAE,EAC5B;QACA,OAAO,eAAe,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;KACjE;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,CAAC,OAAO,UAAU,eAAe,CACrC,OAAgB,EAChB,KAAY,EACZ,UAAqB,EACrB,gBAAkC,EAClC,KAAY,EACZ,OAA4B;IAE5B,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,EAAE;QAC1C,OAAO;KACR;IACD,MAAM,sBAAsB,GAAG,kBAAkB,EAAE,CAAC;IACpD,MAAM,eAAe,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CACpD,eAAe,CAAC,OAAO,CAAC,CACzB,CAAC;IACF,sBAAsB,CACpB,OAAO,EACP,KAAK,EACL,eAAe,EACf,gBAAgB,EAChB,KAAK,EACL,sBAAsB,EACtB,OAAO,CACR,CAAC;AACJ,CAAC"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@vcmap/core",
-  "version": "5.0.0-rc.37",
+  "version": "5.0.0-rc.39",
   "description": "",
   "main": "dist/index.js",
   "type": "module",
@@ -61,8 +61,8 @@
     "typescript": "^5.0.4"
   },
   "peerDependencies": {
-    "@vcmap-cesium/engine": "^2.4.4",
-    "ol": "~7.5.1"
+    "@vcmap-cesium/engine": "^4.0.3",
+    "ol": "~7.5.2"
   },
   "eslintConfig": {
     "extends": [

package/src/cesium/cesium.d.ts CHANGED Viewed

@@ -20,7 +20,10 @@ import {
 } from '../layer/featureVisibility.js';
 import { handlerSymbol } from '../util/editor/editorSymbols.js';
 import { AxisAndPlanes } from '../util/editor/transformation/transformationTypes.js';
-import { cesiumTilesetLastUpdated } from '../layer/cesium/cesiumTilesetCesiumImpl.js';
+import {
+  cesiumTilesetLastUpdated,
+  updateFeatureOverride,
+} from '../layer/cesium/cesiumTilesetCesiumImpl.js';
 import { isTiledFeature } from '../layer/featureStoreLayer.js';
 declare module '@vcmap-cesium/engine' {
@@ -122,6 +125,7 @@ declare module '@vcmap-cesium/engine' {
     readonly batchTable: Cesium3DTileBatchTable;
     isDestroyed(): boolean;
     [cesiumTilesetLastUpdated]?: number;
+    [updateFeatureOverride]?: () => void;
   }
   interface Cesium3DTileset {

package/src/interaction/featureProviderInteraction.ts CHANGED Viewed

@@ -22,14 +22,16 @@ class FeatureProviderInteraction extends AbstractInteraction {
   // eslint-disable-next-line class-methods-use-this
   async pipe(event: InteractionEvent): Promise<InteractionEvent> {
     if (!event.feature) {
-      const layersWithProvider = [...event.map.layerCollection].filter((l) => {
-        return (
-          l.featureProvider &&
-          l.active &&
-          l.isSupported(event.map) &&
-          l.featureProvider.isSupported(event.map)
-        );
-      });
+      const layersWithProvider = [...event.map.layerCollection]
+        .filter((l) => {
+          return (
+            l.featureProvider &&
+            l.active &&
+            l.isSupported(event.map) &&
+            l.featureProvider.isSupported(event.map)
+          );
+        })
+        .reverse();
       if (layersWithProvider.length > 0) {
         const resolution = event.map.getCurrentResolution(

package/src/layer/cesium/cesiumTilesetCesiumImpl.ts CHANGED Viewed

@@ -16,6 +16,9 @@ import type { Coordinate } from 'ol/coordinate.js';
 import LayerImplementation from '../layerImplementation.js';
 import { vcsLayerName } from '../layerSymbols.js';
 import FeatureVisibility, {
+  hideFeature,
+  HighlightableFeature,
+  highlightFeature,
   originalStyle,
   updateOriginalStyle,
 } from '../featureVisibility.js';
@@ -34,6 +37,10 @@ export const cesiumTilesetLastUpdated: unique symbol = Symbol(
   'cesiumTilesetLastUpdated',
 );
+export const updateFeatureOverride: unique symbol = Symbol(
+  'updateFeatureOverride',
+);
 export function getExtentFromTileset(
   cesium3DTileset?: Cesium3DTileset,
 ): OLExtent {
@@ -120,11 +127,15 @@ class CesiumTilesetCesiumImpl
   async initialize(): Promise<void> {
     if (!this._initializedPromise) {
-      this._initializedPromise = Cesium3DTileset.fromUrl(
-        this.url as string,
-        this.tilesetOptions,
-      );
+      this._initializedPromise = Cesium3DTileset.fromUrl(this.url as string, {
+        ...this.tilesetOptions,
+        show: false, // show is handled by activate
+      });
       this.cesium3DTileset = await this._initializedPromise;
+      if (this.isDestroyed) {
+        this.cesium3DTileset.destroy();
+        return;
+      }
       if (this.tilesetProperties) {
         this.tilesetProperties.forEach(({ key, value }) => {
           // eslint-disable-next-line @typescript-eslint/ban-ts-comment
@@ -138,6 +149,8 @@ class CesiumTilesetCesiumImpl
       );
       this.cesium3DTileset.tileUnload.addEventListener((tile: Cesium3DTile) => {
         delete tile[cesiumTilesetLastUpdated];
+        delete tile.content[cesiumTilesetLastUpdated];
+        delete tile.content[updateFeatureOverride];
       });
       this._originalOrigin = Cartesian3.clone(
@@ -277,7 +290,14 @@ class CesiumTilesetCesiumImpl
         (this.globalHider?.lastUpdated ?? 0) ||
       content[cesiumTilesetLastUpdated] < this._styleLastUpdated
     ) {
+      // content[updateFeatureOverride]?.reset();
+      delete content[updateFeatureOverride];
       const batchSize = content.featuresLength;
+      const featureOverride = {
+        hideLocal: [] as [string, HighlightableFeature][],
+        hideGlobal: [] as [string, HighlightableFeature][],
+        highlight: [] as [string, HighlightableFeature][],
+      };
       for (let batchId = 0; batchId < batchSize; batchId++) {
         const feature = content.getFeature(batchId);
         if (feature) {
@@ -286,11 +306,14 @@ class CesiumTilesetCesiumImpl
             id = `${content.url}${batchId}`;
           }
+          let shouldUpdateOriginalStyle = true;
           if (
             this.featureVisibility.highlightedObjects[id] &&
             !this.featureVisibility.hasHighlightFeature(id, feature)
           ) {
             this.featureVisibility.addHighlightFeature(id, feature);
+            featureOverride.highlight.push([id, feature]);
+            shouldUpdateOriginalStyle = false;
           }
           if (
@@ -298,6 +321,7 @@ class CesiumTilesetCesiumImpl
             !this.featureVisibility.hasHiddenFeature(id, feature)
           ) {
             this.featureVisibility.addHiddenFeature(id, feature);
+            featureOverride.hideLocal.push([id, feature]);
           }
           if (
@@ -305,9 +329,11 @@ class CesiumTilesetCesiumImpl
             !this.globalHider?.hasFeature(id, feature)
           ) {
             this.globalHider?.addFeature(id, feature);
+            featureOverride.hideGlobal.push([id, feature]);
           }
           if (
+            shouldUpdateOriginalStyle &&
             this._styleLastUpdated > (content[cesiumTilesetLastUpdated] ?? 0) &&
             feature[originalStyle] // can only be a color for cesium, so no check for undefined required
           ) {
@@ -315,7 +341,34 @@ class CesiumTilesetCesiumImpl
           }
         }
       }
+      if (
+        featureOverride.hideLocal.length > 0 ||
+        featureOverride.hideGlobal.length > 0 ||
+        featureOverride.highlight.length > 0
+      ) {
+        content[updateFeatureOverride] = (): void => {
+          featureOverride.hideGlobal.forEach(([id, feature]) => {
+            if (this.globalHider?.hasFeature(id, feature)) {
+              hideFeature(feature);
+            }
+          });
+          featureOverride.hideLocal.forEach(([id, feature]) => {
+            if (this.featureVisibility.hasHiddenFeature(id, feature)) {
+              hideFeature(feature);
+            }
+          });
+          featureOverride.highlight.forEach(([id, feature]) => {
+            if (this.featureVisibility.hasHighlightFeature(id, feature)) {
+              highlightFeature(feature);
+            }
+          });
+        };
+      }
       content[cesiumTilesetLastUpdated] = Date.now();
+    } else {
+      content[updateFeatureOverride]?.();
     }
   }

package/src/layer/cesium/rasterLayerCesiumImpl.ts CHANGED Viewed

@@ -44,6 +44,10 @@ class RasterLayerCesiumImpl
   async initialize(): Promise<void> {
     if (!this.initialized) {
       this.cesiumLayer = await this.getCesiumLayer();
+      if (this.isDestroyed) {
+        this.cesiumLayer.destroy();
+        return Promise.resolve();
+      }
       this.cesiumLayer[vcsLayerName] = this.name;
       this.cesiumLayer.show = false;
       this.map.addImageryLayer(this.cesiumLayer);

package/src/layer/cesium/vectorCesiumImpl.ts CHANGED Viewed

@@ -78,7 +78,8 @@ class VectorCesiumImpl
   private _addListeners(): void {
     this._olListeners.push(
       this.source.on('addfeature', (event) => {
-        this._addFeature(event.feature as Feature);
+        // eslint-disable-next-line no-void
+        void this._addFeature(event.feature as Feature);
       }),
     );
@@ -90,7 +91,8 @@ class VectorCesiumImpl
     this._olListeners.push(
       this.source.on('changefeature', (event) => {
-        this._featureChanged(event.feature as Feature);
+        // eslint-disable-next-line no-void
+        void this._featureChanged(event.feature as Feature);
       }),
     );
@@ -115,7 +117,7 @@ class VectorCesiumImpl
     if (!this.initialized) {
       this._scene = this.map.getScene();
       this._addListeners();
-      this._addFeatures(this.source.getFeatures());
+      await this._addFeatures(this.source.getFeatures());
       await this._setupContext(this.map);
     }
     await super.initialize();
@@ -124,20 +126,19 @@ class VectorCesiumImpl
     }
   }
-  private _addFeatures(features: Feature[]): void {
+  private async _addFeatures(features: Feature[]): Promise<void> {
     // TODO we should make this non-blocking to better handle larger data sets check in RIWA Impl
-    features.forEach((f) => {
-      this._addFeature(f);
-    });
+    await Promise.allSettled(features.map((f) => this._addFeature(f)));
   }
   /**
    * converts a feature and adds the associated primitives to the collection of primitives
    */
-  private _addFeature(feature: Feature): void {
+  private async _addFeature(feature: Feature): Promise<void> {
     if (this.active) {
       // XXX cluster check here? or on init?
-      convert(
+      this._context!.features.add(feature);
+      await convert(
         feature,
         this.style.style,
         this.vectorProperties,
@@ -152,9 +153,9 @@ class VectorCesiumImpl
   /**
    * Forces a complete re-render of all features.
    */
-  refresh(): void {
+  async refresh(): Promise<void> {
     this._context?.clear();
-    this._addFeatures(this.source.getFeatures());
+    await this._addFeatures(this.source.getFeatures());
   }
   /**
@@ -168,10 +169,10 @@ class VectorCesiumImpl
   /**
    * called when a features property have changed
    */
-  private _featureChanged(feature: Feature): void {
+  private async _featureChanged(feature: Feature): Promise<void> {
     const cache = this._context!.createFeatureCache(feature);
     this._featureToAdd.delete(feature);
-    this._addFeature(feature);
+    await this._addFeature(feature);
     this._context!.clearFeatureCache(cache);
   }
@@ -179,7 +180,7 @@ class VectorCesiumImpl
     if (!this.active) {
       await super.activate();
       if (this.active) {
-        this._addFeatures([...this._featureToAdd]);
+        await this._addFeatures([...this._featureToAdd]);
         this._featureToAdd.clear();
         this._rootCollection.show = true;
         if (this._featureVisibilityListeners.length === 0) {
@@ -208,7 +209,8 @@ class VectorCesiumImpl
     if (this.initialized && !silent) {
       const features = this.source.getFeatures().filter((f) => !f.getStyle());
       features.forEach((f) => {
-        this._featureChanged(f);
+        // eslint-disable-next-line no-void
+        void this._featureChanged(f);
       });
     }
   }