bruce-cesium 6.8.0 → 6.8.2

package/dist/bruce-cesium.umd.js

@@ -6132,7 +6132,7 @@
                 terrChangeRemoval = null;
                 clearTimeout(terrChangeTimeout);
                 terrChangeTimeout = null;
-                checkInterval === null || checkInterval === void 0 ? void 0 : checkInterval();
+                clearInterval(checkInterval);
                 checkInterval = null;
                 checkWaiting = false;
                 checkQueue === null || checkQueue === void 0 ? void 0 : checkQueue.Dispose();
@@ -6528,6 +6528,7 @@
                 // skipped by the applier so a live user action always wins.
                 this.lazyOverrideExclusions = new Set();
                 this.lazyOverrideInterval = null;
+                this.activeChunkedIntervals = new Set();
                 this.onUpdate = null;
                 // Entity ID -> Menu Item ID -> State.
                 // When no Menu Item ID is set, then the second key is a blank string.
@@ -7124,6 +7125,31 @@
                 }
                 this.viewer.scene.requestRender();
             }
+            runChunked(items, perItem, 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, items.length);
+                    for (; index < end; index++) {
+                        perItem(items[index]);
+                    }
+                    this.viewer.scene.requestRender();
+                    if (index >= items.length) {
+                        clearInterval(interval);
+                        this.activeChunkedIntervals.delete(interval);
+                        onComplete === null || onComplete === void 0 ? void 0 : onComplete();
+                    }
+                }, 10);
+                this.activeChunkedIntervals.add(interval);
+            }
+            startLazyRemoval(entityIds, removeOne, onComplete) {
+                this.runChunked(entityIds, removeOne, onComplete);
+            }
             /**
              * Cancels any in-flight lazy OverrideStates() apply.
              */
@@ -7196,9 +7222,7 @@
                 }, 10);
             }
             /**
-             * Returns all states with the first detected Menu Item ID settings included.
-             * This is a utility function for returning settings for apps that don't support the newer state settings.
-             * @deprecated Use GetStates() or GetState().
+             * Returns all states keyed by entity id, without regard to menu item id.
              * @returns
              */
             GetStatesLegacy() {
@@ -7224,7 +7248,7 @@
                     const entityId = entityIds[i];
                     const state = this.GetState({
                         entityId: entityId,
-                        // First known Menu Item.
+                        // Most-recently-set Menu Item for this entity, if any.
                         menuItemId: entityIdsMenuItem[entityId]
                     });
                     states[entityId] = state;
@@ -7280,6 +7304,10 @@
                 clearInterval(this.lazyOverrideInterval);
                 this.lazyOverrideInterval = null;
                 this.lazyOverrideActive = false;
+                for (const interval of this.activeChunkedIntervals) {
+                    clearInterval(interval);
+                }
+                this.activeChunkedIntervals.clear();
                 this.disposed = true;
             }
             ForceUpdate(params) {
@@ -7370,8 +7398,7 @@
                 }
             }
             /**
-             * Returns all labelled entity ids.
-             * @deprecated Use GetStates() or GetState().
+             * Returns all labelled entity ids, without regard to menu item id.
              */
             GetLabelled() {
                 const labelledIds = [];
@@ -7522,7 +7549,7 @@
                 }
             }
             /**
-             * @deprecated Use GetStates() or GetState().
+             * Returns all selected entity ids, without regard to menu item id.
              * @returns
              */
             GetSelected() {
@@ -7657,7 +7684,7 @@
                 }
             }
             /**
-             * @deprecated Use GetStates() or GetState().
+             * Returns all highlighted entity ids, without regard to menu item id.
              * @returns
              */
             GetHighlighted() {
@@ -7718,7 +7745,7 @@
                 return this.isolatedAnyCache;
             }
             /**
-             * @deprecated Use GetStates() or GetState().
+             * Returns all isolated entity ids, without regard to menu item id.
              * @returns
              */
             GetIsolated() {
@@ -7776,7 +7803,7 @@
                 return state.hidden === true;
             }
             /**
-             * @deprecated Use GetStates() or GetState().
+             * Returns all hidden entity ids, without regard to menu item id.
              * @returns
              */
             GetHidden() {
@@ -7863,8 +7890,8 @@
              * Re-parents every rego registered under one menu item id to a different menu item id.
              */
             ReassignMenuItem(params) {
-                var _a, _b;
-                const { fromMenuItemId, toMenuItemId, toMenuItemType, toPriority, requestRender, source } = params;
+                var _a;
+                const { fromMenuItemId, toMenuItemId, toMenuItemType, toPriority, requestRender, source, lazy, onBatch, onComplete } = params;
                 if (!fromMenuItemId || !toMenuItemId || fromMenuItemId === toMenuItemId) {
                     return;
                 }
@@ -7872,37 +7899,44 @@
                 if (!entityIds) {
                     return;
                 }
-                // Snapshot: unindexMenuItemEntityIfAbsent() below mutates this same set.
-                for (const entityId of Array.from(entityIds)) {
+                const idsSnapshot = Array.from(entityIds);
+                const regoSnapshot = new Map();
+                for (const entityId of idsSnapshot) {
+                    const snapRego = (_a = this.rego[entityId]) === null || _a === void 0 ? void 0 : _a.find(r => r.menuItemId === fromMenuItemId);
+                    if (snapRego) {
+                        regoSnapshot.set(entityId, snapRego);
+                    }
+                }
+                const reassignOne = (entityId) => {
+                    var _a, _b;
                     const regos = this.rego[entityId];
                     if (!regos) {
-                        continue;
+                        return null;
                     }
-                    for (const rego of regos) {
-                        if (rego.menuItemId !== fromMenuItemId) {
-                            continue;
-                        }
-                        if (source !== EUpdateSource.TREE_CASCADE) {
-                            (_a = this.onUpdate) === null || _a === void 0 ? void 0 : _a.Trigger({
-                                type: EVisualUpdateType.Remove,
-                                entityId,
-                                rego: { ...rego, menuItemId: fromMenuItemId },
-                                source
-                            });
-                        }
-                        rego.menuItemId = toMenuItemId;
-                        rego.menuItemType = toMenuItemType;
-                        if (toPriority != null) {
-                            rego.priority = toPriority;
-                        }
-                        if (source !== EUpdateSource.TREE_CASCADE) {
-                            (_b = this.onUpdate) === null || _b === void 0 ? void 0 : _b.Trigger({
-                                type: EVisualUpdateType.Add,
-                                entityId,
-                                rego,
-                                source
-                            });
-                        }
+                    const rego = regos.find(r => r.menuItemId === fromMenuItemId);
+                    if (!rego || rego !== regoSnapshot.get(entityId)) {
+                        return null;
+                    }
+                    if (source !== EUpdateSource.TREE_CASCADE) {
+                        (_a = this.onUpdate) === null || _a === void 0 ? void 0 : _a.Trigger({
+                            type: EVisualUpdateType.Remove,
+                            entityId,
+                            rego: { ...rego, menuItemId: fromMenuItemId },
+                            source
+                        });
+                    }
+                    rego.menuItemId = toMenuItemId;
+                    rego.menuItemType = toMenuItemType;
+                    if (toPriority != null) {
+                        rego.priority = toPriority;
+                    }
+                    if (source !== EUpdateSource.TREE_CASCADE) {
+                        (_b = this.onUpdate) === null || _b === void 0 ? void 0 : _b.Trigger({
+                            type: EVisualUpdateType.Add,
+                            entityId,
+                            rego,
+                            source
+                        });
                     }
                     const eStates = this.states[entityId];
                     const movingState = eStates === null || eStates === void 0 ? void 0 : eStates[fromMenuItemId];
@@ -7922,11 +7956,50 @@
                         entityId,
                         refresh: true
                     });
+                    return rego;
+                };
+                if (lazy) {
+                    this.startLazyReassign(idsSnapshot, reassignOne, requestRender, onBatch, onComplete);
+                    return;
+                }
+                for (const entityId of idsSnapshot) {
+                    reassignOne(entityId);
                 }
                 if (requestRender != false) {
                     this.viewer.scene.requestRender();
                 }
             }
+            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 batch = [];
+                    for (; index < end; index++) {
+                        const rego = reassignOne(entityIds[index]);
+                        if (rego) {
+                            batch.push(rego);
+                        }
+                    }
+                    if (batch.length) {
+                        onBatch === null || onBatch === void 0 ? void 0 : onBatch(batch);
+                    }
+                    if (requestRender != false) {
+                        this.viewer.scene.requestRender();
+                    }
+                    if (index >= entityIds.length) {
+                        clearInterval(interval);
+                        this.activeChunkedIntervals.delete(interval);
+                        onComplete === null || onComplete === void 0 ? void 0 : onComplete();
+                    }
+                }, 10);
+                this.activeChunkedIntervals.add(interval);
+            }
             /**
              * Locates a visual corresponding to a given entity id.
              * If no menu item id is provided, then it will pick the "best" one.
@@ -7969,6 +8042,7 @@
             GetRegos(params) {
                 // TODO: refactor.
                 // Currently this was made by merging two functions.
+                var _a;
                 const { entityId, menuItemId, styleId, styleEffectiveFilter } = params;
                 const matchesStyleFilters = (rego) => {
                     if (styleId != null && rego.styleId !== styleId) {
@@ -7992,10 +8066,10 @@
                 }
                 else if (menuItemId) {
                     const visuals = [];
-                    for (const eId in this.rego) {
-                        const entityRegos = this.rego[eId];
-                        if (entityRegos) {
-                            const rego = entityRegos.find(r => r.menuItemId === menuItemId);
+                    const eIds = this.entityIdsByMenuItem[menuItemId];
+                    if (eIds) {
+                        for (const eId of eIds) {
+                            const rego = (_a = this.rego[eId]) === null || _a === void 0 ? void 0 : _a.find(r => r.menuItemId === menuItemId);
                             if (rego && matchesStyleFilters(rego)) {
                                 visuals.push(rego);
                             }
@@ -8027,7 +8101,7 @@
              */
             RemoveRegos(params) {
                 var _a, _b, _c;
-                let { entityId, menuItemId, doUpdate, relation, retainTagIds, requestRender, doRemove, source } = params;
+                let { entityId, menuItemId, doUpdate, relation, retainTagIds, requestRender, doRemove, source, lazy, onComplete } = params;
                 if (doUpdate == null || doUpdate === undefined) {
                     doUpdate = true;
                 }
@@ -8038,50 +8112,65 @@
                 // Currently this was made by merging two functions.
                 if (menuItemId && !entityId) {
                     // Entities registered under this menu item, keyed via entityIdsByMenuItem.
-                    // Snapshot to an array since removals below mutate the backing set.
                     const entityIds = this.entityIdsByMenuItem[menuItemId] ? Array.from(this.entityIdsByMenuItem[menuItemId]) : [];
-                    for (const entityId of entityIds) {
+                    const regoSnapshot = new Map();
+                    for (const snapEntityId of entityIds) {
+                        const snapRego = (_a = this.rego[snapEntityId]) === null || _a === void 0 ? void 0 : _a.find(r => r.menuItemId === menuItemId);
+                        if (snapRego) {
+                            regoSnapshot.set(snapEntityId, snapRego);
+                        }
+                    }
+                    const removeOne = (entityId) => {
+                        var _a;
                         const entityRegos = this.rego[entityId];
-                        if (entityRegos) {
-                            const rego = entityRegos.find(r => r.menuItemId === menuItemId);
-                            if (!rego) {
-                                continue;
-                            }
-                            const regoTagIds = rego.tagIds ? rego.tagIds : [];
-                            const shouldRetain = regoTagIds.some(tagId => retainTagIds.includes(tagId));
-                            if (shouldRetain) {
-                                continue;
-                            }
-                            exports.EntityLabel.Detatch({
-                                rego
+                        if (!entityRegos) {
+                            return;
+                        }
+                        const rego = entityRegos.find(r => r.menuItemId === menuItemId);
+                        if (!rego || rego !== regoSnapshot.get(entityId)) {
+                            return;
+                        }
+                        const regoTagIds = rego.tagIds ? rego.tagIds : [];
+                        const shouldRetain = regoTagIds.some(tagId => retainTagIds.includes(tagId));
+                        if (shouldRetain) {
+                            return;
+                        }
+                        exports.EntityLabel.Detatch({
+                            rego
+                        });
+                        if (doRemove != false) {
+                            removeEntity(this.viewer, rego.visual);
+                        }
+                        rego.visual = null;
+                        const doesInclude = this.rego[entityId].find(r => r.menuItemId === menuItemId);
+                        if (doesInclude) {
+                            this.rego[entityId] = entityRegos.filter(r => r.menuItemId !== menuItemId);
+                            this.unindexMenuItemEntityIfAbsent(menuItemId, entityId);
+                        }
+                        const update = {
+                            type: EVisualUpdateType.Remove,
+                            entityId: rego.entityId,
+                            rego: rego
+                        };
+                        if (source) {
+                            update.source = source;
+                        }
+                        if (source !== EUpdateSource.TREE_CASCADE) {
+                            (_a = this.onUpdate) === null || _a === void 0 ? void 0 : _a.Trigger(update);
+                        }
+                        if (doesInclude) {
+                            this.queueUpdate({
+                                entityId: entityId,
+                                refresh: false
                             });
-                            if (doRemove != false) {
-                                removeEntity(this.viewer, rego.visual);
-                            }
-                            rego.visual = null;
-                            const doesInclude = this.rego[entityId].find(r => r.menuItemId === menuItemId);
-                            if (doesInclude) {
-                                this.rego[entityId] = entityRegos.filter(r => r.menuItemId !== menuItemId);
-                                this.unindexMenuItemEntityIfAbsent(menuItemId, entityId);
-                            }
-                            const update = {
-                                type: EVisualUpdateType.Remove,
-                                entityId: rego.entityId,
-                                rego: rego
-                            };
-                            if (source) {
-                                update.source = source;
-                            }
-                            if (source !== EUpdateSource.TREE_CASCADE) {
-                                (_a = this.onUpdate) === null || _a === void 0 ? void 0 : _a.Trigger(update);
-                            }
-                            if (doesInclude) {
-                                this.queueUpdate({
-                                    entityId: entityId,
-                                    refresh: false
-                                });
-                            }
                         }
+                    };
+                    if (lazy) {
+                        this.startLazyRemoval(entityIds, removeOne, onComplete);
+                        return;
+                    }
+                    for (const entityId of entityIds) {
+                        removeOne(entityId);
                     }
                 }
                 else if (entityId) {
@@ -8404,10 +8493,9 @@
                 });
             }
             /**
-             * Returns a dictionary containing entityId -> opacity values.
-             * Opacity 1 = 100%.
+             * Returns a dictionary containing entityId -> opacity values, without regard to
+             * menu item id. Opacity 1 = 100%.
              * @returns
-             * @deprecated Use GetStates() or GetState().
              */
             GetOpacityMap() {
                 const map = {};
@@ -9369,7 +9457,7 @@
         return new Cesium.Color(color.red ? color.red / 255 : 0, color.green ? color.green / 255 : 0, color.blue ? color.blue / 255 : 0, color.alpha);
     }
     function getShowDebugBounds() {
-        if (!window) {
+        if (typeof window === "undefined") {
             return false;
         }
         let showBounds = window === null || window === void 0 ? void 0 : window.ENTITIES_RENDER_MANAGER_SHOW_BOUNDS;
@@ -9441,52 +9529,17 @@
                     this.item = params.item;
                 }
                 (async () => {
-                    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+                    var _a, _b, _c, _d;
                     if (this.disposed) {
                         return;
                     }
                     try {
-                        // Reset allowed list if there's change.
-                        if (((_a = this.item.BruceEntity) === null || _a === void 0 ? void 0 : _a["EntityType.ID"]) && !this.allowedTypeIDs.includes((_b = this.item.BruceEntity) === null || _b === void 0 ? void 0 : _b["EntityType.ID"])) {
-                            this.allowedTypeIDs = [];
-                            if ((_c = this.item.BruceEntity) === null || _c === void 0 ? void 0 : _c["EntityType.ID"]) {
-                                this.allowedTypeIDs.push((_d = this.item.BruceEntity) === null || _d === void 0 ? void 0 : _d["EntityType.ID"]);
-                            }
-                        }
+                        const { tagsToRender, shouldRender } = this.applyItemSettings();
                         if (this.disposed) {
                             return;
                         }
-                        this.zoomControl = this.item.CameraZoomSettings;
-                        if (!((_e = this.zoomControl) === null || _e === void 0 ? void 0 : _e.length)) {
-                            this.zoomControl = [
-                                {
-                                    MinZoom: 0,
-                                    MaxZoom: 200000,
-                                    DisplayType: BModels.ZoomControl.EDisplayType.Model3D,
-                                    LODCategoryID: "glb",
-                                    LODLevel: 0,
-                                    StyleID: 0
-                                }
-                            ];
-                        }
-                        this.renderPriority = this.item.renderPriority;
-                        if (this.renderPriority == null) {
-                            this.renderPriority = 1;
-                        }
-                        if (this.useGeojson && this.zoomControl.length > 1) {
-                            console.warn("Geojson rendering does not support multiple zoom controls. Only the first one will be used.");
-                            this.zoomControl = [this.zoomControl[0]];
-                        }
-                        this.scenario = (_f = this.item.BruceEntity) === null || _f === void 0 ? void 0 : _f.Scenario;
-                        const isTagItem = Boolean(this.item.BruceEntity.ExpandLayers);
-                        let tagsToRender = isTagItem ? this.item.BruceEntity.SelectedExpandLayers : null;
-                        if (!tagsToRender) {
-                            tagsToRender = [];
-                        }
-                        tagsToRender = [].concat(tagsToRender);
-                        const shouldRender = !isTagItem || tagsToRender.length > 0;
                         this.unsetGetter();
-                        (_g = this.viewMonitorRemoval) === null || _g === void 0 ? void 0 : _g.call(this);
+                        (_a = this.viewMonitorRemoval) === null || _a === void 0 ? void 0 : _a.call(this);
                         this.viewMonitorRemoval = null;
                         clearInterval(this.renderQueueInterval);
                         this.renderQueueInterval = null;
@@ -9498,17 +9551,17 @@
                                 menuItemId: this.item.id,
                                 retainTagIds: tagsToRender
                             });
-                            (_h = this.clustering) === null || _h === void 0 ? void 0 : _h.Dispose();
+                            (_b = this.clustering) === null || _b === void 0 ? void 0 : _b.Dispose();
                         }
                         else {
                             this.visualsManager.RemoveRegos({
                                 menuItemId: this.item.id
                             });
-                            (_j = this.clustering) === null || _j === void 0 ? void 0 : _j.Dispose();
+                            (_c = this.clustering) === null || _c === void 0 ? void 0 : _c.Dispose();
                             return;
                         }
                         if (this.item.enableClustering) {
-                            this.clustering = new PointClustering(this.visualsManager, this.item.id, (_k = this.item) === null || _k === void 0 ? void 0 : _k.clustering);
+                            this.clustering = new PointClustering(this.visualsManager, this.item.id, (_d = this.item) === null || _d === void 0 ? void 0 : _d.clustering);
                         }
                         this.setGetter();
                         this.viewMonitorRemoval = this.monitor.Updated().Subscribe(() => {
@@ -9521,6 +9574,46 @@
                     }
                 })();
             }
+            applyItemSettings() {
+                var _a, _b, _c, _d, _e, _f;
+                // Reset allowed list if there's change.
+                if (((_a = this.item.BruceEntity) === null || _a === void 0 ? void 0 : _a["EntityType.ID"]) && !this.allowedTypeIDs.includes((_b = this.item.BruceEntity) === null || _b === void 0 ? void 0 : _b["EntityType.ID"])) {
+                    this.allowedTypeIDs = [];
+                    if ((_c = this.item.BruceEntity) === null || _c === void 0 ? void 0 : _c["EntityType.ID"]) {
+                        this.allowedTypeIDs.push((_d = this.item.BruceEntity) === null || _d === void 0 ? void 0 : _d["EntityType.ID"]);
+                    }
+                }
+                this.zoomControl = this.item.CameraZoomSettings;
+                if (!((_e = this.zoomControl) === null || _e === void 0 ? void 0 : _e.length)) {
+                    this.zoomControl = [
+                        {
+                            MinZoom: 0,
+                            MaxZoom: 200000,
+                            DisplayType: BModels.ZoomControl.EDisplayType.Model3D,
+                            LODCategoryID: "glb",
+                            LODLevel: 0,
+                            StyleID: 0
+                        }
+                    ];
+                }
+                this.renderPriority = this.item.renderPriority;
+                if (this.renderPriority == null) {
+                    this.renderPriority = 1;
+                }
+                if (this.useGeojson && this.zoomControl.length > 1) {
+                    console.warn("Geojson rendering does not support multiple zoom controls. Only the first one will be used.");
+                    this.zoomControl = [this.zoomControl[0]];
+                }
+                this.scenario = (_f = this.item.BruceEntity) === null || _f === void 0 ? void 0 : _f.Scenario;
+                const isTagItem = Boolean(this.item.BruceEntity.ExpandLayers);
+                let tagsToRender = isTagItem ? this.item.BruceEntity.SelectedExpandLayers : null;
+                if (!tagsToRender) {
+                    tagsToRender = [];
+                }
+                tagsToRender = [].concat(tagsToRender);
+                const shouldRender = !isTagItem || tagsToRender.length > 0;
+                return { isTagItem, tagsToRender, shouldRender };
+            }
             /**
              * Updates allowedTypeIDs values based in incoming data.
              * We might request 'x' Entity Type, but get 'y' Entities due to local Data Sources.
@@ -10505,6 +10598,85 @@
                     this.clustering.Update();
                 }
             }
+            get HandoffKey() {
+                return Manager.GetHandoffKey(this.item);
+            }
+            static GetHandoffKey(item) {
+                var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+                if (item.renderAsGeojson || item.enableClustering) {
+                    return null;
+                }
+                const isTagItem = Boolean((_a = item.BruceEntity) === null || _a === void 0 ? void 0 : _a.ExpandLayers);
+                const tags = isTagItem ? [].concat((_c = (_b = item.BruceEntity) === null || _b === void 0 ? void 0 : _b.SelectedExpandLayers) !== null && _c !== void 0 ? _c : []).sort() : [];
+                return JSON.stringify({
+                    typeId: ((_d = item.BruceEntity) === null || _d === void 0 ? void 0 : _d["EntityType.ID"]) || "",
+                    filter: (_f = (_e = item.BruceEntity) === null || _e === void 0 ? void 0 : _e.Filter) !== null && _f !== void 0 ? _f : {},
+                    isTagItem,
+                    tags,
+                    scenario: (_h = (_g = item.BruceEntity) === null || _g === void 0 ? void 0 : _g.Scenario) !== null && _h !== void 0 ? _h : "",
+                    historic: Boolean((_j = item.BruceEntity) === null || _j === void 0 ? void 0 : _j.historic),
+                    historicAttrKey: ((_k = item.BruceEntity) === null || _k === void 0 ? void 0 : _k.historicAttrKey) || "",
+                    historicInterpolation: Boolean(item.historicInterpolation),
+                    schemaId: ((_l = item.BruceEntity) === null || _l === void 0 ? void 0 : _l.schemaId) || "",
+                    cdnEnabled: Boolean(item.cdnEnabled),
+                    optimizeGeometry: Boolean(item.optimizeGeometry),
+                    optimizeMinPoints: (_m = item.optimizeMinPoints) !== null && _m !== void 0 ? _m : "",
+                    optimizeTolerance: (_o = item.optimizeTolerance) !== null && _o !== void 0 ? _o : ""
+                });
+            }
+            PrepareHandoff() {
+                var _a;
+                if (this.disposed || this.useGeojson || this.item.enableClustering) {
+                    return null;
+                }
+                const payload = {
+                    renderedEntities: this.renderedEntities,
+                    renderedByInternalId: new Map(this.renderedByInternalId),
+                    internalByEntityId: new Map(this.internalByEntityId),
+                    allowedTypeIDs: [...this.allowedTypeIDs],
+                    renderQueue: [...this.renderQueue],
+                    sourceMenuItemId: this.item.id
+                };
+                this.unsetGetter();
+                (_a = this.viewMonitorRemoval) === null || _a === void 0 ? void 0 : _a.call(this);
+                this.viewMonitorRemoval = null;
+                clearInterval(this.renderQueueInterval);
+                this.renderQueueInterval = null;
+                this.renderQueue = [];
+                this.disposed = true;
+                return payload;
+            }
+            AdoptHandoff(payload) {
+                var _a;
+                const { shouldRender } = this.applyItemSettings();
+                this.visualsManager.ReassignMenuItem({
+                    fromMenuItemId: payload.sourceMenuItemId,
+                    toMenuItemId: this.item.id,
+                    toMenuItemType: this.item.Type,
+                    toPriority: this.renderPriority,
+                    requestRender: false
+                });
+                if (!shouldRender) {
+                    this.renderedEntities = payload.renderedEntities;
+                    this.renderedByInternalId = payload.renderedByInternalId;
+                    this.internalByEntityId = payload.internalByEntityId;
+                    this.allowedTypeIDs = payload.allowedTypeIDs;
+                    return;
+                }
+                this.setGetter();
+                this.viewMonitorRemoval = this.monitor.Updated().Subscribe(() => {
+                    var _a;
+                    (_a = this.entityCheckQueue) === null || _a === void 0 ? void 0 : _a.Call();
+                });
+                this.renderedEntities = payload.renderedEntities;
+                this.renderedByInternalId = payload.renderedByInternalId;
+                this.internalByEntityId = payload.internalByEntityId;
+                this.allowedTypeIDs = payload.allowedTypeIDs;
+                if ((_a = payload.renderQueue) === null || _a === void 0 ? void 0 : _a.length) {
+                    this.distributeForRender(payload.renderQueue);
+                }
+                this.viewer.scene.requestRender();
+            }
         }
         EntitiesRenderManager.Manager = Manager;
     })(exports.EntitiesRenderManager || (exports.EntitiesRenderManager = {}));
@@ -14315,17 +14487,21 @@
                 }
             }
             // Two items resolving to the same key are eligible to hand off, regardless of styling.
+            // Model-space vs. geospatial, and historic vs. live, position the tileset via entirely
+            // different code paths (baked in once at Init() time), so either changing must never
+            // match an existing key and must instead force a real reload.
             get HandoffKey() {
-                return Manager.GetHandoffKey(this.item);
+                return Manager.GetHandoffKey(this.item, this.modelSpace);
             }
-            static GetHandoffKey(item) {
-                var _a, _b;
+            static GetHandoffKey(item, modelSpace) {
+                var _a, _b, _c;
                 const tilesetId = (_a = item === null || item === void 0 ? void 0 : item.tileset) === null || _a === void 0 ? void 0 : _a.TilesetID;
                 if (!tilesetId) {
                     return null;
                 }
                 const accountId = ((_b = item.tileset) === null || _b === void 0 ? void 0 : _b.ClientAccountID) || "";
-                return `${accountId}:${tilesetId}`;
+                const historic = Boolean((_c = item.BruceEntity) === null || _c === void 0 ? void 0 : _c.historic);
+                return `${accountId}:${tilesetId}:${Boolean(modelSpace)}:${historic}`;
             }
             // Returns null (fall back to a normal Dispose()) if the tileset hasn't finished loading yet.
             PrepareHandoff() {
@@ -14381,14 +14557,6 @@
                 if (this.renderPriority == null) {
                     this.renderPriority = 0;
                 }
-                // Same visuals, same registrations - 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.tileLoadRemoval = this.cTileset.tileLoad.addEventListener((tile) => {
                     try {
                         this.queueTile(tile, true);
@@ -14405,6 +14573,14 @@
                         console.error(e);
                     }
                 });
+                // 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,
@@ -15012,7 +15188,8 @@
                 this.visualsManager.RemoveRegos({
                     menuItemId: this.item.id,
                     doRemove: false,
-                    source: exports.VisualsRegister.EUpdateSource.TILESET_DISPOSE
+                    source: exports.VisualsRegister.EUpdateSource.TILESET_DISPOSE,
+                    lazy: true
                 });
                 this.viewerDateTimeDispose();
             }
@@ -16505,7 +16682,7 @@
             }
             setGetter(queryItems) {
                 this.unsetGetter();
-                this.getter = new EntityFilterGetter.Getter({
+                const getter = new EntityFilterGetter.Getter({
                     api: this.apiGetter.getApi(),
                     attrFilter: {},
                     batchSize: BATCH_SIZE$3,
@@ -16516,6 +16693,10 @@
                         queryItems: queryItems !== null && queryItems !== void 0 ? queryItems : []
                     }
                 });
+                this.attachGetter(getter);
+            }
+            attachGetter(getter) {
+                this.getter = getter;
                 const minMax = exports.RenderManager.GetZoomMinMax({
                     zoomControl: this.zoomControl
                 });
@@ -16856,6 +17037,61 @@
                     console.error("Failed to render DataLab entities:", e);
                 }
             }
+            get HandoffKey() {
+                return Manager.GetHandoffKey(this.item);
+            }
+            static GetHandoffKey(item) {
+                const queryId = item === null || item === void 0 ? void 0 : item.DataLabQueryID;
+                if (!queryId) {
+                    return null;
+                }
+                return `datalab:${queryId}`;
+            }
+            PrepareHandoff() {
+                var _a, _b, _c;
+                if (this.disposed || !this.getter) {
+                    return null;
+                }
+                this.getter.ExcludeMenuItem(this.item.id);
+                (_a = this.getterSub) === null || _a === void 0 ? void 0 : _a.call(this);
+                this.getterSub = null;
+                const getter = this.getter;
+                this.getter = null;
+                (_b = this.viewMonitorRemoval) === null || _b === void 0 ? void 0 : _b.call(this);
+                this.viewMonitorRemoval = null;
+                (_c = this.entityCheckQueue) === null || _c === void 0 ? void 0 : _c.Dispose();
+                this.entityCheckQueue = null;
+                clearInterval(this.renderQueueInterval);
+                this.renderQueueInterval = null;
+                const payload = {
+                    getter,
+                    renderedEntities: this.renderedEntities,
+                    renderQueue: [...this.renderQueue],
+                    sourceMenuItemId: this.item.id
+                };
+                this.renderQueue = [];
+                this.queryLoadId += 1;
+                this.disposed = true;
+                return payload;
+            }
+            AdoptHandoff(payload) {
+                var _a;
+                this.ensureSettings();
+                this.renderedEntities = payload.renderedEntities;
+                this.visualsManager.ReassignMenuItem({
+                    fromMenuItemId: payload.sourceMenuItemId,
+                    toMenuItemId: this.item.id,
+                    toMenuItemType: this.item.Type,
+                    toPriority: this.renderPriority,
+                    requestRender: false
+                });
+                this.attachGetter(payload.getter);
+                this.setEntityCheckQueue();
+                if ((_a = payload.renderQueue) === null || _a === void 0 ? void 0 : _a.length) {
+                    this.distributeForRender(payload.renderQueue);
+                }
+                this.viewer.scene.requestRender();
+            }
         }
         DataLabRenderManager.Manager = Manager;
     })(exports.DataLabRenderManager || (exports.DataLabRenderManager = {}));
@@ -17275,6 +17511,7 @@
                 this.queueCheckInterval = null;
                 this.processingQueue = 0;
                 this._osmIdToBruceId = {};
+                this.tileLoadRemoval = null;
                 const { viewer, register: visualsManager, getters: apiGetter, monitor, item } = params;
                 this.viewer = viewer;
                 this.getters = apiGetter;
@@ -17283,11 +17520,14 @@
                 this.monitor = monitor;
             }
             Dispose() {
+                var _a;
                 if (this.disposed) {
                     return;
                 }
                 this.disposed = true;
                 clearInterval(this.queueCheckInterval);
+                (_a = this.tileLoadRemoval) === null || _a === void 0 ? void 0 : _a.call(this);
+                this.tileLoadRemoval = 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)) {
@@ -17301,7 +17541,8 @@
                     this.cTileset = null;
                 }
                 this.visualsManager.RemoveRegos({
-                    menuItemId: this.item.id
+                    menuItemId: this.item.id,
+                    lazy: true
                 });
                 this.featureQueue = [];
             }
@@ -17314,84 +17555,89 @@
                 this.sourceId = EnsureNumber((_a = menuItem.BruceEntity) === null || _a === void 0 ? void 0 : _a.SourceId, 0);
                 this.entityTypeId = (_b = menuItem.BruceEntity) === null || _b === void 0 ? void 0 : _b["EntityType.ID"];
                 (async () => {
-                    if (this.disposed) {
-                        return;
-                    }
-                    else if (this.cTileset) {
-                        // Already exists, no need to re-initialize.
-                        return;
-                    }
-                    let validToken;
-                    if (Cesium.Ion.defaultServer) {
-                        // Proxy server was set after verifying Ion availability upstream
-                        // (including template account fallback) — trust that check.
-                        validToken = true;
-                    }
-                    else {
-                        // No proxy; validate the legacy access token directly.
-                        validToken = await exports.ViewerUtils.AssertIonToken(Cesium.Ion.defaultAccessToken);
-                    }
-                    if (!validToken) {
-                        console.warn("'tileset-osm-render-manager.ts' could not locate a valid Cesium Ion token.");
-                        return;
-                    }
-                    const CESIUM = Cesium;
-                    let cTileset;
-                    // Newer versions of Cesium have this function be async.
-                    if (CESIUM["createOsmBuildingsAsync"]) {
-                        cTileset = await CESIUM.createOsmBuildingsAsync({});
-                    }
-                    // Older versions of Cesium have this function be sync.
-                    else if (CESIUM["createOsmBuildings"]) {
-                        cTileset = CESIUM.createOsmBuildings();
-                    }
-                    else {
-                        console.warn("'tileset-osm-render-manager.ts' could not locate a create function for OSM buildings.");
-                        return;
-                    }
-                    // See if we already have a cTileset set.
-                    // Happens if we re-initialized in quick succession.
-                    if (this.cTileset) {
-                        cTileset.destroy();
-                        return;
-                    }
-                    this.cTileset = cTileset;
-                    if (this.disposed) {
-                        if (this.cTileset && !this.cTileset.isDestroyed()) {
-                            this.cTileset.destroy();
-                            this.cTileset = null;
+                    try {
+                        if (this.disposed) {
+                            return;
                         }
-                        return;
-                    }
-                    if (this.sourceId) {
-                        if (menuItem.ghostLoading == true) {
-                            this.cTileset.style = new Cesium.Cesium3DTileStyle({
-                                color: "rgba(255, 255, 250, 0.98)"
-                            });
+                        else if (this.cTileset) {
+                            // Already exists, no need to re-initialize.
+                            return;
                         }
-                        this.viewer.scene.primitives.add(this.cTileset);
-                        this.cTileset.tileLoad.addEventListener((tile) => {
-                            if (this.disposed) {
-                                return;
-                            }
-                            try {
-                                this.mapCTile(tile);
-                            }
-                            catch (e) {
-                                console.error(e);
+                        let validToken;
+                        if (Cesium.Ion.defaultServer) {
+                            // Proxy server was set after verifying Ion availability upstream
+                            // (including template account fallback) — trust that check.
+                            validToken = true;
+                        }
+                        else {
+                            // No proxy; validate the legacy access token directly.
+                            validToken = await exports.ViewerUtils.AssertIonToken(Cesium.Ion.defaultAccessToken);
+                        }
+                        if (!validToken) {
+                            console.warn("'tileset-osm-render-manager.ts' could not locate a valid Cesium Ion token.");
+                            return;
+                        }
+                        const CESIUM = Cesium;
+                        let cTileset;
+                        // Newer versions of Cesium have this function be async.
+                        if (CESIUM["createOsmBuildingsAsync"]) {
+                            cTileset = await CESIUM.createOsmBuildingsAsync({});
+                        }
+                        // Older versions of Cesium have this function be sync.
+                        else if (CESIUM["createOsmBuildings"]) {
+                            cTileset = CESIUM.createOsmBuildings();
+                        }
+                        else {
+                            console.warn("'tileset-osm-render-manager.ts' could not locate a create function for OSM buildings.");
+                            return;
+                        }
+                        // See if we already have a cTileset set.
+                        // Happens if we re-initialized in quick succession.
+                        if (this.cTileset) {
+                            cTileset.destroy();
+                            return;
+                        }
+                        this.cTileset = cTileset;
+                        if (this.disposed) {
+                            if (this.cTileset && !this.cTileset.isDestroyed()) {
+                                this.cTileset.destroy();
+                                this.cTileset = null;
                             }
-                        });
-                        this.queueCheckInterval = setInterval(() => {
-                            if (this.featureQueue.length > 0) {
-                                this.processQueue();
+                            return;
+                        }
+                        if (this.sourceId) {
+                            if (menuItem.ghostLoading == true) {
+                                this.cTileset.style = new Cesium.Cesium3DTileStyle({
+                                    color: "rgba(255, 255, 250, 0.98)"
+                                });
                             }
-                        }, 5000);
+                            this.viewer.scene.primitives.add(this.cTileset);
+                            this.tileLoadRemoval = this.cTileset.tileLoad.addEventListener((tile) => {
+                                if (this.disposed) {
+                                    return;
+                                }
+                                try {
+                                    this.mapCTile(tile);
+                                }
+                                catch (e) {
+                                    console.error(e);
+                                }
+                            });
+                            this.queueCheckInterval = setInterval(() => {
+                                if (this.featureQueue.length > 0) {
+                                    this.processQueue();
+                                }
+                            }, 5000);
+                        }
+                        else {
+                            this.viewer.scene.primitives.add(this.cTileset);
+                        }
+                        this.cTileset.show = true;
+                        this.viewer.scene.requestRender();
                     }
-                    else {
-                        this.viewer.scene.primitives.add(this.cTileset);
+                    catch (e) {
+                        console.error("Failed to load OSM Buildings tileset:", e);
                     }
-                    this.cTileset.show = true;
-                    this.viewer.scene.requestRender();
                 })();
             }
             async mapCTile(tile) {
@@ -17626,6 +17872,72 @@
             }
             async ReRender(params) {
             }
+            get HandoffKey() {
+                return Manager.GetHandoffKey(this.item);
+            }
+            static GetHandoffKey(item) {
+                var _a, _b;
+                const sourceId = EnsureNumber((_a = item.BruceEntity) === null || _a === void 0 ? void 0 : _a.SourceId, 0);
+                const entityTypeId = ((_b = item.BruceEntity) === null || _b === void 0 ? void 0 : _b["EntityType.ID"]) || "";
+                return `osm:${sourceId}:${entityTypeId}`;
+            }
+            PrepareHandoff() {
+                var _a;
+                if (this.disposed || !this.cTileset || this.cTileset.isDestroyed()) {
+                    return null;
+                }
+                clearInterval(this.queueCheckInterval);
+                this.queueCheckInterval = null;
+                (_a = this.tileLoadRemoval) === null || _a === void 0 ? void 0 : _a.call(this);
+                this.tileLoadRemoval = null;
+                const payload = {
+                    cTileset: this.cTileset,
+                    loadedCesiumEntities: this._loadedCesiumEntities,
+                    featureQueue: this.featureQueue,
+                    osmIdToBruceId: this._osmIdToBruceId,
+                    totalLoaded: this.totalLoaded,
+                    sourceMenuItemId: this.item.id
+                };
+                this.cTileset = null;
+                this.disposed = true;
+                return payload;
+            }
+            AdoptHandoff(payload) {
+                var _a, _b;
+                this.sourceId = EnsureNumber((_a = this.item.BruceEntity) === null || _a === void 0 ? void 0 : _a.SourceId, 0);
+                this.entityTypeId = (_b = this.item.BruceEntity) === null || _b === void 0 ? void 0 : _b["EntityType.ID"];
+                this.cTileset = payload.cTileset;
+                this._loadedCesiumEntities = payload.loadedCesiumEntities;
+                this.featureQueue = payload.featureQueue;
+                this._osmIdToBruceId = payload.osmIdToBruceId;
+                this.totalLoaded = payload.totalLoaded;
+                if (this.sourceId) {
+                    this.visualsManager.ReassignMenuItem({
+                        fromMenuItemId: payload.sourceMenuItemId,
+                        toMenuItemId: this.item.id,
+                        toMenuItemType: this.item.Type,
+                        requestRender: false
+                    });
+                    this.tileLoadRemoval = this.cTileset.tileLoad.addEventListener((tile) => {
+                        if (this.disposed) {
+                            return;
+                        }
+                        try {
+                            this.mapCTile(tile);
+                        }
+                        catch (e) {
+                            console.error(e);
+                        }
+                    });
+                    this.queueCheckInterval = setInterval(() => {
+                        if (this.featureQueue.length > 0) {
+                            this.processQueue();
+                        }
+                    }, 5000);
+                }
+                this.cTileset.show = true;
+                this.viewer.scene.requestRender();
+            }
         }
         TilesetOsmRenderManager.Manager = Manager;
     })(exports.TilesetOsmRenderManager || (exports.TilesetOsmRenderManager = {}));
@@ -17973,7 +18285,8 @@
                 }
                 (_b = this.styler) === null || _b === void 0 ? void 0 : _b.Dispose();
                 this.visualsManager.RemoveRegos({
-                    menuItemId: this.item.id
+                    menuItemId: this.item.id,
+                    lazy: true
                 });
             }
             onCTilesetLoad() {
@@ -18040,13 +18353,6 @@
                 if (this.renderPriority == null) {
                     this.renderPriority = 0;
                 }
-                this.visualsManager.ReassignMenuItem({
-                    fromMenuItemId: payload.sourceMenuItemId,
-                    toMenuItemId: this.item.id,
-                    toMenuItemType: this.item.Type,
-                    toPriority: this.renderPriority,
-                    requestRender: false
-                });
                 this.tileLoadRemoval = this.cTileset.tileLoad.addEventListener((tile) => {
                     try {
                         this.queueTile(tile, true);
@@ -18063,6 +18369,13 @@
                         console.error(e);
                     }
                 });
+                this.visualsManager.ReassignMenuItem({
+                    fromMenuItemId: payload.sourceMenuItemId,
+                    toMenuItemId: this.item.id,
+                    toMenuItemType: this.item.Type,
+                    toPriority: this.renderPriority,
+                    requestRender: false
+                });
                 if (this.item.ApplyStyles) {
                     this.styler.Init({
                         viewer: this.viewer,
@@ -18347,6 +18660,36 @@
             }
             async ReRender(params) {
             }
+            get HandoffKey() {
+                return Manager.GetHandoffKey(this.item);
+            }
+            static GetHandoffKey(item) {
+                var _a, _b;
+                const tilesetId = (_a = item === null || item === void 0 ? void 0 : item.tileset) === null || _a === void 0 ? void 0 : _a.TilesetID;
+                if (!tilesetId) {
+                    return null;
+                }
+                const accountId = ((_b = item.tileset) === null || _b === void 0 ? void 0 : _b.ClientAccountID) || "";
+                return `${accountId}:${tilesetId}`;
+            }
+            PrepareHandoff() {
+                var _a;
+                if (this.disposed || !this.cTileset || this.cTileset.isDestroyed()) {
+                    return null;
+                }
+                const payload = {
+                    cTileset: this.cTileset
+                };
+                (_a = this.initQueue) === null || _a === void 0 ? void 0 : _a.Remove(this);
+                this.cTileset = null;
+                this.disposed = true;
+                return payload;
+            }
+            AdoptHandoff(payload) {
+                this.cTileset = payload.cTileset;
+                this.onCTilesetLoad();
+                this.viewer.scene.requestRender();
+            }
         }
         TilesetPointcloudRenderManager.Manager = Manager;
     })(exports.TilesetPointcloudRenderManager || (exports.TilesetPointcloudRenderManager = {}));
@@ -19641,19 +19984,7 @@
                     var _a, _b, _c;
                     // If the tileset already exists then we just need to update the style.
                     if (this.cTileset) {
-                        const colorCss = this.item.colorMask;
-                        if (colorCss) {
-                            this.cTileset.style = new Cesium.Cesium3DTileStyle({
-                                color: {
-                                    conditions: [
-                                        ["true", `color("${colorCss}")`]
-                                    ]
-                                }
-                            });
-                        }
-                        else {
-                            this.cTileset.style = undefined;
-                        }
+                        this.applyColorMask();
                         this.viewer.scene.requestRender();
                         return;
                     }
@@ -19742,21 +20073,49 @@
                         return;
                     }
                     this.viewer.scene.primitives.add(this.cTileset);
-                    const colorCss = this.item.colorMask;
-                    if (colorCss) {
-                        this.cTileset.style = new Cesium.Cesium3DTileStyle({
-                            color: {
-                                conditions: [
-                                    ["true", `color("${colorCss}")`]
-                                ]
-                            }
-                        });
-                    }
+                    this.applyColorMask();
                     this.viewer.scene.requestRender();
                 })();
             }
+            applyColorMask() {
+                const colorCss = this.item.colorMask;
+                if (colorCss) {
+                    this.cTileset.style = new Cesium.Cesium3DTileStyle({
+                        color: {
+                            conditions: [
+                                ["true", `color("${colorCss}")`]
+                            ]
+                        }
+                    });
+                }
+                else {
+                    this.cTileset.style = undefined;
+                }
+            }
             async ReRender(params) {
             }
+            get HandoffKey() {
+                return Manager.GetHandoffKey();
+            }
+            static GetHandoffKey() {
+                return "google-photorealistic-3d";
+            }
+            PrepareHandoff() {
+                if (this.disposed || !this.cTileset || this.cTileset.isDestroyed()) {
+                    return null;
+                }
+                const payload = {
+                    cTileset: this.cTileset
+                };
+                this.cTileset = null;
+                this.disposed = true;
+                return payload;
+            }
+            AdoptHandoff(payload) {
+                this.cTileset = payload.cTileset;
+                this.applyColorMask();
+                this.viewer.scene.requestRender();
+            }
         }
         TilesetGooglePhotosRenderManager.Manager = Manager;
     })(exports.TilesetGooglePhotosRenderManager || (exports.TilesetGooglePhotosRenderManager = {}));
@@ -22051,7 +22410,7 @@
                             console.error("Menu item type is not implemented.", params.item.Type);
                     }
                     if (rItem.renderManager && !rItem.renderManager.Disposed) {
-                        const handoffPayload = this.tryClaimHandoffPayload(params.item, rItem.renderManager);
+                        const handoffPayload = this.tryClaimHandoffPayload(params.item, rItem.renderManager, params.modelSpace);
                         try {
                             if (handoffPayload) {
                                 rItem.renderManager.AdoptHandoff(handoffPayload);
@@ -22128,22 +22487,37 @@
                 return Boolean(renderManager) && typeof renderManager.PrepareHandoff === "function";
             }
             // Resolves the hand-off key a menu item's data would have.
-            computeHandoffKey(item) {
+            computeHandoffKey(item, modelSpace) {
                 if (item.Type === BModels.MenuItem.EType.CadTileset) {
-                    return exports.TilesetCadRenderManager.Manager.GetHandoffKey(item);
+                    return exports.TilesetCadRenderManager.Manager.GetHandoffKey(item, modelSpace);
                 }
                 if (item.Type === BModels.MenuItem.EType.EntityTileset) {
                     return exports.TilesetEntitiesRenderManager.Manager.GetHandoffKey(item);
                 }
+                if (item.Type === BModels.MenuItem.EType.PointCloud) {
+                    return exports.TilesetPointcloudRenderManager.Manager.GetHandoffKey(item);
+                }
+                if (item.Type === BModels.MenuItem.EType.GooglePhotoTileset) {
+                    return exports.TilesetGooglePhotosRenderManager.Manager.GetHandoffKey();
+                }
+                if (item.Type === BModels.MenuItem.EType.Osm) {
+                    return exports.TilesetOsmRenderManager.Manager.GetHandoffKey(item);
+                }
+                if (item.Type === BModels.MenuItem.EType.Entities) {
+                    return exports.EntitiesRenderManager.Manager.GetHandoffKey(item);
+                }
+                if (item.Type === BModels.MenuItem.EType.DataLab) {
+                    return exports.DataLabRenderManager.Manager.GetHandoffKey(item);
+                }
                 return null;
             }
             // Claims a pooled manager for the same resource, if one exists and both sides opt in.
             // Returns null (meaning: construct normally via Init()) otherwise.
-            tryClaimHandoffPayload(item, newManager) {
+            tryClaimHandoffPayload(item, newManager, modelSpace) {
                 if (typeof newManager.AdoptHandoff !== "function") {
                     return null;
                 }
-                const key = this.computeHandoffKey(item);
+                const key = this.computeHandoffKey(item, modelSpace);
                 if (!key) {
                     return null;
                 }
@@ -37060,7 +37434,7 @@
         StyleUtils.ApplyTypeStyle = ApplyTypeStyle;
     })(exports.StyleUtils || (exports.StyleUtils = {}));
 
-    const VERSION = "6.8.0";
+    const VERSION = "6.8.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.