bruce-cesium 6.1.8 → 6.2.1

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
 import { BruceEvent, Cartes, Entity as Entity$1, ProjectViewTile, Carto, Geometry, MathUtils, LRUCache, Api, Calculator, ClientFile, EntityTag, EntityType, ObjectUtils, Style, DelayQueue, EntityLod, Bounds, ZoomControl, EntityRelationType, ENVIRONMENT, EntityHistoricData, Tileset, EntityCoords, DataLab, EntitySource, MenuItem, EntityRelation, ProgramKey, ProjectView, ProjectViewBookmark, Camera, ProjectViewLegacyTile, EntityAttachment, EntityAttachmentType, EntityAttribute, AbstractApi, Session } from 'bruce-models';
 import * as Cesium from 'cesium';
-import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, Entity, DistanceDisplayCondition, HorizontalOrigin, VerticalOrigin, ConstantProperty, ClassificationType, ConstantPositionProperty, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, ColorMaterialProperty, ColorBlendMode, HeadingPitchRoll, Transforms, Model, Primitive, Cesium3DTileFeature, SceneMode, GeoJsonDataSource, Cesium3DTileStyle, Cesium3DTileColorBlendMode, HeadingPitchRange, Ion, KmlDataSource, Quaternion, Matrix3, Matrix4, SceneTransforms, NearFarScalar, OrthographicFrustum, EasingFunction, EllipsoidTerrainProvider, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, IonResource, Cesium3DTileset, CesiumInspector, defined, ClockRange, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, BoundingSphere, GeometryInstance, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, ScreenSpaceEventHandler, ScreenSpaceEventType, CzmlDataSource, Intersect, Fullscreen } from 'cesium';
+import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, Entity, DistanceDisplayCondition, ClassificationType, ArcType, CornerType, ShadowMode, ConstantProperty, ConstantPositionProperty, PolygonHierarchy, PolylineGraphics, ColorMaterialProperty, HorizontalOrigin, VerticalOrigin, ColorBlendMode, HeadingPitchRoll, Transforms, Model, Primitive, Cesium3DTileFeature, SceneMode, GeoJsonDataSource, HeadingPitchRange, Ion, Cesium3DTileStyle, Cesium3DTileColorBlendMode, KmlDataSource, Quaternion, Matrix3, Matrix4, SceneTransforms, NearFarScalar, OrthographicFrustum, EasingFunction, Cesium3DTileset, IonResource, PolygonPipeline, EllipsoidTerrainProvider, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, CesiumInspector, defined, ClockRange, EllipsoidGeodesic, sampleTerrainMostDetailed, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, BoundingSphere, GeometryInstance, ScreenSpaceEventHandler, ScreenSpaceEventType, CzmlDataSource, Intersect, Fullscreen } from 'cesium';
 
 const TIME_LAG = 300;
 const POSITION_CHECK_TIMER = 950;
@@ -10798,6 +10798,19 @@ var CesiumAnimatedInOut;
     CesiumAnimatedInOut.AnimateOut = AnimateOut;
 })(CesiumAnimatedInOut || (CesiumAnimatedInOut = {}));
 
+function isTilesetFeatureAlive(visual) {
+    const cTileset = visual === null || visual === void 0 ? void 0 : visual.tileset;
+    if (!cTileset) {
+        return false;
+    }
+    else if (cTileset.isDestroyed() || !cTileset.show || !cTileset.root) {
+        return false;
+    }
+    else if (visual.primitive && visual.primitive.isDestroyed()) {
+        return false;
+    }
+    return true;
+}
 /**
  * Returns if a given visual is alive and in the scene.
  * @param viewer
@@ -10893,23 +10906,25 @@ function updateEntityShow(viewer, rego, show) {
         }
     }
     else if (visual instanceof Cesium3DTileFeature) {
-        // No way to tell if changing show will crash it!
-        // ^ We need to improve removing visuals from the register when tiles unload to avoid this :)
-        try {
-            visual.show = show;
-        }
-        catch (e) {
-            console.error(e);
-        }
-        const ent = visual;
-        if (ent._siblingGraphics) {
-            for (let i = 0; i < ent._siblingGraphics.length; i++) {
-                try {
-                    const sibling = ent._siblingGraphics[i];
-                    sibling.show = show;
-                }
-                catch (e) {
-                    console.error(e);
+        if (isTilesetFeatureAlive(visual)) {
+            // No way to tell if changing show will crash it!
+            // ^ We need to improve removing visuals from the register when tiles unload to avoid this :)
+            try {
+                visual.show = show;
+            }
+            catch (e) {
+                console.error(e);
+            }
+            const ent = visual;
+            if (ent._siblingGraphics) {
+                for (let i = 0; i < ent._siblingGraphics.length; i++) {
+                    try {
+                        const sibling = ent._siblingGraphics[i];
+                        sibling.show = show;
+                    }
+                    catch (e) {
+                        console.error(e);
+                    }
                 }
             }
         }
@@ -18952,28 +18967,36 @@ var TilesetCadRenderManager;
                     }
                 }
             }
-            // Latest path.
             if (!rego.entityId) {
+                // Latest path.
                 const entityIdProp = this.featurePropCache.get("entityId");
                 if (entityIdProp) {
                     rego.entityId = feature.getProperty(entityIdProp);
                 }
-            }
-            // Super legacy.
-            if (!rego.entityId) {
-                const brucePathProp = this.featurePropCache.get("brucePath");
-                if (brucePathProp) {
-                    const pathStr = feature.getProperty(brucePathProp);
-                    if (pathStr) {
-                        let path = pathStr.split("|");
-                        let entityTypeId = this.getEntityTypeByPath(path);
-                        rego.entityTypeId = entityTypeId;
-                        rego.entityId = path[path.length - 1];
+                // Super legacy.
+                if (!rego.entityId) {
+                    const brucePathProp = this.featurePropCache.get("brucePath");
+                    if (brucePathProp) {
+                        const pathStr = feature.getProperty(brucePathProp);
+                        if (pathStr) {
+                            let path = pathStr.split("|");
+                            let entityTypeId = this.getEntityTypeByPath(path);
+                            rego.entityTypeId = entityTypeId;
+                            rego.entityId = path[path.length - 1];
+                        }
                     }
                 }
-            }
-            if (!rego.entityId) {
-                return null;
+                if (!rego.entityId) {
+                    return null;
+                }
+                const meta = this.getMetaByEntityId(rego.entityId);
+                if (meta) {
+                    rego.entityTypeId = meta.typeId;
+                    rego.name = meta.name;
+                    rego.parentId = meta.parentId;
+                    // Might be a different ID due to collapsed parents.
+                    rego.entityId = meta.entityId;
+                }
             }
             // Optional menu item restriction.
             // Allows only showing certain entities from a tileset.
@@ -19038,6 +19061,15 @@ var TilesetCadRenderManager;
             });
             return rego;
         }
+        getMetaByEntityId(entityId) {
+            if (this.treeNodeByEntityId == null) {
+                if (!this.modelTree) {
+                    return null;
+                }
+                this.buildModelTreeNodes(this.modelTree);
+            }
+            return this.treeNodeByEntityId[entityId] || null;
+        }
         getMetaByGeomId(geomId) {
             if (this.treeNodeByGeomId == null) {
                 if (!this.modelTree) {
@@ -20157,6 +20189,24 @@ var TilesetEntitiesRenderManager;
             this.disposed = false;
             this.cTileset = null;
             this.styler = new TilesetRenderEngine.Styler();
+            // Entity ID -> rego.
+            // We retain this information as a quick look-up on what has been registered.
+            // This lets us properly assign siblings to the same rego when hierarchy items are marked as collapsed.
+            this.loadedCesiumEntities = {};
+            // Cache of 'something isolated' that we detect and use to calculate a default show state.
+            // It's pretty expensive so we save it for a few seconds inbetween checks.
+            this.somethingIsolated = null;
+            this.somethingIsolatedDateTime = null;
+            // Queue of loaded in features that we haven't processed yet.
+            this.featureQueue = [];
+            // State is true for 'add' or 'false' for 'remove'.
+            this.featureQueueStates = new Map();
+            this.featureQueueInterval = null;
+            // Cache of feature properties we wanted to find vs what we found.
+            // Eg: "entityId" -> "entityId" | "bruceId" | "id" | null.
+            // Saves having to do a case-insensitive lookup every time.
+            this.featurePropCache = new Map();
+            this.featurePropsChecked = 0;
             const { viewer, register: visualsManager, getters: apiGetter, item } = params;
             this.viewer = viewer;
             this.getters = apiGetter;
@@ -20283,7 +20333,20 @@ var TilesetEntitiesRenderManager;
                         }
                     });
                     cTileset.tileLoad.addEventListener((tile) => {
-                        this.mapCTile(tile);
+                        try {
+                            this.queueTile(tile, true);
+                        }
+                        catch (e) {
+                            console.error(e);
+                        }
+                    });
+                    cTileset.tileUnload.addEventListener((tile) => {
+                        try {
+                            this.queueTile(tile, false);
+                        }
+                        catch (e) {
+                            console.error(e);
+                        }
                     });
                 }
                 // Scaling points by default otherwise they're 1px in size.
@@ -20306,6 +20369,118 @@ var TilesetEntitiesRenderManager;
                 });
             })();
         }
+        /**
+         * @param tile
+         * @param load indicates if we are loading or unloading the tile.
+         * @returns
+         */
+        queueTile(tile, load) {
+            const content = tile === null || tile === void 0 ? void 0 : tile.content;
+            if (!content) {
+                return;
+            }
+            for (let i = 0; i < content.featuresLength; i++) {
+                const feature = content.getFeature(i);
+                if (!this.featureQueue.includes(feature)) {
+                    this.featureQueue.push(feature);
+                }
+                this.featureQueueStates.set(feature, load);
+            }
+            this.pingFeatureQueue();
+        }
+        /**
+         * Pings the feature queue to process any queued features.
+         * Does nothing if we're already processing.
+         * @returns
+         */
+        pingFeatureQueue() {
+            if (!this.featureQueue.length || this.featureQueueInterval || this.disposed) {
+                return;
+            }
+            this.featureQueueInterval = setInterval(() => {
+                if (this.disposed) {
+                    clearInterval(this.featureQueueInterval);
+                    this.featureQueueInterval = null;
+                    return;
+                }
+                this.processFeatureQueueBatch();
+                if (!this.featureQueue) {
+                    clearInterval(this.featureQueueInterval);
+                    this.featureQueueInterval = null;
+                }
+            }, 10);
+        }
+        /**
+         * Process a batch of features from the feature queue.
+         */
+        processFeatureQueueBatch() {
+            if (!this.featureQueue.length) {
+                return;
+            }
+            const BATCH_SIZE = 5000;
+            const batch = this.featureQueue.splice(0, BATCH_SIZE);
+            const regosToStyle = new Map();
+            const featuresToRemove = [];
+            for (const feature of batch) {
+                const load = this.featureQueueStates.get(feature);
+                this.featureQueueStates.delete(feature);
+                if (!load) {
+                    featuresToRemove.push(feature);
+                    continue;
+                }
+                const result = this.mapTilesetFeature(feature);
+                if (result === null) {
+                    // Override the default hide state set by the style.
+                    feature.show = true;
+                    continue;
+                }
+                else if (result) {
+                    regosToStyle.set(result.entityId, result);
+                }
+            }
+            if (featuresToRemove.length) {
+                const { removedEntityIds } = this.visualsManager.RemoveRegosByVisuals({
+                    visuals: featuresToRemove,
+                    requestRender: false,
+                    menuItemId: this.item.id,
+                    doRemove: false
+                });
+                for (const entityId of removedEntityIds) {
+                    delete this.loadedCesiumEntities[entityId];
+                }
+            }
+            if (this.styler && regosToStyle.size) {
+                this.styler.QueueEntities(Array.from(regosToStyle.values()));
+            }
+        }
+        evaluateFeatureProps(feature) {
+            var _a;
+            // If we've checked 10 features then we should have a good handle on what props are available.
+            if (this.featurePropsChecked >= 10) {
+                return;
+            }
+            this.featurePropsChecked++;
+            const featureAny = feature;
+            const props = featureAny.getPropertyNames ? featureAny.getPropertyNames() : (_a = featureAny.getPropertyIds) === null || _a === void 0 ? void 0 : _a.call(featureAny);
+            if (!props) {
+                return;
+            }
+            for (const prop of props) {
+                if (!prop) {
+                    continue;
+                }
+                const lowered = prop.toLowerCase();
+                if (lowered === "bruceid" || lowered === "id" || lowered === "entityid") {
+                    this.featurePropCache.set("entityId", prop);
+                }
+                else if (lowered === "brucepath") {
+                    this.featurePropCache.set("BrucePath", prop);
+                }
+                else if (lowered === "building_id" || lowered === "buildingid") {
+                    this.featurePropCache.set("BuildingID", prop);
+                }
+            }
+        }
         Dispose() {
             if (this.disposed) {
                 return;
@@ -20315,6 +20490,11 @@ var TilesetEntitiesRenderManager;
         }
         doDispose() {
             var _a, _b;
+            if (this.featureQueueInterval) {
+                clearInterval(this.featureQueueInterval);
+                this.featureQueueInterval = null;
+                this.featureQueue = [];
+            }
             if (this.cTileset) {
                 const viewer = this.viewer;
                 if (!(viewer === null || viewer === void 0 ? void 0 : viewer.isDestroyed()) && this.viewer.scene.primitives.contains(this.cTileset)) {
@@ -20335,60 +20515,84 @@ var TilesetEntitiesRenderManager;
                 this.viewer.zoomTo(this.cTileset, new HeadingPitchRange(0.0, -0.5, this.cTileset.boundingSphere.radius / 4.0));
             }
         }
-        mapCTile(tile) {
-            const content = tile === null || tile === void 0 ? void 0 : tile.content;
-            if (!content) {
-                return;
-            }
-            const regosToQueue = new Map();
-            for (let i = 0; i < content.featuresLength; i++) {
-                const feature = content.getFeature(i);
-                const rego = this.mapTilesetFeature(feature);
-                if (rego === null || rego === void 0 ? void 0 : rego.entityId) {
-                    regosToQueue.set(rego.entityId, rego);
-                }
-            }
-            if (this.styler && regosToQueue.size) {
-                this.styler.QueueEntities(Array.from(regosToQueue.values()));
-            }
-            this.viewer.scene.requestRender();
-        }
         mapTilesetFeature(feature) {
             var _a, _b, _c;
-            // Version =1 tilesets.
-            let id = feature.getProperty("BruceId");
+            this.evaluateFeatureProps(feature);
+            const propToUse = this.featurePropCache.get("entityId");
+            let id = propToUse ? feature.getProperty(propToUse) : null;
+            if (id && typeof id == "string") {
+                // Perhaps a relic of UTF-16 encoding after we stopped using it?
+                if (id.endsWith("\u0000")) {
+                    id = id.substring(0, id.length - 1);
+                }
+            }
             if (!id) {
-                // Version >1 tilesets.
-                id = feature.getProperty("entityId");
-                if (id && typeof id == "string") {
-                    // Perhaps a relic of UTF-16 encoding after we stopped using it?
-                    if (id.endsWith("\u0000")) {
-                        id = id.substring(0, id.length - 1);
-                    }
+                return null;
+            }
+            const accountId = (_b = (_a = this.item.tileset) === null || _a === void 0 ? void 0 : _a.ClientAccountID) !== null && _b !== void 0 ? _b : this.getters.GetAccountId();
+            const canEdit = accountId === this.getters.GetAccountId();
+            let rego = {
+                canEdit: canEdit,
+                entityId: id,
+                entityTypeId: this.typeId,
+                menuItemId: this.item.id,
+                menuItemType: this.item.Type,
+                priority: this.renderPriority,
+                visual: feature,
+                tilesetId: (_c = this.item.tileset) === null || _c === void 0 ? void 0 : _c.TilesetID,
+                tilesetType: Tileset.EType.EntitiesSet,
+                accountId: accountId
+            };
+            // Get the initial hide/show state.
+            const state = this.visualsManager.GetState({
+                entityId: rego.entityId,
+                menuItemId: this.item.id,
+            });
+            if (this.somethingIsolated == null ||
+                // 5s cache.
+                (this.somethingIsolatedDateTime && this.somethingIsolatedDateTime.getTime() + 5000 < new Date().getTime())) {
+                this.somethingIsolated = this.visualsManager.GetIsIsolatedAny();
+                this.somethingIsolatedDateTime = new Date();
+            }
+            // Override the default hide state set by the style.
+            let hide = false;
+            if (state) {
+                if (state.hidden) {
+                    hide = true;
+                }
+                else if (state.opacity === 0) {
+                    hide = true;
+                }
+                else if (!state.isolated && this.somethingIsolated) {
+                    hide = true;
                 }
             }
-            if (id) {
-                const accountId = (_b = (_a = this.item.tileset) === null || _a === void 0 ? void 0 : _a.ClientAccountID) !== null && _b !== void 0 ? _b : this.getters.GetAccountId();
-                const canEdit = accountId === this.getters.GetAccountId();
-                const rego = {
-                    canEdit: canEdit,
-                    entityId: id,
-                    entityTypeId: this.typeId,
-                    menuItemId: this.item.id,
-                    menuItemType: this.item.Type,
-                    priority: this.renderPriority,
-                    visual: feature,
-                    tilesetId: (_c = this.item.tileset) === null || _c === void 0 ? void 0 : _c.TilesetID,
-                    tilesetType: Tileset.EType.EntitiesSet,
-                    accountId: accountId
-                };
-                this.visualsManager.AddRego({
-                    rego,
-                    requestRender: false
-                });
-                return rego;
+            feature.show = !hide;
+            // Already exists, so we add this graphic as a sibling.
+            if (this.loadedCesiumEntities[rego.entityId]) {
+                rego = this.loadedCesiumEntities[rego.entityId];
+                if (!rego.visual) {
+                    // No parent graphic.
+                    rego.visual = feature;
+                }
+                else if (rego.visual == feature) ;
+                else {
+                    const visual = rego.visual;
+                    // Sibling graphic.
+                    if (!visual._siblingGraphics) {
+                        visual._siblingGraphics = [];
+                    }
+                    if (visual._siblingGraphics.indexOf(feature) < 0) {
+                        visual._siblingGraphics.push(feature);
+                    }
+                }
             }
-            return null;
+            this.loadedCesiumEntities[rego.entityId] = rego;
+            this.visualsManager.AddRego({
+                rego,
+                requestRender: false
+            });
+            return rego;
         }
         async ReRender(params) {
             let { entityIds, force, entities } = params;
@@ -20671,6 +20875,24 @@ var TilesetArbRenderManager;
             this.cTileset = null;
             this.styler = new TilesetRenderEngine.Styler();
             this.tilesetType = null;
+            // Entity ID -> rego.
+            // We retain this information as a quick look-up on what has been registered.
+            // This lets us properly assign siblings to the same rego when hierarchy items are marked as collapsed.
+            this.loadedCesiumEntities = {};
+            // Cache of 'something isolated' that we detect and use to calculate a default show state.
+            // It's pretty expensive so we save it for a few seconds inbetween checks.
+            this.somethingIsolated = null;
+            this.somethingIsolatedDateTime = null;
+            // Queue of loaded in features that we haven't processed yet.
+            this.featureQueue = [];
+            // State is true for 'add' or 'false' for 'remove'.
+            this.featureQueueStates = new Map();
+            this.featureQueueInterval = null;
+            // Cache of feature properties we wanted to find vs what we found.
+            // Eg: "entityId" -> "entityId" | "bruceId" | "id" | null.
+            // Saves having to do a case-insensitive lookup every time.
+            this.featurePropCache = new Map();
+            this.featurePropsChecked = 0;
             this.viewer = params.viewer;
             this.getters = params.getters;
             this.visualsManager = params.register;
@@ -20847,11 +21069,16 @@ var TilesetArbRenderManager;
                     }
                 });
                 this.cTileset.tileLoad.addEventListener((tile) => {
-                    if (this.disposed || this.viewer.isDestroyed()) {
-                        return;
+                    try {
+                        this.queueTile(tile, true);
                     }
+                    catch (e) {
+                        console.error(e);
+                    }
+                });
+                this.cTileset.tileUnload.addEventListener((tile) => {
                     try {
-                        this.mapCTile(tile);
+                        this.queueTile(tile, false);
                     }
                     catch (e) {
                         console.error(e);
@@ -20859,6 +21086,118 @@ var TilesetArbRenderManager;
                 });
             })();
         }
+        /**
+         * @param tile
+         * @param load indicates if we are loading or unloading the tile.
+         * @returns
+         */
+        queueTile(tile, load) {
+            const content = tile === null || tile === void 0 ? void 0 : tile.content;
+            if (!content) {
+                return;
+            }
+            for (let i = 0; i < content.featuresLength; i++) {
+                const feature = content.getFeature(i);
+                if (!this.featureQueue.includes(feature)) {
+                    this.featureQueue.push(feature);
+                }
+                this.featureQueueStates.set(feature, load);
+            }
+            this.pingFeatureQueue();
+        }
+        /**
+         * Pings the feature queue to process any queued features.
+         * Does nothing if we're already processing.
+         * @returns
+         */
+        pingFeatureQueue() {
+            if (!this.featureQueue.length || this.featureQueueInterval || this.disposed) {
+                return;
+            }
+            this.featureQueueInterval = setInterval(() => {
+                if (this.disposed) {
+                    clearInterval(this.featureQueueInterval);
+                    this.featureQueueInterval = null;
+                    return;
+                }
+                this.processFeatureQueueBatch();
+                if (!this.featureQueue) {
+                    clearInterval(this.featureQueueInterval);
+                    this.featureQueueInterval = null;
+                }
+            }, 10);
+        }
+        /**
+         * Process a batch of features from the feature queue.
+         */
+        processFeatureQueueBatch() {
+            if (!this.featureQueue.length) {
+                return;
+            }
+            const BATCH_SIZE = 5000;
+            const batch = this.featureQueue.splice(0, BATCH_SIZE);
+            const regosToStyle = new Map();
+            const featuresToRemove = [];
+            for (const feature of batch) {
+                const load = this.featureQueueStates.get(feature);
+                this.featureQueueStates.delete(feature);
+                if (!load) {
+                    featuresToRemove.push(feature);
+                    continue;
+                }
+                const result = this.mapTilesetFeature(feature);
+                if (result === null) {
+                    // Override the default hide state set by the style.
+                    feature.show = true;
+                    continue;
+                }
+                else if (result) {
+                    regosToStyle.set(result.entityId, result);
+                }
+            }
+            if (featuresToRemove.length) {
+                const { removedEntityIds } = this.visualsManager.RemoveRegosByVisuals({
+                    visuals: featuresToRemove,
+                    requestRender: false,
+                    menuItemId: this.item.id,
+                    doRemove: false
+                });
+                for (const entityId of removedEntityIds) {
+                    delete this.loadedCesiumEntities[entityId];
+                }
+            }
+            if (this.styler && regosToStyle.size) {
+                this.styler.QueueEntities(Array.from(regosToStyle.values()));
+            }
+        }
+        evaluateFeatureProps(feature) {
+            var _a;
+            // If we've checked 10 features then we should have a good handle on what props are available.
+            if (this.featurePropsChecked >= 10) {
+                return;
+            }
+            this.featurePropsChecked++;
+            const featureAny = feature;
+            const props = featureAny.getPropertyNames ? featureAny.getPropertyNames() : (_a = featureAny.getPropertyIds) === null || _a === void 0 ? void 0 : _a.call(featureAny);
+            if (!props) {
+                return;
+            }
+            for (const prop of props) {
+                if (!prop) {
+                    continue;
+                }
+                const lowered = prop.toLowerCase();
+                if (lowered === "bruceid" || lowered === "id" || lowered === "entityid") {
+                    this.featurePropCache.set("entityId", prop);
+                }
+                else if (lowered === "brucepath") {
+                    this.featurePropCache.set("BrucePath", prop);
+                }
+                else if (lowered === "building_id" || lowered === "buildingid") {
+                    this.featurePropCache.set("BuildingID", prop);
+                }
+            }
+        }
         onCTilesetLoad() {
             if (this.item.FlyTo) {
                 this.viewer.zoomTo(this.cTileset, new HeadingPitchRange(0.0, -0.5, this.cTileset.boundingSphere.radius / 4.0));
@@ -20873,6 +21212,11 @@ var TilesetArbRenderManager;
         }
         doDispose() {
             var _a, _b;
+            if (this.featureQueueInterval) {
+                clearInterval(this.featureQueueInterval);
+                this.featureQueueInterval = null;
+                this.featureQueue = [];
+            }
             if (this.cTileset) {
                 const viewer = this.viewer;
                 if (!(viewer === null || viewer === void 0 ? void 0 : viewer.isDestroyed()) && this.viewer.scene.primitives.contains(this.cTileset)) {
@@ -20889,7 +21233,10 @@ var TilesetArbRenderManager;
             });
         }
         async ReRender(params) {
-            const { entityIds, force } = params;
+            let { entityIds, force, entities } = params;
+            if (entities && !entityIds) {
+                entityIds = entities.map(x => { var _a; return (_a = x.Bruce) === null || _a === void 0 ? void 0 : _a.ID; });
+            }
             if (!this.styler) {
                 return;
             }
@@ -20899,25 +21246,9 @@ var TilesetArbRenderManager;
             if (entityIds != null) {
                 regos = regos.filter(r => entityIds.indexOf(r.entityId) >= 0);
             }
-            this.styler.QueueEntities(regos);
-        }
-        mapCTile(tile) {
-            const content = tile === null || tile === void 0 ? void 0 : tile.content;
-            if (!content) {
-                return;
-            }
-            const regosToQueue = new Map();
-            for (let i = 0; i < content.featuresLength; i++) {
-                const feature = content.getFeature(i);
-                let rego = this.mapTilesetFeature(feature);
-                if (rego === null || rego === void 0 ? void 0 : rego.entityId) {
-                    regosToQueue.set(rego.entityId, rego);
-                }
-            }
-            if (this.styler && regosToQueue.size) {
-                this.styler.QueueEntities(Array.from(regosToQueue.values()));
-            }
-            this.viewer.scene.requestRender();
+            // Update the cache so we use that data instead of requesting the records.
+            this.styler.SetEntityCache(entityIds, entities);
+            this.styler.QueueEntities(regos, true);
         }
         mapTilesetFeature(feature) {
             var _a, _b, _c, _d;
@@ -20935,32 +21266,76 @@ var TilesetArbRenderManager;
                 tilesetId: (_c = this.item.tileset) === null || _c === void 0 ? void 0 : _c.TilesetID,
                 tilesetType: this.tilesetType
             };
-            // Two different methods for two different Cesium versions...
-            const props = feature.getPropertyNames ? feature.getPropertyNames([]) :
-                feature.getPropertyIds ? feature.getPropertyIds() : [];
-            if (props.find(x => x == "BrucePath")) {
-                const path = (_d = feature.getProperty("BrucePath")) === null || _d === void 0 ? void 0 : _d.split("|");
-                if (path === null || path === void 0 ? void 0 : path.length) {
-                    rego.entityId = path[path.length - 1];
+            this.evaluateFeatureProps(feature);
+            if (!rego.entityId) {
+                const propToUse = this.featurePropCache.get("entityId");
+                if (propToUse) {
+                    rego.entityId = feature.getProperty(propToUse);
                 }
             }
             if (!rego.entityId) {
-                // 'Building' ones are for legacy CC3D data.
-                const ACCEPTABLE_PROPS = [
-                    "Building_ID", "BuildingID", "BruceId", "entityId", "bruceId"
-                ];
-                for (let acceptableId of ACCEPTABLE_PROPS) {
-                    if (props.indexOf(acceptableId) > -1) {
-                        rego.entityId = feature.getProperty(acceptableId);
-                        if (rego.entityId) {
-                            break;
-                        }
+                const propToUse = this.featurePropCache.get("BrucePath");
+                if (propToUse) {
+                    const path = (_d = feature.getProperty(propToUse)) === null || _d === void 0 ? void 0 : _d.split("|");
+                    if (path === null || path === void 0 ? void 0 : path.length) {
+                        rego.entityId = path[path.length - 1];
                     }
                 }
             }
+            if (!rego.entityId) {
+                const propToUse = this.featurePropCache.get("BuildingID");
+                if (propToUse) {
+                    rego.entityId = feature.getProperty(propToUse);
+                }
+            }
             if (!rego.entityId) {
                 return null;
             }
+            // Get the initial hide/show state.
+            const state = this.visualsManager.GetState({
+                entityId: rego.entityId,
+                menuItemId: this.item.id,
+            });
+            if (this.somethingIsolated == null ||
+                // 5s cache.
+                (this.somethingIsolatedDateTime && this.somethingIsolatedDateTime.getTime() + 5000 < new Date().getTime())) {
+                this.somethingIsolated = this.visualsManager.GetIsIsolatedAny();
+                this.somethingIsolatedDateTime = new Date();
+            }
+            // Override the default hide state set by the style.
+            let hide = false;
+            if (state) {
+                if (state.hidden) {
+                    hide = true;
+                }
+                else if (state.opacity === 0) {
+                    hide = true;
+                }
+                else if (!state.isolated && this.somethingIsolated) {
+                    hide = true;
+                }
+            }
+            feature.show = !hide;
+            // Already exists, so we add this graphic as a sibling.
+            if (this.loadedCesiumEntities[rego.entityId]) {
+                rego = this.loadedCesiumEntities[rego.entityId];
+                if (!rego.visual) {
+                    // No parent graphic.
+                    rego.visual = feature;
+                }
+                else if (rego.visual == feature) ;
+                else {
+                    const visual = rego.visual;
+                    // Sibling graphic.
+                    if (!visual._siblingGraphics) {
+                        visual._siblingGraphics = [];
+                    }
+                    if (visual._siblingGraphics.indexOf(feature) < 0) {
+                        visual._siblingGraphics.push(feature);
+                    }
+                }
+            }
+            this.loadedCesiumEntities[rego.entityId] = rego;
             this.visualsManager.AddRego({
                 rego,
                 requestRender: false
@@ -32831,6 +33206,9 @@ const colors = {};
 const names = {};
 const entities = {};
 const viewers = {};
+// Global shift to move cursor + label down in pixels
+const CURSOR_SHIFT_Y = 22;
+const CURSOR_SHIFT_X = 10;
 function createDOMLabel(viewer, id, name, colorCss) {
     var _a;
     const label = document.createElement("div");
@@ -32885,8 +33263,8 @@ function updateDOMLabel(viewer, label, pos3d) {
     // Keep full opacity; no distance-based fading
     // Keep the label close to the cursor regardless of zoom
     // Use small, constant pixel offsets to bottom-right
-    const offsetX = 12; // px
-    const offsetY = 10; // px
+    const offsetX = 6 + CURSOR_SHIFT_X; // px
+    const offsetY = 4 + CURSOR_SHIFT_Y; // px (shift label further down)
     let leftPx = screenPos.x + offsetX;
     let topPx = screenPos.y + offsetY;
     const pad = 8;
@@ -32937,7 +33315,9 @@ var LiveCursor;
                     distanceDisplayCondition: new DistanceDisplayCondition(0, 30000),
                     scaleByDistance: new NearFarScalar(100, 1.5, 10000, 0.8),
                     verticalOrigin: VerticalOrigin.BOTTOM,
-                    horizontalOrigin: HorizontalOrigin.CENTER
+                    horizontalOrigin: HorizontalOrigin.CENTER,
+                    // Shift billboard down; Cesium's +Y is up so use negative
+                    pixelOffset: new Cartesian2(CURSOR_SHIFT_X, CURSOR_SHIFT_Y)
                 } : undefined,
                 ellipse: showEllipse ? {
                     semiMajorAxis: 50.0,
@@ -32975,6 +33355,10 @@ var LiveCursor;
                 viewer: viewer
             });
             entity.position = new CallbackProperty(() => animated.GetValue(), false);
+            // Ensure existing billboard is shifted consistently
+            if (entity.billboard) {
+                entity.billboard.pixelOffset = new Cartesian2(CURSOR_SHIFT_X, CURSOR_SHIFT_Y);
+            }
         }
         if (!updaters[id]) {
             const remover = viewer.scene.postUpdate.addEventListener(() => {
@@ -33002,6 +33386,14 @@ var LiveCursor;
     }
     LiveCursor.Upsert = Upsert;
     function Remove(id) {
+        // Also remove any camera visuals tracked for this cursor
+        const viewer = viewers[id];
+        if (viewer) {
+            try {
+                RemoveCameraVisuals(viewer, id);
+            }
+            catch { }
+        }
         const label = labels[id];
         if (label && label.parentElement) {
             label.parentElement.removeChild(label);
@@ -33019,7 +33411,6 @@ var LiveCursor;
         }
         // Remove entity if present
         const entity = entities[id];
-        const viewer = viewers[id];
         if (entity && viewer && viewer.entities.contains(entity)) {
             viewer.entities.remove(entity);
         }
@@ -33027,6 +33418,136 @@ var LiveCursor;
         delete viewers[id];
     }
     LiveCursor.Remove = Remove;
+    const cameraVisuals = {};
+    const cameraUpdateBuffer = {};
+    const CAMERA_UPDATE_INTERVAL = 500; // ms
+    const CAMERA_BUFFER_TIMEOUT = 1000; // ms
+    function UpsertCameraVisuals(params) {
+        if (params.throttled) {
+            return throttledUpsertCameraVisuals(params);
+        }
+        return internalUpsertCameraVisuals(params);
+    }
+    LiveCursor.UpsertCameraVisuals = UpsertCameraVisuals;
+    function throttledUpsertCameraVisuals(params) {
+        var _a, _b;
+        const { viewer, id, camera, color } = params;
+        const now = Date.now();
+        cameraUpdateBuffer[id] = {
+            camera: { ...camera },
+            color,
+            lastBufferTime: now
+        };
+        const existing = cameraVisuals[id];
+        if (!(existing === null || existing === void 0 ? void 0 : existing.cone) || (now - ((_a = existing.lastUpdate) !== null && _a !== void 0 ? _a : 0)) >= CAMERA_UPDATE_INTERVAL) {
+            internalUpsertCameraVisuals(params);
+            return;
+        }
+        setTimeout(() => {
+            const buffered = cameraUpdateBuffer[id];
+            if (buffered && (now - buffered.lastBufferTime) < CAMERA_BUFFER_TIMEOUT) {
+                internalUpsertCameraVisuals({
+                    viewer,
+                    id,
+                    camera: buffered.camera,
+                    color: buffered.color
+                });
+            }
+        }, Math.max(0, CAMERA_UPDATE_INTERVAL - (now - ((_b = existing.lastUpdate) !== null && _b !== void 0 ? _b : 0))));
+    }
+    function internalUpsertCameraVisuals(params) {
+        var _a, _b, _c, _d, _e, _f, _g, _h;
+        const { viewer, id, camera, color } = params;
+        if (!viewer || viewer.isDestroyed() || !(camera === null || camera === void 0 ? void 0 : camera.pos)) {
+            return;
+        }
+        const camPos = new Cartesian3(camera.pos.x, camera.pos.y, camera.pos.z);
+        // Adjust heading by -90 degrees to correct coordinate system mismatch
+        const adjustedHeading = ((_a = camera.headingDeg) !== null && _a !== void 0 ? _a : 0) - 90;
+        const headingRad = Math$1.toRadians(adjustedHeading);
+        const pitchRad = Math$1.toRadians((_b = camera.pitchDeg) !== null && _b !== void 0 ? _b : 0);
+        const rollRad = Math$1.toRadians((_c = camera.rollDeg) !== null && _c !== void 0 ? _c : 0);
+        const hpr = new HeadingPitchRoll(headingRad, pitchRad, rollRad);
+        const baseOrientation = Transforms.headingPitchRollQuaternion(camPos, hpr);
+        // Cylinder axis is local +Z, but HPR 'forward' is along +X. Tilt so Z -> X.
+        const tilt = Quaternion.fromAxisAngle(Cartesian3.UNIT_Y, Math$1.toRadians(-90));
+        const orientation = Quaternion.multiply(baseOrientation, tilt, new Quaternion());
+        const vFovDeg = Math.max(1, Math.min(170, (_d = camera.fovDeg) !== null && _d !== void 0 ? _d : 60));
+        const aspect = (viewer.canvas && viewer.canvas.clientHeight > 0)
+            ? (viewer.canvas.clientWidth / viewer.canvas.clientHeight)
+            : 16 / 9;
+        const hFovDeg = Math$1.toDegrees(2 * Math.atan(Math.tan(Math$1.toRadians(vFovDeg) / 2) * aspect));
+        const length = Math.max(10, (_e = camera.rangeMeters) !== null && _e !== void 0 ? _e : 200);
+        // Use horizontal FOV to approximate viewing cone width
+        const bottomRadius = Math.tan(Math$1.toRadians(hFovDeg / 2)) * length;
+        // Offset position so cone extends forward from camera
+        const rotation = Matrix3.fromQuaternion(orientation);
+        const forward = Matrix3.multiplyByVector(rotation, Cartesian3.UNIT_Z, new Cartesian3());
+        const offset = Cartesian3.multiplyByScalar(forward, length / 2, new Cartesian3());
+        const conePos = Cartesian3.add(camPos, offset, new Cartesian3());
+        const coneId = `user-camera-cone-${id}`;
+        const now = Date.now();
+        const existing = (_f = cameraVisuals[id]) !== null && _f !== void 0 ? _f : {};
+        // Upsert cone entity
+        if (!existing.cone) {
+            const cone = viewer.entities.add({
+                id: coneId,
+                position: conePos,
+                orientation: orientation,
+                cylinder: {
+                    length,
+                    topRadius: 0,
+                    bottomRadius,
+                    material: color.withAlpha(0.25),
+                    outline: true,
+                    outlineColor: color.withAlpha(0.8),
+                    numberOfVerticalLines: 0,
+                    slices: 64,
+                    distanceDisplayCondition: new DistanceDisplayCondition(0, 50000)
+                }
+            });
+            existing.cone = cone;
+            existing.lastUpdate = now;
+        }
+        else {
+            const needsUpdate = (!Cartesian3.equals(((_g = existing.cone.position) === null || _g === void 0 ? void 0 : _g.getValue(JulianDate.now())) || new Cartesian3(), conePos) ||
+                !Quaternion.equals(((_h = existing.cone.orientation) === null || _h === void 0 ? void 0 : _h.getValue(JulianDate.now())) || new Quaternion(), orientation));
+            if (needsUpdate) {
+                viewer.entities.suspendEvents();
+                try {
+                    existing.cone.position = conePos;
+                    existing.cone.orientation = orientation;
+                    const cylinder = existing.cone.cylinder;
+                    if (cylinder) {
+                        cylinder.length = length;
+                        cylinder.bottomRadius = bottomRadius;
+                        cylinder.material = color.withAlpha(0.25);
+                        cylinder.outlineColor = color.withAlpha(0.8);
+                    }
+                }
+                finally {
+                    viewer.entities.resumeEvents();
+                }
+            }
+            existing.lastUpdate = now;
+        }
+        cameraVisuals[id] = existing;
+    }
+    function RemoveCameraVisuals(viewer, id) {
+        const existing = cameraVisuals[id];
+        if (!existing) {
+            return;
+        }
+        if (existing.cone) {
+            try {
+                viewer.entities.remove(existing.cone);
+            }
+            catch { }
+        }
+        delete cameraVisuals[id];
+        delete cameraUpdateBuffer[id];
+    }
+    LiveCursor.RemoveCameraVisuals = RemoveCameraVisuals;
 })(LiveCursor || (LiveCursor = {}));
 
 var WidgetControlViewBar;
@@ -33801,7 +34322,7 @@ class WidgetViewBar extends Widget.AWidget {
     }
 }
 
-const VERSION = "6.1.8";
+const VERSION = "6.2.1";
 
 export { VERSION, CesiumViewMonitor, ViewerUtils, ViewerEventTracker, MenuItemManager, isOutlineChanged, EntityRenderEngine, EntityRenderEnginePoint, EntityRenderEnginePolyline, EntityRenderEnginePolygon, EntityRenderEngineModel3d, MenuItemCreator, VisualsRegister, RenderManager, EntitiesIdsRenderManager, DataLabRenderManager, EntitiesLoadedRenderManager, EntitiesRenderManager, EntityRenderManager, TilesetCadRenderManager, TilesetArbRenderManager, TilesetEntitiesRenderManager, TilesetOsmRenderManager, TilesetPointcloudRenderManager, TilesetGooglePhotosRenderManager, DataSourceStaticKmlManager, GoogleSearchRenderManager, AssemblyRenderManager, RelationsRenderManager, SharedGetters, CesiumParabola, EntityLabel, LiveCursor, ViewRenderEngine, TileRenderEngine, TilesetRenderEngine, CESIUM_INSPECTOR_KEY, CESIUM_TIMELINE_KEY, CESIUM_TIMELINE_LIVE_KEY, CESIUM_TIMELINE_LIVE_PADDING_KEY, CESIUM_TIMELINE_INTERVAL_KEY, CESIUM_MODEL_SPACE_KEY, DEFAULT_LIVE_PADDING_SECONDS, ViewUtils, DrawingUtils, MeasureUtils, EntityUtils, CesiumEntityStyler, CesiumAnimatedProperty, CesiumAnimatedInOut, Draw3dPolygon, Draw3dPolyline, MeasureCreator, Walkthrough, Widget, VIEWER_BOOKMARKS_WIDGET_KEY, WidgetBookmarks, WidgetBranding, WidgetCursorBar, WidgetEmbeddedInfoView, WidgetInfoView, WidgetNavCompass$$1 as WidgetNavCompass, VIEWER_VIEW_BAR_WIDGET_KEY, WidgetViewBar, WidgetControlViewBar, WidgetControlViewBarSearch, VIEWER_LEFT_PANEL_WIDGET_KEY, VIEWER_LEFT_PANEL_CSS_VAR_LEFT, WidgetLeftPanel, WidgetLeftPanelTab, WidgetLeftPanelTabBookmarks };
 //# sourceMappingURL=bruce-cesium.es5.js.map