bruce-cesium 7.0.0 → 7.0.2

package/dist/bruce-cesium.umd.js

@@ -9661,6 +9661,14 @@
                 // Type IDs that we'll allow to be rendered when receiving Entities.
                 // This might be exactly the Menu Item Type ID because of local data sources.
                 this.allowedTypeIDs = [];
+                /**
+                 * Our default path.
+                 * We render each entity individually.
+                 * @param entities
+                 * @param force
+                 * @returns
+                 */
+                this.renderAsIndividualsChain = Promise.resolve();
                 const { viewer, apiGetter, monitor, item, register: visualsManager, sharedGetters, onSeriesDiscovered } = params;
                 this.viewer = viewer;
                 this.sharedGetters = sharedGetters;
@@ -10593,14 +10601,18 @@
                 }
                 this.viewer.scene.requestRender();
             }
-            /**
-             * Our default path.
-             * We render each entity individually.
-             * @param entities
-             * @param force
-             * @returns
-             */
-            async renderAsIndividuals(entities, force = false) {
+            renderAsIndividuals(entities, force = false) {
+                // Waiting for prior call to finish resolving.
+                // This avoids race conditions against two sets of overlapping Entities.
+                const next = this.renderAsIndividualsChain
+                    .then(() => this.doRenderAsIndividuals(entities, force))
+                    .catch((e) => {
+                    console.error("EntitiesRenderManager.renderAsIndividuals failed:", e);
+                });
+                this.renderAsIndividualsChain = next;
+                return next;
+            }
+            async doRenderAsIndividuals(entities, force = false) {
                 var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
                 // When live we just want to show the latest pos.
                 // When not live, the user might scroll the timeline and want to see it a fluid animation between points in time.
@@ -10954,6 +10966,14 @@
                 // Many things are not supported when this is enabled.
                 this.useGeojson = false;
                 this.reRenderState = new EntityReRenderMaintainState();
+                /**
+                 * Our default path.
+                 * We render each entity individually.
+                 * @param entities
+                 * @param force
+                 * @returns
+                 */
+                this.renderAsIndividualsChain = Promise.resolve();
                 const { viewer, apiGetter, monitor, item, register: visualsManager } = params;
                 this.viewer = viewer;
                 this.apiGetter = apiGetter;
@@ -11577,14 +11597,18 @@
                 }
                 this.viewer.scene.requestRender();
             }
-            /**
-             * Our default path.
-             * We render each entity individually.
-             * @param entities
-             * @param force
-             * @returns
-             */
-            async renderAsIndividuals(entities, force = false) {
+            renderAsIndividuals(entities, force = false) {
+                // Waiting for prior call to finish resolving.
+                // This avoids race conditions against two sets of overlapping Entities.
+                const next = this.renderAsIndividualsChain
+                    .then(() => this.doRenderAsIndividuals(entities, force))
+                    .catch((e) => {
+                    console.error("EntitiesLoadedRenderManager.renderAsIndividuals failed:", e);
+                });
+                this.renderAsIndividualsChain = next;
+                return next;
+            }
+            async doRenderAsIndividuals(entities, force = false) {
                 const { updated, entities: cEntities } = await exports.EntityRenderEngine.Render({
                     viewer: this.viewer,
                     apiGetter: this.apiGetter,
@@ -12220,6 +12244,7 @@
                 this.getterSub = null;
                 this.disposed = false;
                 this.reRenderState = new EntityReRenderMaintainState();
+                this.renderEntityChain = Promise.resolve();
                 const { viewer, apiGetter, monitor, item, register: visualsManager } = params;
                 this.viewer = viewer;
                 this.apiGetter = apiGetter;
@@ -12342,7 +12367,18 @@
                     this.onGetterUpdate(entityId, true);
                 }
             }
-            async renderEntity(entity, force = false) {
+            renderEntity(entity, force = false) {
+                // Waiting for prior call to finish resolving.
+                // This avoids race conditions against two sets of overlapping Entities.
+                const next = this.renderEntityChain
+                    .then(() => this.doRenderEntity(entity, force))
+                    .catch((e) => {
+                    console.error("EntityRenderManager.renderEntity failed:", e);
+                });
+                this.renderEntityChain = next;
+                return next;
+            }
+            async doRenderEntity(entity, force = false) {
                 try {
                     if (this.disposed || this.viewer.isDestroyed()) {
                         return;
@@ -16778,6 +16814,7 @@
                 this.reRenderState = new EntityReRenderMaintainState();
                 this.zoomControl = [];
                 this.queryLoadId = 0;
+                this.renderDataLabEntitiesChain = Promise.resolve();
                 const { viewer, item, apiGetter, monitor, visualsRegister } = params;
                 this.viewer = viewer;
                 this.item = item;
@@ -17116,7 +17153,18 @@
                 }
                 return Array.from(entityMap.values());
             }
-            async renderDataLabEntities(entities, force = false) {
+            renderDataLabEntities(entities, force = false) {
+                // Waiting for prior call to finish resolving.
+                // This avoids race conditions against two sets of overlapping Entities.
+                const next = this.renderDataLabEntitiesChain
+                    .then(() => this.doRenderDataLabEntities(entities, force))
+                    .catch((e) => {
+                    console.error("EntitiesDatalabRenderManager.renderDataLabEntities failed:", e);
+                });
+                this.renderDataLabEntitiesChain = next;
+                return next;
+            }
+            async doRenderDataLabEntities(entities, force = false) {
                 var _a, _b, _c;
                 if (this.disposed || this.viewer.isDestroyed() || !(entities === null || entities === void 0 ? void 0 : entities.length)) {
                     return;
@@ -36974,8 +37022,9 @@
     const TEXTURE_FRAME_SERIES_ANIMATOR_KEY = "TextureFrameSeriesAnimator.Animator";
     (function (EntityRenderEnginePolygon) {
         async function Render(params) {
-            var _a, _b;
+            var _a, _b, _c;
             const entity = params.entity;
+            const style = params.style;
             const pRings = BModels.Entity.GetValue({
                 entity: entity,
                 path: ["Bruce", "VectorGeometry", "Polygon"]
@@ -36983,7 +37032,6 @@
             if (pRings == null || !Array.isArray(pRings) || pRings.length <= 0) {
                 return null;
             }
-            const style = params.style;
             const fillType = style.fillType || BModels.Style.EPolygonFillType.Color;
             const fillColorTrace = style.fillColor ? BModels.Calculator.TraceGetColor(style.fillColor, entity, params.tags) : { value: null, effective: null };
             const bFillColor = fillColorTrace.value;
@@ -36992,15 +37040,20 @@
             let textureTraceEffective = null;
             let frameArchive = null;
             if (fillType === BModels.Style.EPolygonFillType.Texture) {
-                const resolved = await resolveTexturedFill({
-                    api: params.api,
-                    style,
-                    entity,
-                    tags: params.tags
-                });
-                textureDataUri = resolved.dataUri;
-                textureTraceEffective = resolved.effective;
-                frameArchive = resolved.frameArchive || null;
+                try {
+                    const resolved = await resolveTexturedFill({
+                        api: params.api,
+                        style,
+                        entity,
+                        tags: params.tags
+                    });
+                    textureDataUri = resolved.dataUri;
+                    textureTraceEffective = resolved.effective;
+                    frameArchive = resolved.frameArchive || null;
+                }
+                catch (e) {
+                    console.error(`Polygon.Render: failed to resolve textured fill for entity ${((_a = entity === null || entity === void 0 ? void 0 : entity.Bruce) === null || _a === void 0 ? void 0 : _a.ID) || "<NONE>"}:`, e);
+                }
             }
             const hasFill = fillType === BModels.Style.EPolygonFillType.Texture
                 ? Boolean(textureDataUri || frameArchive || cFillColor.alpha > 0)
@@ -37198,7 +37251,7 @@
                     }
                 }
                 let borderPosses = posses.map(x => x.clone ? x.clone() : { ...x });
-                let cEntityBorder = (_b = (_a = params.rendered) === null || _a === void 0 ? void 0 : _a._siblingGraphics) === null || _b === void 0 ? void 0 : _b[0];
+                let cEntityBorder = (_c = (_b = params.rendered) === null || _b === void 0 ? void 0 : _b._siblingGraphics) === null || _c === void 0 ? void 0 : _c[0];
                 cEntity._siblingGraphics = [];
                 if (!cEntityBorder || ((!cEntityBorder.polyline && units == "px") ||
                     (!cEntityBorder.corridor && units == "m"))) {
@@ -37339,7 +37392,7 @@
         }
         EntityRenderEnginePolygon.Render = Render;
         async function RenderGroup(params) {
-            var _a, _b, _c;
+            var _a, _b, _c, _d;
             const api = params.apiGetter.getApi();
             const cEntities = new Map();
             // Gathering tags in case styling needs it.
@@ -37383,21 +37436,27 @@
                     }
                 }
                 const pStyle = (_b = style === null || style === void 0 ? void 0 : style.polygonStyle) !== null && _b !== void 0 ? _b : {};
-                const cEntity = await Render({
-                    entity: entity,
-                    style: pStyle,
-                    tags: tags,
-                    viewer: params.viewer,
-                    api,
-                    maxDistance: zoomItem.MaxZoom,
-                    minDistance: zoomItem.MinZoom,
-                    // Temporarily disabling re-using graphics for polygons as they have some bugs, and
-                    // they don't support any animation yet.
-                    // rendered: null
-                    rendered: (_c = params.rendered) === null || _c === void 0 ? void 0 : _c.get(entity.Bruce.ID),
-                    menuItemId: params.menuItemId,
-                    onSeriesDiscovered: params.onSeriesDiscovered
-                });
+                let cEntity = null;
+                try {
+                    cEntity = await Render({
+                        entity: entity,
+                        style: pStyle,
+                        tags: tags,
+                        viewer: params.viewer,
+                        api,
+                        maxDistance: zoomItem.MaxZoom,
+                        minDistance: zoomItem.MinZoom,
+                        // Temporarily disabling re-using graphics for polygons as they have some bugs, and
+                        // they don't support any animation yet.
+                        // rendered: null
+                        rendered: (_c = params.rendered) === null || _c === void 0 ? void 0 : _c.get(entity.Bruce.ID),
+                        menuItemId: params.menuItemId,
+                        onSeriesDiscovered: params.onSeriesDiscovered
+                    });
+                }
+                catch (e) {
+                    console.error(`Polygon.RenderGroup: failed to render entity ${((_d = entity === null || entity === void 0 ? void 0 : entity.Bruce) === null || _d === void 0 ? void 0 : _d.ID) || "<NONE>"}:`, e);
+                }
                 if (cEntity) {
                     const name = await getName$3(api, entity);
                     cEntity.name = name;
@@ -39003,7 +39062,7 @@
         StyleUtils.ApplyTypeStyle = ApplyTypeStyle;
     })(exports.StyleUtils || (exports.StyleUtils = {}));
 
-    const VERSION = "7.0.0";
+    const VERSION = "7.0.2";
     /**
      * Updates the environment instance used by bruce-cesium to one specified.
      * This can be used to ensure that the instance a parent is referencing is shared between bruce-cesium, bruce-models, and the parent app.