bruce-cesium 7.3.0 → 7.3.2

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
 import * as Cesium from 'cesium';
-import { Cartographic, ColorMaterialProperty, Entity, Color, ConstantProperty, CallbackProperty, Primitive, Cesium3DTileFeature, DistanceDisplayCondition, Math as Math$1, Cartesian3, JulianDate, Quaternion, Transforms, HeadingPitchRoll, Matrix4, HeightReference, ColorBlendMode, ShadowMode, ClassificationType, Model, ShaderSource, Ellipsoid, Geometry, GeometryAttribute, ComponentDatatype, PrimitiveType, BoundingSphere, GeometryPipeline, sampleTerrain, Texture, PixelFormat, Sampler, TextureWrap, TextureMinificationFilter, TextureMagnificationFilter, VertexArray, BufferUsage, ShaderProgram, RenderState, BlendingState, DrawCommand, Pass, Cartesian2, Cartesian4, ArcType, CornerType, ConstantPositionProperty, HorizontalOrigin, VerticalOrigin, ImageMaterialProperty, PolygonHierarchy, PolylineGraphics, Rectangle, SceneTransforms, NearFarScalar, Matrix3, KmlDataSource, SceneMode, GeoJsonDataSource, Cesium3DTileStyle, HeadingPitchRange, Ion, IonResource, Cesium3DTileColorBlendMode, Cesium3DTileset, EllipsoidTerrainProvider, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, Intersect, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, OrthographicFrustum, EasingFunction, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, PolygonPipeline, CustomDataSource, GeometryInstance, CesiumInspector, ClockRange, DynamicEnvironmentMapManager, ScreenSpaceEventHandler, ScreenSpaceEventType, Fullscreen, CzmlDataSource } from 'cesium';
-import { Cartes, Entity as Entity$1, ProjectViewTile, ENVIRONMENT, Calculator, ClientFile, EntityLod, EntityTag, EntityType, LRUCache, ObjectUtils, Style, Carto, Geometry as Geometry$1, Api, MenuItem, ProjectView, ProjectViewBookmark, Tileset, ZoomControl, ClientFileValueMap, Color as Color$1, BruceEvent, EntityCoords, Bounds, DelayQueue, DataLab, BruceApi, EntityRelation, EntitySource, AccountConcept, RecordChangeFeed, ProgramKey, ProjectViewLegacyTile, Camera, Account, AccountLimits, Session, UrlUtils, ProjectViewBookmarkGroup, EntityAttachment, EntityAttachmentType, EntityAttribute, MathUtils, EntityRelationType, EntityHistoricData } from 'bruce-models';
+import { Cartographic, ColorMaterialProperty, Entity, Color, ConstantProperty, CallbackProperty, Primitive, Cesium3DTileFeature, DistanceDisplayCondition, ShaderSource, Cartesian3, Math as Math$1, Ellipsoid, Transforms, Matrix4, Geometry, GeometryAttribute, ComponentDatatype, PrimitiveType, BoundingSphere, GeometryPipeline, sampleTerrain, Texture, PixelFormat, Sampler, TextureWrap, TextureMinificationFilter, TextureMagnificationFilter, VertexArray, BufferUsage, ShaderProgram, RenderState, BlendingState, DrawCommand, Pass, Cartesian2, Cartesian4, JulianDate, Quaternion, HeadingPitchRoll, ClassificationType, ArcType, HeightReference, CornerType, ShadowMode, ConstantPositionProperty, HorizontalOrigin, VerticalOrigin, ColorBlendMode, Model, SceneTransforms, ImageMaterialProperty, PolygonHierarchy, PolylineGraphics, Rectangle, NearFarScalar, Matrix3, KmlDataSource, GeoJsonDataSource, SceneMode, Cesium3DTileStyle, HeadingPitchRange, Cesium3DTileColorBlendMode, Ion, IonResource, Cesium3DTileset, EllipsoidTerrainProvider, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, Intersect, OrthographicFrustum, EasingFunction, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, PolygonPipeline, CustomDataSource, CesiumInspector, ClockRange, DynamicEnvironmentMapManager, GeometryInstance, ScreenSpaceEventHandler, ScreenSpaceEventType, Fullscreen, CzmlDataSource } from 'cesium';
+import { Cartes, Entity as Entity$1, ProjectViewTile, ENVIRONMENT, Calculator, Carto, EntityTag, EntityType, Geometry as Geometry$1, ObjectUtils, Style, Api, ClientFile, LRUCache, EntityLod, ClientFileValueMap, Color as Color$1, Bounds, MenuItem, ProjectView, ProjectViewBookmark, Tileset, ZoomControl, BruceEvent, EntityCoords, DataLab, DelayQueue, BruceApi, AccountConcept, RecordChangeFeed, EntityRelation, EntitySource, ProgramKey, ProjectViewLegacyTile, Camera, Account, AccountLimits, Session, UrlUtils, ProjectViewBookmarkGroup, EntityAttachment, EntityAttachmentType, EntityAttribute, MathUtils, EntityRelationType, EntityHistoricData } from 'bruce-models';
 
 /**
  * Ensures a number is returned from a given value.
@@ -6591,7 +6591,7 @@ function shouldCullEntity(viewer, cEntity) {
     const adjustedSphere = boundingSphere.sphere.clone();
     // Terrain only matters here because it moves the sphere onto the ground.
     // Far enough away that a plausible ground height is a rounding error against the viewing distance, sampling it is wasted work.
-    const cameraDistance = Cartesian3.distance(camera.position, adjustedSphere.center);
+    const cameraDistance = Cartesian3.distance(camera.positionWC, adjustedSphere.center);
     if (cameraDistance > TERRAIN_SKIP_DISTANCE) {
         adjustedSphere.radius += TERRAIN_SKIP_RADIUS_PAD;
     }
@@ -6604,7 +6604,8 @@ function shouldCullEntity(viewer, cEntity) {
         }
         adjustedSphere.center = grounded;
     }
-    const cullingVolume = camera.frustum.computeCullingVolume(camera.position, camera.direction, camera.up);
+    // Camera vectors are frame relative while a reference frame is set (the compass orbits via lookAt).
+    const cullingVolume = camera.frustum.computeCullingVolume(camera.positionWC, camera.directionWC, camera.upWC);
     const visibility = cullingVolume.computeVisibility(adjustedSphere);
     return visibility !== Intersect.INSIDE && visibility !== Intersect.INTERSECTING;
 }
@@ -6631,14 +6632,14 @@ function shouldRecheck(viewer) {
         return true;
     }
     const camera = viewer.scene.camera;
-    if (!((_a = camera === null || camera === void 0 ? void 0 : camera.position) === null || _a === void 0 ? void 0 : _a.x)) {
+    if (!((_a = camera === null || camera === void 0 ? void 0 : camera.positionWC) === null || _a === void 0 ? void 0 : _a.x)) {
         return false;
     }
     const lastRecheck = camera[LAST_RECHECK_KEY];
     if (!lastRecheck) {
         camera[LAST_RECHECK_KEY] = {
-            position: camera.position.clone(),
-            direction: camera.direction.clone(),
+            position: camera.positionWC.clone(),
+            direction: camera.directionWC.clone(),
             tilesLoading: viewer.scene.globe.tilesLoaded
         };
         return true;
@@ -6647,14 +6648,14 @@ function shouldRecheck(viewer) {
     const tilesLoadingDiff = lastRecheck.tilesLoading != viewer.scene.globe.tilesLoaded;
     let recheck = tilesLoadingDiff;
     if (!recheck) {
-        const posDiff = Cartesian3.magnitude(Cartesian3.subtract(position, camera.position, new Cartesian3()));
-        const dirDiff = Cartesian3.magnitude(Cartesian3.subtract(direction, camera.direction, new Cartesian3()));
+        const posDiff = Cartesian3.magnitude(Cartesian3.subtract(position, camera.positionWC, new Cartesian3()));
+        const dirDiff = Cartesian3.magnitude(Cartesian3.subtract(direction, camera.directionWC, new Cartesian3()));
         recheck = posDiff > 100 || dirDiff > 0.01;
     }
     if (recheck) {
         camera[LAST_RECHECK_KEY] = {
-            position: camera.position.clone(),
-            direction: camera.direction.clone(),
+            position: camera.positionWC.clone(),
+            direction: camera.directionWC.clone(),
             tilesLoading: viewer.scene.globe.tilesLoaded
         };
     }
@@ -6707,7 +6708,9 @@ function cullTilesets(register) {
         return;
     }
     const camera = viewer.scene.camera;
-    const cullingVolume = camera.frustum.computeCullingVolume(camera.position, camera.direction, camera.up);
+    // Camera vectors are frame relative while a reference frame is set (the compass orbits via lookAt).
+    // These spheres are world space, so only the world coordinate vectors compare against them correctly.
+    const cullingVolume = camera.frustum.computeCullingVolume(camera.positionWC, camera.directionWC, camera.upWC);
     let changed = false;
     for (const rego of tilesets) {
         const tileset = rego.tileset;
@@ -9132,12 +9135,13 @@ var VisualsRegister;
         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();
@@ -9148,7 +9152,7 @@ var VisualsRegister;
                 }
             }
             const reassignOne = (entityId) => {
-                var _a, _b;
+                var _a, _b, _c;
                 const regos = this.rego[entityId];
                 if (!regos) {
                     return null;
@@ -9167,6 +9171,7 @@ var VisualsRegister;
                 }
                 rego.menuItemId = toMenuItemId;
                 rego.menuItemType = toMenuItemType;
+                const priorityChanged = toPriority != null && rego.priority !== toPriority;
                 if (toPriority != null) {
                     rego.priority = toPriority;
                 }
@@ -9192,15 +9197,17 @@ var VisualsRegister;
                 }
                 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);
@@ -9208,17 +9215,12 @@ var VisualsRegister;
             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]);
@@ -9232,6 +9234,14 @@ var VisualsRegister;
                 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);
@@ -9239,6 +9249,14 @@ var VisualsRegister;
                 }
             }, 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.
@@ -9361,7 +9379,7 @@ var VisualsRegister;
                     }
                 }
                 const removeOne = (entityId) => {
-                    var _a;
+                    var _a, _b;
                     const entityRegos = this.rego[entityId];
                     if (!entityRegos) {
                         return;
@@ -9400,15 +9418,24 @@ var VisualsRegister;
                     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(), () => {
@@ -9416,8 +9443,7 @@ var VisualsRegister;
                         removeOne(entityId);
                     }
                 });
-                this.releaseMenuItemCollection(menuItemId);
-                this.RemoveTilesetsByMenuItem(menuItemId);
+                finish();
             }
             else if (entityId) {
                 const entityRegos = this.rego[entityId];
@@ -14409,6 +14435,14 @@ class EntityGatherer {
         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();
@@ -14421,7 +14455,7 @@ class EntityGatherer {
         }
     }
     onTick(force) {
-        if (this.runningTick) {
+        if (this.runningTick || this.disposed) {
             return;
         }
         const rTime = this.viewer.clock.currentTime.toString();
@@ -16226,9 +16260,12 @@ var TilesetCadRenderManager;
             // 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 TilesetRenderEngine.Styler();
             this.modelTreeUpdate = new BruceEvent();
             // Quick look-up of the model tree nodes by entity/geomId.
@@ -16557,7 +16594,7 @@ var TilesetCadRenderManager;
         }
         // 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;
             }
@@ -16569,15 +16606,15 @@ var TilesetCadRenderManager;
                 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 = {
@@ -16627,13 +16664,6 @@ var TilesetCadRenderManager;
                 }
             });
             // 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,
@@ -16647,33 +16677,32 @@ var TilesetCadRenderManager;
                 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.
@@ -17225,33 +17254,40 @@ var TilesetCadRenderManager;
             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 = TilesetRenderEngine.GetMemoryWatcher(viewer)) === null || _a === void 0 ? void 0 : _a.Unwatch(this.cTileset);
+                    (_b = 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: VisualsRegister.EUpdateSource.TILESET_DISPOSE,
                 lazy: true
             });
+            if (this.handoffSourceMenuItemId) {
+                this.visualsManager.RemoveRegos({
+                    menuItemId: this.handoffSourceMenuItemId,
+                    doRemove: false,
+                    source: VisualsRegister.EUpdateSource.TILESET_DISPOSE,
+                    lazy: true
+                });
+                this.handoffSourceMenuItemId = null;
+            }
             this.viewerDateTimeDispose();
         }
         async ReRender(params) {
@@ -20010,9 +20046,12 @@ var TilesetEntitiesRenderManager;
             // 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 TilesetRenderEngine.Styler();
             // Entity ID -> rego.
             // We retain this information as a quick look-up on what has been registered.
@@ -20325,31 +20364,36 @@ var TilesetEntitiesRenderManager;
             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 = TilesetRenderEngine.GetMemoryWatcher(viewer)) === null || _a === void 0 ? void 0 : _a.Unwatch(this.cTileset);
+                    (_b = 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) {
@@ -20389,7 +20433,7 @@ var TilesetEntitiesRenderManager;
         }
         // 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;
             }
@@ -20401,13 +20445,13 @@ var TilesetEntitiesRenderManager;
                 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 = {
@@ -20449,14 +20493,8 @@ var TilesetEntitiesRenderManager;
                     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(),
@@ -20470,8 +20508,28 @@ var TilesetEntitiesRenderManager;
                     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) {
@@ -20490,27 +20548,6 @@ var TilesetEntitiesRenderManager;
             });
             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.
          */
@@ -46391,7 +46428,7 @@ var StyleUtils;
     StyleUtils.ApplyTypeStyle = ApplyTypeStyle;
 })(StyleUtils || (StyleUtils = {}));
 
-const VERSION = "7.3.0";
+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.