bruce-cesium 6.4.4 → 6.4.6

package/dist/bruce-cesium.es5.js

@@ -7834,6 +7834,116 @@ class PointClustering {
     }
 }
 
+/**
+ * Tracks per-entity rerender state for unsaved blob maintenance and stale API response suppression.
+ */
+class EntityReRenderMaintainState {
+    constructor() {
+        this.maintainedEntitiesById = {};
+        this.apiRevisionByEntityId = {};
+        this.skipApiRunByEntityId = {};
+        this.checkRunId = 0;
+    }
+    setMaintainedEntities(entities) {
+        var _a;
+        for (let i = 0; i < entities.length; i++) {
+            const entity = entities[i];
+            const id = (_a = entity === null || entity === void 0 ? void 0 : entity.Bruce) === null || _a === void 0 ? void 0 : _a.ID;
+            if (!id) {
+                continue;
+            }
+            this.maintainedEntitiesById[id] = entity;
+        }
+    }
+    clearMaintainedEntities(entityIds) {
+        for (let i = 0; i < entityIds.length; i++) {
+            const id = entityIds[i];
+            if (!id) {
+                continue;
+            }
+            delete this.maintainedEntitiesById[id];
+        }
+    }
+    getMaintainedEntities(entityIds) {
+        const entities = [];
+        for (let i = 0; i < entityIds.length; i++) {
+            const id = entityIds[i];
+            if (!id) {
+                continue;
+            }
+            const entity = this.maintainedEntitiesById[id];
+            if (entity) {
+                entities.push(entity);
+            }
+        }
+        return entities;
+    }
+    bumpApiRevisions(entityIds) {
+        var _a;
+        for (let i = 0; i < entityIds.length; i++) {
+            const id = entityIds[i];
+            if (!id) {
+                continue;
+            }
+            this.apiRevisionByEntityId[id] = ((_a = this.apiRevisionByEntityId[id]) !== null && _a !== void 0 ? _a : 0) + 1;
+        }
+    }
+    captureApiRevisions(entityIds) {
+        var _a;
+        const revisions = {};
+        for (let i = 0; i < entityIds.length; i++) {
+            const id = entityIds[i];
+            if (!id) {
+                continue;
+            }
+            revisions[id] = (_a = this.apiRevisionByEntityId[id]) !== null && _a !== void 0 ? _a : 0;
+        }
+        return revisions;
+    }
+    startCheckRun() {
+        this.checkRunId += 1;
+        return this.checkRunId;
+    }
+    getCurrentCheckRun() {
+        return this.checkRunId;
+    }
+    markSkipForCurrentRun(entityIds, isRunningCheck) {
+        if (!isRunningCheck) {
+            return;
+        }
+        const runId = this.checkRunId;
+        for (let i = 0; i < entityIds.length; i++) {
+            const id = entityIds[i];
+            if (!id) {
+                continue;
+            }
+            this.skipApiRunByEntityId[id] = runId;
+        }
+    }
+    shouldSkipInRun(entityId, runId) {
+        return this.skipApiRunByEntityId[entityId] === runId;
+    }
+    filterNonSkippedIds(entityIds, runId) {
+        return entityIds.filter((id) => {
+            return id && !this.shouldSkipInRun(id, runId);
+        });
+    }
+    filterCurrentApiEntities(params) {
+        const { entities, revisions, runId } = params;
+        return entities.filter((entity) => {
+            var _a, _b, _c;
+            const id = (_a = entity === null || entity === void 0 ? void 0 : entity.Bruce) === null || _a === void 0 ? void 0 : _a.ID;
+            if (!id) {
+                return false;
+            }
+            if (runId != null && this.shouldSkipInRun(id, runId)) {
+                return false;
+            }
+            return ((_b = this.apiRevisionByEntityId[id]) !== null && _b !== void 0 ? _b : 0) === ((_c = revisions[id]) !== null && _c !== void 0 ? _c : 0);
+        });
+    }
+}
+
 function isTurfAvailable() {
     return window && window.turf != null;
 }
@@ -8208,6 +8318,7 @@ var EntitiesRenderManager;
             this.renderQueue = [];
             this.renderQueueInterval = null;
             this.sources = [];
+            this.reRenderState = new EntityReRenderMaintainState();
             // Highly experimental flag to try improve rendering large sets of polygons and polylines.
             // Many things are not supported when this is enabled.
             this.useGeojson = false;
@@ -8431,6 +8542,20 @@ var EntitiesRenderManager;
             (_c = this.entityCheckQueue) === null || _c === void 0 ? void 0 : _c.Dispose();
             this.entityCheckQueue = null;
         }
+        preventCurrentCheckApiRefresh(entityIds) {
+            var _a;
+            this.reRenderState.markSkipForCurrentRun(entityIds, this.isRunningCheck);
+            if ((_a = this.entityCheckQueueIds) === null || _a === void 0 ? void 0 : _a.length) {
+                const lookup = {};
+                for (let i = 0; i < entityIds.length; i++) {
+                    const id = entityIds[i];
+                    if (id) {
+                        lookup[id] = true;
+                    }
+                }
+                this.entityCheckQueueIds = this.entityCheckQueueIds.filter(id => !lookup[id]);
+            }
+        }
         Dispose() {
             if (this.disposed) {
                 return;
@@ -8457,21 +8582,35 @@ var EntitiesRenderManager;
             this.sources = [];
         }
         async ReRender(params) {
-            var _a, _b;
-            let { entityIds, force, entities } = params;
+            var _a, _b, _c, _d;
+            let { entityIds, force, entities, maintain } = params;
             if (entities && !entityIds) {
                 entityIds = entities.map(x => { var _a; return (_a = x.Bruce) === null || _a === void 0 ? void 0 : _a.ID; });
             }
             if (entityIds == null) {
                 entityIds = Object.keys(this.renderedEntities);
             }
+            entityIds = entityIds.filter((x) => !!x);
+            if (!entityIds.length) {
+                return;
+            }
+            if (entities === null || entities === void 0 ? void 0 : entities.length) {
+                entities = [].concat(entities).filter(x => { var _a; return entityIds.includes((_a = x.Bruce) === null || _a === void 0 ? void 0 : _a.ID); });
+                if (force) {
+                    this.reRenderState.bumpApiRevisions(entityIds);
+                    this.preventCurrentCheckApiRefresh(entityIds);
+                }
+            }
+            if (maintain === true && (entities === null || entities === void 0 ? void 0 : entities.length)) {
+                this.reRenderState.setMaintainedEntities(entities);
+            }
+            else if (maintain !== true) {
+                this.reRenderState.clearMaintainedEntities(entityIds);
+            }
             this.visualsManager.MarkStale({
                 entityIds: entityIds,
                 menuItemIds: [this.item.id]
             });
-            if (entities === null || entities === void 0 ? void 0 : entities.length) {
-                entities = [].concat(entities).filter(x => { var _a; return entityIds.includes((_a = x.Bruce) === null || _a === void 0 ? void 0 : _a.ID); });
-            }
             // Forcing to skip queue and to render immediately.
             if (force) {
                 if (entities === null || entities === void 0 ? void 0 : entities.length) {
@@ -8479,18 +8618,39 @@ var EntitiesRenderManager;
                 }
                 else {
                     try {
-                        const data = await Entity$1.GetListByIds({
-                            api: this.apiGetter.getApi(),
-                            entityIds,
-                            historicKey: (_a = this.item.BruceEntity) === null || _a === void 0 ? void 0 : _a.historicAttrKey,
-                            historicPoint: this.viewer.clock.currentTime.toString(),
-                            schemaId: (_b = this.item.BruceEntity) === null || _b === void 0 ? void 0 : _b.schemaId,
-                            expandSources: true,
-                            scenario: this.scenario,
-                            migrated: true,
-                            maxSearchTimeSec: 60 * 2
-                        });
-                        this.renderEntities(data.entities, true);
+                        const maintained = this.reRenderState.getMaintainedEntities(entityIds);
+                        const maintainedLookup = {};
+                        for (let i = 0; i < maintained.length; i++) {
+                            const id = (_b = (_a = maintained[i]) === null || _a === void 0 ? void 0 : _a.Bruce) === null || _b === void 0 ? void 0 : _b.ID;
+                            if (id) {
+                                maintainedLookup[id] = true;
+                            }
+                        }
+                        if (maintained.length) {
+                            this.renderEntities(maintained, true);
+                        }
+                        const apiIds = entityIds.filter(id => !maintainedLookup[id]);
+                        if (apiIds.length) {
+                            const revisions = this.reRenderState.captureApiRevisions(apiIds);
+                            const data = await Entity$1.GetListByIds({
+                                api: this.apiGetter.getApi(),
+                                entityIds: apiIds,
+                                historicKey: (_c = this.item.BruceEntity) === null || _c === void 0 ? void 0 : _c.historicAttrKey,
+                                historicPoint: this.viewer.clock.currentTime.toString(),
+                                schemaId: (_d = this.item.BruceEntity) === null || _d === void 0 ? void 0 : _d.schemaId,
+                                expandSources: true,
+                                scenario: this.scenario,
+                                migrated: true,
+                                maxSearchTimeSec: 60 * 2
+                            });
+                            const resolved = this.reRenderState.filterCurrentApiEntities({
+                                entities: data.entities,
+                                revisions
+                            });
+                            if (resolved.length) {
+                                this.renderEntities(resolved, true);
+                            }
+                        }
                     }
                     catch (e) {
                         console.error(e);
@@ -8537,26 +8697,47 @@ var EntitiesRenderManager;
             }
         }
         async doEntityCheck(ids) {
+            var _a, _b;
             if (this.isRunningCheck) {
                 this.entityCheckQueueIds = this.entityCheckQueueIds.concat(ids);
                 this.entityCheckQueue.Call();
                 return;
             }
-            ids.concat(this.entityCheckQueueIds);
+            ids = ids.concat(this.entityCheckQueueIds);
             this.entityCheckQueueIds = [];
             ids = ids.filter((id, index) => {
                 return ids.indexOf(id) === index;
             });
             this.isRunningCheck = true;
+            const runId = this.reRenderState.startCheckRun();
             const api = this.apiGetter.getApi();
             try {
                 if (this.disposed) {
                     return;
                 }
                 if (ids.length > 0) {
+                    const maintained = this.reRenderState.getMaintainedEntities(ids);
+                    const maintainedLookup = {};
+                    for (let i = 0; i < maintained.length; i++) {
+                        const id = (_b = (_a = maintained[i]) === null || _a === void 0 ? void 0 : _a.Bruce) === null || _b === void 0 ? void 0 : _b.ID;
+                        if (id) {
+                            maintainedLookup[id] = true;
+                        }
+                    }
+                    if (maintained.length) {
+                        this.distributeForRender(maintained);
+                    }
+                    let apiIds = ids.filter((id) => {
+                        return !maintainedLookup[id] && !this.reRenderState.shouldSkipInRun(id, runId);
+                    });
                     const checkBatch = async () => {
                         var _a, _b;
-                        const entityIds = ids.splice(0, CHECK_BATCH_SIZE);
+                        apiIds = this.reRenderState.filterNonSkippedIds(apiIds, runId);
+                        const entityIds = apiIds.splice(0, CHECK_BATCH_SIZE);
+                        if (!entityIds.length) {
+                            return;
+                        }
+                        const revisions = this.reRenderState.captureApiRevisions(entityIds);
                         const { entities } = await Entity$1.GetListByIds({
                             api,
                             entityIds,
@@ -8571,9 +8752,16 @@ var EntitiesRenderManager;
                         if (this.disposed) {
                             return;
                         }
-                        this.distributeForRender(entities);
+                        const resolved = this.reRenderState.filterCurrentApiEntities({
+                            entities,
+                            revisions,
+                            runId
+                        });
+                        if (resolved.length) {
+                            this.distributeForRender(resolved);
+                        }
                     };
-                    while (ids.length > 0) {
+                    while (apiIds.length > 0) {
                         await checkBatch();
                     }
                 }
@@ -9249,6 +9437,7 @@ var EntitiesLoadedRenderManager;
             // Highly experimental flag to try improve rendering large sets of polygons and polylines.
             // Many things are not supported when this is enabled.
             this.useGeojson = false;
+            this.reRenderState = new EntityReRenderMaintainState();
             const { viewer, apiGetter, monitor, item, register: visualsManager } = params;
             this.viewer = viewer;
             this.apiGetter = apiGetter;
@@ -9397,7 +9586,7 @@ var EntitiesLoadedRenderManager;
             this.sources = [];
         }
         async ReRender(params) {
-            let { entityIds, force, entities } = params;
+            let { entityIds, force, entities, maintain } = params;
             if (entities && !entityIds) {
                 entityIds = entities.map(x => { var _a; return (_a = x.Bruce) === null || _a === void 0 ? void 0 : _a.ID; });
             }
@@ -9411,8 +9600,21 @@ var EntitiesLoadedRenderManager;
                     return (_b = (_a = this.item.BruceEntity) === null || _a === void 0 ? void 0 : _a.Entities) === null || _b === void 0 ? void 0 : _b.find(y => { var _a; return ((_a = y === null || y === void 0 ? void 0 : y.Bruce) === null || _a === void 0 ? void 0 : _a.ID) == x; });
                 });
             }
+            entityIds = entityIds.filter((x) => !!x);
+            if (!entityIds.length) {
+                return;
+            }
             if (entities === null || entities === void 0 ? void 0 : entities.length) {
                 entities = [].concat(entities).filter(x => { var _a; return entityIds.includes((_a = x.Bruce) === null || _a === void 0 ? void 0 : _a.ID); });
+                if (force) {
+                    this.reRenderState.bumpApiRevisions(entityIds);
+                }
+            }
+            if (maintain === true && (entities === null || entities === void 0 ? void 0 : entities.length)) {
+                this.reRenderState.setMaintainedEntities(entities);
+            }
+            else if (maintain !== true) {
+                this.reRenderState.clearMaintainedEntities(entityIds);
             }
             this.visualsManager.MarkStale({
                 entityIds: entityIds,
@@ -9447,14 +9649,31 @@ var EntitiesLoadedRenderManager;
             }
         }
         async doEntityCheck(ids, force = false) {
+            var _a, _b;
             const api = this.apiGetter.getApi();
             try {
                 if (this.disposed) {
                     return;
                 }
                 if (ids.length > 0) {
+                    const maintained = this.reRenderState.getMaintainedEntities(ids);
+                    const maintainedLookup = {};
+                    for (let i = 0; i < maintained.length; i++) {
+                        const id = (_b = (_a = maintained[i]) === null || _a === void 0 ? void 0 : _a.Bruce) === null || _b === void 0 ? void 0 : _b.ID;
+                        if (id) {
+                            maintainedLookup[id] = true;
+                        }
+                    }
+                    if (maintained.length) {
+                        await this.onGetterUpdate(maintained, force);
+                    }
+                    let apiIds = ids.filter(id => !maintainedLookup[id]);
                     const checkBatch = async () => {
-                        const entityIds = ids.splice(0, CHECK_BATCH_SIZE$1);
+                        const entityIds = apiIds.splice(0, CHECK_BATCH_SIZE$1);
+                        if (!entityIds.length) {
+                            return;
+                        }
+                        const revisions = this.reRenderState.captureApiRevisions(entityIds);
                         const { entities } = await Entity$1.GetListByIds({
                             api,
                             entityIds,
@@ -9465,9 +9684,15 @@ var EntitiesLoadedRenderManager;
                         if (this.disposed) {
                             return;
                         }
-                        this.onGetterUpdate(entities, force);
+                        const resolved = this.reRenderState.filterCurrentApiEntities({
+                            entities,
+                            revisions
+                        });
+                        if (resolved.length) {
+                            this.onGetterUpdate(resolved, force);
+                        }
                     };
-                    while (ids.length > 0) {
+                    while (apiIds.length > 0) {
                         await checkBatch();
                     }
                 }
@@ -9954,6 +10179,7 @@ var EntitiesIdsRenderManager;
             this.renderQueueActive = false;
             this.renderQueue = [];
             this.renderQueueForceFlags = [];
+            this.reRenderState = new EntityReRenderMaintainState();
             const { viewer, apiGetter, monitor, item, register: visualsManager } = params;
             this.viewer = viewer;
             this.apiGetter = apiGetter;
@@ -10023,7 +10249,7 @@ var EntitiesIdsRenderManager;
             this.renderQueueActive = false;
         }
         async ReRender(params) {
-            let { entityIds, force, entities } = params;
+            let { entityIds, force, entities, maintain } = params;
             if (entities && !entityIds) {
                 entityIds = entities.map(x => { var _a; return (_a = x.Bruce) === null || _a === void 0 ? void 0 : _a.ID; });
             }
@@ -10037,12 +10263,28 @@ var EntitiesIdsRenderManager;
                     return (_a = this.item.BruceEntity) === null || _a === void 0 ? void 0 : _a.EntityIds.includes(x);
                 });
             }
+            entityIds = entityIds.filter((x) => !!x);
+            if (!entityIds.length) {
+                return;
+            }
+            if (entities === null || entities === void 0 ? void 0 : entities.length) {
+                entities = [].concat(entities).filter(x => { var _a; return entityIds.includes((_a = x.Bruce) === null || _a === void 0 ? void 0 : _a.ID); });
+                if (force) {
+                    this.reRenderState.bumpApiRevisions(entityIds);
+                }
+            }
+            if (maintain === true && (entities === null || entities === void 0 ? void 0 : entities.length)) {
+                this.reRenderState.setMaintainedEntities(entities);
+            }
+            else if (maintain !== true) {
+                this.reRenderState.clearMaintainedEntities(entityIds);
+            }
             this.visualsManager.MarkStale({
                 entityIds: entityIds,
                 menuItemIds: [this.item.id]
             });
             if (entities === null || entities === void 0 ? void 0 : entities.length) {
-                this.renderEntities([].concat(entities).filter(x => { var _a; return entityIds.includes((_a = x.Bruce) === null || _a === void 0 ? void 0 : _a.ID); }), force);
+                this.renderEntities(entities, force);
             }
             else {
                 this.onGetterUpdate(entityIds, force);
@@ -10066,18 +10308,35 @@ var EntitiesIdsRenderManager;
             }
         }
         async onGetterUpdate(entityIds, force = false) {
+            var _a, _b;
             if (this.disposed || this.viewer.isDestroyed() || !(entityIds === null || entityIds === void 0 ? void 0 : entityIds.length)) {
                 return;
             }
             try {
+                const maintained = this.reRenderState.getMaintainedEntities(entityIds);
+                const maintainedLookup = {};
+                for (let i = 0; i < maintained.length; i++) {
+                    const id = (_b = (_a = maintained[i]) === null || _a === void 0 ? void 0 : _a.Bruce) === null || _b === void 0 ? void 0 : _b.ID;
+                    if (id) {
+                        maintainedLookup[id] = true;
+                    }
+                }
+                if (maintained.length) {
+                    await this.renderEntities(maintained, force);
+                }
+                const apiIds = entityIds.filter(id => !maintainedLookup[id]);
+                if (!apiIds.length) {
+                    return;
+                }
                 const api = this.apiGetter.getApi();
+                const revisions = this.reRenderState.captureApiRevisions(apiIds);
                 let newDateTime = null;
                 if (this.item.BruceEntity.historic || this.item.BruceEntity.historicAttrKey) {
                     newDateTime = JulianDate.toDate(this.viewer.clock.currentTime).toISOString();
                 }
                 const { entities } = await Entity$1.GetListByIds({
                     api,
-                    entityIds,
+                    entityIds: apiIds,
                     historicPoint: newDateTime,
                     historicKey: this.item.BruceEntity.historicAttrKey,
                     expandSources: true,
@@ -10087,7 +10346,11 @@ var EntitiesIdsRenderManager;
                     // Honestly could lower down to 30 seconds, but we'll keep it high for now.
                     maxSearchTimeSec: 60 * 5,
                 });
-                await this.renderEntities(entities, force);
+                const resolved = this.reRenderState.filterCurrentApiEntities({
+                    entities,
+                    revisions
+                });
+                await this.renderEntities(resolved, force);
             }
             catch (e) {
                 console.error(e);
@@ -10447,6 +10710,7 @@ var EntityRenderManager;
             this.getter = null;
             this.getterSub = null;
             this.disposed = false;
+            this.reRenderState = new EntityReRenderMaintainState();
             const { viewer, apiGetter, monitor, item, register: visualsManager } = params;
             this.viewer = viewer;
             this.apiGetter = apiGetter;
@@ -10494,22 +10758,33 @@ var EntityRenderManager;
             });
         }
         async ReRender(params) {
-            let { entityIds, force, entities } = params;
+            let { entityIds, force, entities, maintain } = params;
             if (entities && !entityIds) {
                 entityIds = entities.map(x => { var _a; return (_a = x.Bruce) === null || _a === void 0 ? void 0 : _a.ID; });
             }
-            if (entityIds && !entityIds.includes(this.item.BruceEntity.EntityId)) {
+            const itemEntityId = this.item.BruceEntity.EntityId;
+            if (entityIds && !entityIds.includes(itemEntityId)) {
                 return;
             }
+            const incoming = entities === null || entities === void 0 ? void 0 : entities.find(x => { var _a; return ((_a = x.Bruce) === null || _a === void 0 ? void 0 : _a.ID) == itemEntityId; });
+            if (incoming && force) {
+                this.reRenderState.bumpApiRevisions([itemEntityId]);
+            }
+            if (maintain === true && incoming) {
+                this.reRenderState.setMaintainedEntities([incoming]);
+            }
+            else if (maintain !== true) {
+                this.reRenderState.clearMaintainedEntities([itemEntityId]);
+            }
             this.visualsManager.MarkStale({
-                entityIds: entityIds,
+                entityIds: [itemEntityId],
                 menuItemIds: [this.item.id]
             });
-            if (entities === null || entities === void 0 ? void 0 : entities.length) {
-                await this.renderEntity(entities.find(x => { var _a; return ((_a = x.Bruce) === null || _a === void 0 ? void 0 : _a.ID) == this.item.BruceEntity.EntityId; }), force);
+            if (incoming) {
+                await this.renderEntity(incoming, force);
             }
             else {
-                await this.onGetterUpdate(this.item.BruceEntity.EntityId, force);
+                await this.onGetterUpdate(itemEntityId, force);
             }
         }
         async onGetterUpdate(id, force = false) {
@@ -10517,13 +10792,25 @@ var EntityRenderManager;
                 if (this.disposed || this.viewer.isDestroyed()) {
                     return;
                 }
+                const maintained = this.reRenderState.getMaintainedEntities([id]);
+                if (maintained.length) {
+                    await this.renderEntity(maintained[0], force);
+                    return;
+                }
                 const api = this.apiGetter.getApi();
+                const revisions = this.reRenderState.captureApiRevisions([id]);
                 const { entity } = await Entity$1.Get({
                     api,
                     entityId: id,
                     migrated: true
                 });
-                this.renderEntity(entity, force);
+                const resolved = this.reRenderState.filterCurrentApiEntities({
+                    entities: entity ? [entity] : [],
+                    revisions
+                });
+                if (resolved.length) {
+                    this.renderEntity(resolved[0], force);
+                }
             }
             catch (e) {
                 console.error(e);
@@ -11026,6 +11313,7 @@ class TilesetStyler {
         // Indicates that we are retrieving historic records.
         // This means that the current scene's time is included in the request.
         this.historic = false;
+        this.reRenderState = new EntityReRenderMaintainState();
         // More expensive process.
         // When an Entity is styled, the rego is reviewed and updated if needed.
         // This is currently used for scenarios, and off by default to keep other processes faster.
@@ -11178,16 +11466,29 @@ class TilesetStyler {
      * @param entityIds
      * @param entities If an object is not available for a supplied Entity ID, then the cache for it is removed.
      */
-    SetEntityCache(entityIds, entities) {
+    SetEntityCache(entityIds, entities, maintain) {
         if (!this.entityGatherer) {
             console.warn("TilesetStyler: EntityGatherer not initialized, cannot set entity cache.");
             return;
         }
+        if (!(entityIds === null || entityIds === void 0 ? void 0 : entityIds.length)) {
+            return;
+        }
+        if (maintain === true && (entities === null || entities === void 0 ? void 0 : entities.length)) {
+            this.reRenderState.setMaintainedEntities(entities);
+        }
+        else if (maintain !== true) {
+            this.reRenderState.clearMaintainedEntities(entityIds);
+        }
+        let effectiveEntities = entities;
+        if ((!effectiveEntities || !effectiveEntities.length) && maintain === true) {
+            effectiveEntities = this.reRenderState.getMaintainedEntities(entityIds);
+        }
         // Turn the Entities array into an accessible dictionary.
         const newDataMap = new Map();
-        if (entities) {
-            for (let i = 0; i < entities.length; i++) {
-                const entity = entities[i];
+        if (effectiveEntities) {
+            for (let i = 0; i < effectiveEntities.length; i++) {
+                const entity = effectiveEntities[i];
                 if (entity.Bruce) {
                     newDataMap.set(entity.Bruce.ID, entity);
                 }
@@ -11563,7 +11864,7 @@ class TilesetStyler {
         if (!fill || fill.length <= 0) {
             return false;
         }
-        return fill[0].type != 0;
+        return fill[0].type != 0 || fill[0].value instanceof Function;
     }
 }
 
@@ -14057,7 +14358,7 @@ var TilesetCadRenderManager;
             this.viewerDateTimeDispose();
         }
         async ReRender(params) {
-            let { entityIds, force, entities } = params;
+            let { entityIds, force, entities, maintain } = params;
             if (entities && !entityIds) {
                 entityIds = entities.map(x => { var _a; return (_a = x.Bruce) === null || _a === void 0 ? void 0 : _a.ID; });
             }
@@ -14071,7 +14372,7 @@ var TilesetCadRenderManager;
                 regos = regos.filter(r => entityIds.indexOf(r.entityId) >= 0);
             }
             // Update the cache so we use that data instead of requesting the records.
-            this.styler.SetEntityCache(entityIds, entities);
+            this.styler.SetEntityCache(entityIds, entities, maintain);
             this.styler.QueueEntities(regos, true);
         }
         /**
@@ -15682,7 +15983,7 @@ var TilesetEntitiesRenderManager;
             return rego;
         }
         async ReRender(params) {
-            let { entityIds, force, entities } = params;
+            let { entityIds, force, entities, maintain } = params;
             if (entities && !entityIds) {
                 entityIds = entities.map(x => { var _a; return (_a = x.Bruce) === null || _a === void 0 ? void 0 : _a.ID; });
             }
@@ -15696,7 +15997,7 @@ var TilesetEntitiesRenderManager;
                 regos = regos.filter(r => entityIds.indexOf(r.entityId) >= 0);
             }
             // Update the cache so we use that data instead of requesting the records.
-            this.styler.SetEntityCache(entityIds, entities);
+            this.styler.SetEntityCache(entityIds, entities, maintain);
             this.styler.QueueEntities(regos, true);
         }
     }
@@ -16465,7 +16766,7 @@ var TilesetArbRenderManager;
             });
         }
         async ReRender(params) {
-            let { entityIds, force, entities } = params;
+            let { entityIds, force, entities, maintain } = params;
             if (entities && !entityIds) {
                 entityIds = entities.map(x => { var _a; return (_a = x.Bruce) === null || _a === void 0 ? void 0 : _a.ID; });
             }
@@ -16479,7 +16780,7 @@ var TilesetArbRenderManager;
                 regos = regos.filter(r => entityIds.indexOf(r.entityId) >= 0);
             }
             // Update the cache so we use that data instead of requesting the records.
-            this.styler.SetEntityCache(entityIds, entities);
+            this.styler.SetEntityCache(entityIds, entities, maintain);
             this.styler.QueueEntities(regos, true);
         }
         mapTilesetFeature(feature) {
@@ -19431,7 +19732,7 @@ var MenuItemManager;
          * @param params
          */
         async ReRender(params) {
-            let { entityIds, entities, menuItemIds, force } = params;
+            let { entityIds, entities, menuItemIds, force, maintain } = params;
             if (!(entityIds === null || entityIds === void 0 ? void 0 : entityIds.length) && !(entities === null || entities === void 0 ? void 0 : entities.length)) {
                 return;
             }
@@ -19445,7 +19746,8 @@ var MenuItemManager;
                     await item.renderManager.ReRender({
                         entityIds,
                         entities,
-                        force
+                        force,
+                        maintain
                     });
                 }
             }
@@ -34979,7 +35281,7 @@ class WidgetViewBar extends Widget.AWidget {
     }
 }
 
-const VERSION = "6.4.4";
+const VERSION = "6.4.6";
 /**
  * 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.