bruce-cesium 7.3.1 → 7.3.2

package/dist/bruce-cesium.umd.js

@@ -9114,12 +9114,13 @@
             ReassignMenuItem(params) {
                 var _a;
                 const { fromMenuItemId, toMenuItemId, toMenuItemType, toPriority, requestRender, source, lazy, onBatch, onComplete } = params;
+                const noop = () => { };
                 if (!fromMenuItemId || !toMenuItemId || fromMenuItemId === toMenuItemId) {
-                    return;
+                    return noop;
                 }
                 const entityIds = this.entityIdsByMenuItem[fromMenuItemId];
                 if (!entityIds) {
-                    return;
+                    return noop;
                 }
                 const idsSnapshot = Array.from(entityIds);
                 const regoSnapshot = new Map();
@@ -9130,7 +9131,7 @@
                     }
                 }
                 const reassignOne = (entityId) => {
-                    var _a, _b;
+                    var _a, _b, _c;
                     const regos = this.rego[entityId];
                     if (!regos) {
                         return null;
@@ -9149,6 +9150,7 @@
                     }
                     rego.menuItemId = toMenuItemId;
                     rego.menuItemType = toMenuItemType;
+                    const priorityChanged = toPriority != null && rego.priority !== toPriority;
                     if (toPriority != null) {
                         rego.priority = toPriority;
                     }
@@ -9174,15 +9176,17 @@
                     }
                     this.unindexMenuItemEntityIfAbsent(fromMenuItemId, entityId);
                     this.indexMenuItemEntity(toMenuItemId, entityId);
-                    this.queueUpdate({
-                        entityId,
-                        refresh: true
-                    });
+                    // Don't queue if no register-level visual changes are required.
+                    if (priorityChanged || ((_c = this.states[entityId]) === null || _c === void 0 ? void 0 : _c[toMenuItemId])) {
+                        this.queueUpdate({
+                            entityId,
+                            refresh: true
+                        });
+                    }
                     return rego;
                 };
                 if (lazy) {
-                    this.startLazyReassign(idsSnapshot, reassignOne, requestRender, onBatch, onComplete);
-                    return;
+                    return this.startLazyReassign(idsSnapshot, reassignOne, requestRender, onBatch, onComplete);
                 }
                 for (const entityId of idsSnapshot) {
                     reassignOne(entityId);
@@ -9190,17 +9194,12 @@
                 if (requestRender != false) {
                     this.viewer.scene.requestRender();
                 }
+                return noop;
             }
             startLazyReassign(entityIds, reassignOne, requestRender, onBatch, onComplete) {
                 const BATCH_SIZE = 5000;
                 let index = 0;
-                const interval = setInterval(() => {
-                    if (this.Disposed) {
-                        clearInterval(interval);
-                        this.activeChunkedIntervals.delete(interval);
-                        return;
-                    }
-                    const end = Math.min(index + BATCH_SIZE, entityIds.length);
+                const runTo = (end) => {
                     const batch = [];
                     for (; index < end; index++) {
                         const rego = reassignOne(entityIds[index]);
@@ -9214,6 +9213,14 @@
                     if (requestRender != false) {
                         this.viewer.scene.requestRender();
                     }
+                };
+                const interval = setInterval(() => {
+                    if (this.Disposed) {
+                        clearInterval(interval);
+                        this.activeChunkedIntervals.delete(interval);
+                        return;
+                    }
+                    runTo(Math.min(index + BATCH_SIZE, entityIds.length));
                     if (index >= entityIds.length) {
                         clearInterval(interval);
                         this.activeChunkedIntervals.delete(interval);
@@ -9221,6 +9228,14 @@
                     }
                 }, 10);
                 this.activeChunkedIntervals.add(interval);
+                return (finishRemaining) => {
+                    clearInterval(interval);
+                    this.activeChunkedIntervals.delete(interval);
+                    if (finishRemaining && !this.Disposed) {
+                        runTo(entityIds.length);
+                        onComplete === null || onComplete === void 0 ? void 0 : onComplete();
+                    }
+                };
             }
             /**
              * Locates a visual corresponding to a given entity id.
@@ -9343,7 +9358,7 @@
                         }
                     }
                     const removeOne = (entityId) => {
-                        var _a;
+                        var _a, _b;
                         const entityRegos = this.rego[entityId];
                         if (!entityRegos) {
                             return;
@@ -9382,15 +9397,24 @@
                         if (source !== EUpdateSource.TREE_CASCADE) {
                             (_a = this.onUpdate) === null || _a === void 0 ? void 0 : _a.Trigger(update);
                         }
-                        if (doesInclude) {
+                        // Only worth refreshing while the Entity is still drawn by something else, since
+                        // losing this rego can change which of the survivors wins. With none left there is
+                        // nothing to restyle, and queueing one per removed Entity is what turns disabling a
+                        // large menu item into minutes of scheduled work.
+                        if (doesInclude && ((_b = this.rego[entityId]) === null || _b === void 0 ? void 0 : _b.length)) {
                             this.queueUpdate({
                                 entityId: entityId,
                                 refresh: false
                             });
                         }
                     };
+                    const finish = () => {
+                        this.releaseMenuItemCollection(menuItemId);
+                        this.RemoveTilesetsByMenuItem(menuItemId);
+                        onComplete === null || onComplete === void 0 ? void 0 : onComplete();
+                    };
                     if (lazy) {
-                        this.startLazyRemoval(entityIds, removeOne, onComplete);
+                        this.startLazyRemoval(entityIds, removeOne, finish);
                         return;
                     }
                     WithSuspendedCCollections(this.allSceneCollections(), () => {
@@ -9398,8 +9422,7 @@
                             removeOne(entityId);
                         }
                     });
-                    this.releaseMenuItemCollection(menuItemId);
-                    this.RemoveTilesetsByMenuItem(menuItemId);
+                    finish();
                 }
                 else if (entityId) {
                     const entityRegos = this.rego[entityId];
@@ -14371,6 +14394,14 @@
             this.disposed = true;
             this.hDisposals.forEach((d) => d());
             this.hDisposals = [];
+            // A tick still awaiting a response resumes after this, and anything left here would have it
+            // ask for the whole set again on the way out.
+            this.eIdQueue = [];
+            this.eIdQueued.clear();
+            this.priorityCount = 0;
+            this.allEIds.clear();
+            this.lastFoundDateTimes.clear();
+            this.entityDataOverrides.clear();
         }
         checkRange(force) {
             const min = this.viewer.clock.startTime.toString();
@@ -14383,7 +14414,7 @@
             }
         }
         onTick(force) {
-            if (this.runningTick) {
+            if (this.runningTick || this.disposed) {
                 return;
             }
             const rTime = this.viewer.clock.currentTime.toString();
@@ -16182,9 +16213,12 @@
                 // Removal callbacks for this instance's own tile stream listeners.
                 this.tileLoadRemoval = null;
                 this.tileUnloadRemoval = null;
-                // Chunks AdoptHandoff()'s restyle of handed-off content across ticks instead of one
-                // synchronous pass over potentially millions of regos.
-                this.handoffRestyleInterval = null;
+                // Cancels AdoptHandoff()'s chunked re-parent of handed-off content, which runs across ticks
+                // instead of one synchronous pass over potentially millions of regos.
+                this.handoffReassignCancel = null;
+                // Menu item the in-flight re-parent is still pulling regos off, so a teardown mid-swap can
+                // clear both sides rather than orphaning whatever had not moved yet.
+                this.handoffSourceMenuItemId = null;
                 this.styler = new exports.TilesetRenderEngine.Styler();
                 this.modelTreeUpdate = new BModels.BruceEvent();
                 // Quick look-up of the model tree nodes by entity/geomId.
@@ -16513,7 +16547,7 @@
             }
             // Returns null (fall back to a normal Dispose()) if the tileset hasn't finished loading yet.
             PrepareHandoff() {
-                var _a, _b, _c;
+                var _a, _b, _c, _d;
                 if (this.disposed || !this.cTileset || this.cTileset.isDestroyed()) {
                     return null;
                 }
@@ -16525,15 +16559,15 @@
                     clearInterval(this.featureQueueInterval);
                     this.featureQueueInterval = null;
                 }
-                if (this.handoffRestyleInterval) {
-                    clearInterval(this.handoffRestyleInterval);
-                    this.handoffRestyleInterval = null;
-                }
+                // Settle a re-parent still in flight, so what is handed on is not split across two menu items.
+                (_a = this.handoffReassignCancel) === null || _a === void 0 ? void 0 : _a.call(this, true);
+                this.handoffReassignCancel = null;
+                this.handoffSourceMenuItemId = null;
                 // Not transferred, the receiving manager sets up its own fresh copy if needed.
                 this.viewerDateTimeDispose();
-                (_a = this.styler) === null || _a === void 0 ? void 0 : _a.Dispose();
-                (_b = this.tileLoadRemoval) === null || _b === void 0 ? void 0 : _b.call(this);
-                (_c = this.tileUnloadRemoval) === null || _c === void 0 ? void 0 : _c.call(this);
+                (_b = this.styler) === null || _b === void 0 ? void 0 : _b.Dispose();
+                (_c = this.tileLoadRemoval) === null || _c === void 0 ? void 0 : _c.call(this);
+                (_d = this.tileUnloadRemoval) === null || _d === void 0 ? void 0 : _d.call(this);
                 this.tileLoadRemoval = null;
                 this.tileUnloadRemoval = null;
                 const payload = {
@@ -16583,13 +16617,6 @@
                     }
                 });
                 // Same visuals, same registrations so just re-keyed onto this menu item.
-                this.visualsManager.ReassignMenuItem({
-                    fromMenuItemId: payload.sourceMenuItemId,
-                    toMenuItemId: this.item.id,
-                    toMenuItemType: this.item.Type,
-                    toPriority: this.renderPriority,
-                    requestRender: false
-                });
                 this.onCTilesetLoad();
                 this.styler.Init({
                     viewer: this.viewer,
@@ -16603,33 +16630,32 @@
                     scenario: (_b = this.item.BruceEntity) === null || _b === void 0 ? void 0 : _b.Scenario,
                     historic: (_c = this.item.BruceEntity) === null || _c === void 0 ? void 0 : _c.historic,
                 });
-                this.queueHandoffRestyle(this.visualsManager.GetRegos({ menuItemId: this.item.id }));
+                // A swap runs inside a render pass, so re-parenting a whole tileset in one go stalls it.
+                // Each batch is restyled as it lands rather than after a second walk of the same set.
+                this.handoffSourceMenuItemId = payload.sourceMenuItemId;
+                this.handoffReassignCancel = this.visualsManager.ReassignMenuItem({
+                    fromMenuItemId: payload.sourceMenuItemId,
+                    toMenuItemId: this.item.id,
+                    toMenuItemType: this.item.Type,
+                    toPriority: this.renderPriority,
+                    requestRender: false,
+                    lazy: true,
+                    onBatch: (regos) => {
+                        if (this.disposed) {
+                            return;
+                        }
+                        this.styler.QueueEntities(regos, true);
+                    },
+                    onComplete: () => {
+                        this.handoffReassignCancel = null;
+                        this.handoffSourceMenuItemId = null;
+                    }
+                });
                 this.viewer.scene.requestRender();
                 if (((_d = this.item.BruceEntity) === null || _d === void 0 ? void 0 : _d.historic) && this.tileset) {
                     this.viewerDateTimeSub(this.tileset);
                 }
             }
-            queueHandoffRestyle(regos) {
-                if (!regos.length) {
-                    return;
-                }
-                const BATCH_SIZE = 5000;
-                let index = 0;
-                this.handoffRestyleInterval = setInterval(() => {
-                    if (this.disposed) {
-                        clearInterval(this.handoffRestyleInterval);
-                        this.handoffRestyleInterval = null;
-                        return;
-                    }
-                    const end = Math.min(index + BATCH_SIZE, regos.length);
-                    this.styler.QueueEntities(regos.slice(index, end), true);
-                    index = end;
-                    if (index >= regos.length) {
-                        clearInterval(this.handoffRestyleInterval);
-                        this.handoffRestyleInterval = null;
-                    }
-                }, 10);
-            }
             /**
              * @param tile
              * @param load indicates if we are loading or unloading the tile.
@@ -17181,33 +17207,40 @@
                 this.doDispose();
             }
             doDispose() {
-                var _a, _b;
+                var _a, _b, _c;
                 if (this.featureQueueInterval) {
                     clearInterval(this.featureQueueInterval);
                     this.featureQueueInterval = null;
                     this.featureQueue = [];
                 }
-                if (this.handoffRestyleInterval) {
-                    clearInterval(this.handoffRestyleInterval);
-                    this.handoffRestyleInterval = null;
-                }
+                (_a = this.handoffReassignCancel) === null || _a === void 0 ? void 0 : _a.call(this);
+                this.handoffReassignCancel = null;
                 if (this.cTileset) {
                     const viewer = this.viewer;
                     if (!(viewer === null || viewer === void 0 ? void 0 : viewer.isDestroyed()) && this.viewer.scene.primitives.contains(this.cTileset)) {
                         this.cTileset.show = false;
                         this.viewer.scene.primitives.remove(this.cTileset);
-                        (_a = exports.TilesetRenderEngine.GetMemoryWatcher(viewer)) === null || _a === void 0 ? void 0 : _a.Unwatch(this.cTileset);
+                        (_b = exports.TilesetRenderEngine.GetMemoryWatcher(viewer)) === null || _b === void 0 ? void 0 : _b.Unwatch(this.cTileset);
                         this.viewer.scene.requestRender();
                     }
                     this.cTileset = null;
                 }
-                (_b = this.styler) === null || _b === void 0 ? void 0 : _b.Dispose();
+                (_c = this.styler) === null || _c === void 0 ? void 0 : _c.Dispose();
                 this.visualsManager.RemoveRegos({
                     menuItemId: this.item.id,
                     doRemove: false,
                     source: exports.VisualsRegister.EUpdateSource.TILESET_DISPOSE,
                     lazy: true
                 });
+                if (this.handoffSourceMenuItemId) {
+                    this.visualsManager.RemoveRegos({
+                        menuItemId: this.handoffSourceMenuItemId,
+                        doRemove: false,
+                        source: exports.VisualsRegister.EUpdateSource.TILESET_DISPOSE,
+                        lazy: true
+                    });
+                    this.handoffSourceMenuItemId = null;
+                }
                 this.viewerDateTimeDispose();
             }
             async ReRender(params) {
@@ -19960,9 +19993,12 @@
                 // Removal callbacks for this instance's own tile stream listeners.
                 this.tileLoadRemoval = null;
                 this.tileUnloadRemoval = null;
-                // Chunks AdoptHandoff()'s restyle of handed-off content across ticks instead of one
-                // synchronous pass over potentially millions of regos.
-                this.handoffRestyleInterval = null;
+                // Cancels AdoptHandoff()'s chunked re-parent of handed-off content, which runs across ticks
+                // instead of one synchronous pass over potentially millions of regos.
+                this.handoffReassignCancel = null;
+                // Menu item the in-flight re-parent is still pulling regos off, so a teardown mid-swap can
+                // clear both sides rather than orphaning whatever had not moved yet.
+                this.handoffSourceMenuItemId = null;
                 this.styler = new exports.TilesetRenderEngine.Styler();
                 // Entity ID -> rego.
                 // We retain this information as a quick look-up on what has been registered.
@@ -20275,31 +20311,36 @@
                 this.doDispose();
             }
             doDispose() {
-                var _a, _b;
+                var _a, _b, _c;
                 if (this.featureQueueInterval) {
                     clearInterval(this.featureQueueInterval);
                     this.featureQueueInterval = null;
                     this.featureQueue = [];
                 }
-                if (this.handoffRestyleInterval) {
-                    clearInterval(this.handoffRestyleInterval);
-                    this.handoffRestyleInterval = null;
-                }
+                (_a = this.handoffReassignCancel) === null || _a === void 0 ? void 0 : _a.call(this);
+                this.handoffReassignCancel = null;
                 if (this.cTileset) {
                     const viewer = this.viewer;
                     if (!(viewer === null || viewer === void 0 ? void 0 : viewer.isDestroyed()) && this.viewer.scene.primitives.contains(this.cTileset)) {
                         this.cTileset.show = false;
                         this.viewer.scene.primitives.remove(this.cTileset);
-                        (_a = exports.TilesetRenderEngine.GetMemoryWatcher(viewer)) === null || _a === void 0 ? void 0 : _a.Unwatch(this.cTileset);
+                        (_b = exports.TilesetRenderEngine.GetMemoryWatcher(viewer)) === null || _b === void 0 ? void 0 : _b.Unwatch(this.cTileset);
                         this.viewer.scene.requestRender();
                     }
                     this.cTileset = null;
                 }
-                (_b = this.styler) === null || _b === void 0 ? void 0 : _b.Dispose();
+                (_c = this.styler) === null || _c === void 0 ? void 0 : _c.Dispose();
                 this.visualsManager.RemoveRegos({
                     menuItemId: this.item.id,
                     lazy: true
                 });
+                if (this.handoffSourceMenuItemId) {
+                    this.visualsManager.RemoveRegos({
+                        menuItemId: this.handoffSourceMenuItemId,
+                        lazy: true
+                    });
+                    this.handoffSourceMenuItemId = null;
+                }
             }
             onCTilesetLoad() {
                 if (this.item.FlyTo) {
@@ -20339,7 +20380,7 @@
             }
             // Returns null (fall back to a normal Dispose()) if the tileset hasn't finished loading yet.
             PrepareHandoff() {
-                var _a, _b, _c;
+                var _a, _b, _c, _d;
                 if (this.disposed || !this.cTileset || this.cTileset.isDestroyed()) {
                     return null;
                 }
@@ -20351,13 +20392,13 @@
                     clearInterval(this.featureQueueInterval);
                     this.featureQueueInterval = null;
                 }
-                if (this.handoffRestyleInterval) {
-                    clearInterval(this.handoffRestyleInterval);
-                    this.handoffRestyleInterval = null;
-                }
-                (_a = this.styler) === null || _a === void 0 ? void 0 : _a.Dispose();
-                (_b = this.tileLoadRemoval) === null || _b === void 0 ? void 0 : _b.call(this);
-                (_c = this.tileUnloadRemoval) === null || _c === void 0 ? void 0 : _c.call(this);
+                // Settle a re-parent still in flight, so what is handed on is not split across two menu items.
+                (_a = this.handoffReassignCancel) === null || _a === void 0 ? void 0 : _a.call(this, true);
+                this.handoffReassignCancel = null;
+                this.handoffSourceMenuItemId = null;
+                (_b = this.styler) === null || _b === void 0 ? void 0 : _b.Dispose();
+                (_c = this.tileLoadRemoval) === null || _c === void 0 ? void 0 : _c.call(this);
+                (_d = this.tileUnloadRemoval) === null || _d === void 0 ? void 0 : _d.call(this);
                 this.tileLoadRemoval = null;
                 this.tileUnloadRemoval = null;
                 const payload = {
@@ -20399,14 +20440,8 @@
                         console.error(e);
                     }
                 });
-                this.visualsManager.ReassignMenuItem({
-                    fromMenuItemId: payload.sourceMenuItemId,
-                    toMenuItemId: this.item.id,
-                    toMenuItemType: this.item.Type,
-                    toPriority: this.renderPriority,
-                    requestRender: false
-                });
-                if (Manager.NeedsStyler(this.item)) {
+                const needsStyler = Manager.NeedsStyler(this.item);
+                if (needsStyler) {
                     this.styler.Init({
                         viewer: this.viewer,
                         api: this.getters.GetBruceApi(),
@@ -20420,8 +20455,28 @@
                         applyStyles: Boolean(this.item.ApplyStyles),
                         monitor: this.monitor
                     });
-                    this.queueHandoffRestyle(this.visualsManager.GetRegos({ menuItemId: this.item.id }));
                 }
+                // A swap runs inside a render pass, so re-parenting a whole Entities Set in one go stalls it.
+                // Each batch is restyled as it lands rather than after a second walk of the same set.
+                this.handoffSourceMenuItemId = payload.sourceMenuItemId;
+                this.handoffReassignCancel = this.visualsManager.ReassignMenuItem({
+                    fromMenuItemId: payload.sourceMenuItemId,
+                    toMenuItemId: this.item.id,
+                    toMenuItemType: this.item.Type,
+                    toPriority: this.renderPriority,
+                    requestRender: false,
+                    lazy: true,
+                    onBatch: (regos) => {
+                        if (this.disposed || !needsStyler) {
+                            return;
+                        }
+                        this.styler.QueueEntities(regos, true);
+                    },
+                    onComplete: () => {
+                        this.handoffReassignCancel = null;
+                        this.handoffSourceMenuItemId = null;
+                    }
+                });
                 this.onCTilesetLoad();
                 let attenuation = this.item.attenuation;
                 if (!attenuation && attenuation != false) {
@@ -20440,27 +20495,6 @@
                 });
                 this.viewer.scene.requestRender();
             }
-            queueHandoffRestyle(regos) {
-                if (!regos.length) {
-                    return;
-                }
-                const BATCH_SIZE = 5000;
-                let index = 0;
-                this.handoffRestyleInterval = setInterval(() => {
-                    if (this.disposed) {
-                        clearInterval(this.handoffRestyleInterval);
-                        this.handoffRestyleInterval = null;
-                        return;
-                    }
-                    const end = Math.min(index + BATCH_SIZE, regos.length);
-                    this.styler.QueueEntities(regos.slice(index, end), true);
-                    index = end;
-                    if (index >= regos.length) {
-                        clearInterval(this.handoffRestyleInterval);
-                        this.handoffRestyleInterval = null;
-                    }
-                }, 10);
-            }
             /*
              * Reads a numeric feature property, returning null for anything that is not one.
              */
@@ -46256,7 +46290,7 @@ void main() {
         StyleUtils.ApplyTypeStyle = ApplyTypeStyle;
     })(exports.StyleUtils || (exports.StyleUtils = {}));
 
-    const VERSION = "7.3.1";
+    const VERSION = "7.3.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.