bruce-cesium 6.2.1 → 6.2.3

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, 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';
+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';
 
 const TIME_LAG = 300;
 const POSITION_CHECK_TIMER = 950;
@@ -11544,41 +11544,172 @@ var VisualsRegister;
             return newStates;
         }
         /**
-         * Applies a set of new states to override the existing ones.
-         * This can be a costly operation as it will update all visuals.
+         * Calculates the difference between current states and new states.
+         * Returns what needs to be added, removed, and updated.
+         */
+        calculateStateDifference(newStates) {
+            const toAdd = [];
+            const toRemove = [];
+            const toUpdate = [];
+            const affectedEntityIds = new Set();
+            // State map for quick lookups.
+            const newStatesMap = new Map();
+            for (const state of newStates) {
+                if (!state.entityId || isBlankState(state)) {
+                    continue;
+                }
+                const key = `${state.entityId}::${state.menuItemId || NO_MENU_ITEM_KEY}`;
+                newStatesMap.set(key, state);
+            }
+            // Track existing states.
+            const existingKeys = new Set();
+            // Check existing states to see if they need removal or updating.
+            this.ForEachState((existingState) => {
+                const key = `${existingState.entityId}::${existingState.menuItemId || NO_MENU_ITEM_KEY}`;
+                existingKeys.add(key);
+                const newState = newStatesMap.get(key);
+                // State exists in current but not in new.
+                if (!newState) {
+                    toRemove.push({ ...existingState });
+                    affectedEntityIds.add(existingState.entityId);
+                }
+                // State exists in both.
+                // See if changed.
+                else {
+                    if (this.isStateDifferent(existingState, newState)) {
+                        toUpdate.push({ ...newState });
+                        affectedEntityIds.add(existingState.entityId);
+                    }
+                }
+            });
+            // Check for new states that don't exist currently.
+            for (const [key, newState] of newStatesMap) {
+                if (!existingKeys.has(key)) {
+                    toAdd.push({ ...newState });
+                    affectedEntityIds.add(newState.entityId);
+                }
+            }
+            return { toAdd, toRemove, toUpdate, affectedEntityIds };
+        }
+        /**
+         * Compares two states to determine if they're different.
+         * Only compares meaningful properties (not entityId/menuItemId).
+         */
+        isStateDifferent(state1, state2) {
+            const keys1 = Object.keys(state1).filter(k => k !== "entityId" && k !== "menuItemId");
+            const keys2 = Object.keys(state2).filter(k => k !== "entityId" && k !== "menuItemId");
+            // Different number of properties.
+            if (keys1.length !== keys2.length) {
+                return true;
+            }
+            // Check if any property values differ.
+            for (const key of keys1) {
+                if (state1[key] !== state2[key]) {
+                    return true;
+                }
+            }
+            return false;
+        }
+        /**
+         * Applies a set of new states to override the existing ones using differential updates.
+         * This is more efficient than clearing and re-applying all states.
          * @param states
          */
         OverrideStates(states) {
-            // Clear current states.
-            this.ClearOpacity();
-            this.ClearLabelled();
-            this.ClearSelected();
-            this.ClearHighlighted();
-            this.ClearIsolated();
-            this.ClearHidden();
-            this.states = {};
-            let newStates = {};
-            for (let i = 0; i < states.length; i++) {
-                const state = states[i];
-                if (!state.menuItemId && state.hasOwnProperty("menuItemId")) {
-                    delete state.menuItemId;
+            // Calculate what needs to change.
+            const diff = this.calculateStateDifference(states);
+            // If nothing changed, exit early.
+            if (diff.toAdd.length === 0 && diff.toRemove.length === 0 && diff.toUpdate.length === 0) {
+                return;
+            }
+            // Track which visual properties need refreshing per entity.
+            const refreshMap = new Map();
+            const updateRefreshForEntity = (entityId, props) => {
+                const existing = refreshMap.get(entityId) || {};
+                refreshMap.set(entityId, {
+                    highlighted: existing.highlighted || props.highlighted || false,
+                    selected: existing.selected || props.selected || false,
+                    opacity: existing.opacity || props.opacity || false
+                });
+            };
+            // Process removals.
+            for (const state of diff.toRemove) {
+                // Create a state with inverted/cleared values.
+                const clearState = {
+                    entityId: state.entityId,
+                    menuItemId: state.menuItemId
+                };
+                // For each property that exists, set it to null to clear it.
+                // This will cause setStateValues to delete the property.
+                if (state.highlighted != null) {
+                    clearState.highlighted = null;
+                    updateRefreshForEntity(state.entityId, {
+                        highlighted: true
+                    });
                 }
-                if (!state.entityId) {
-                    continue;
+                if (state.selected != null) {
+                    clearState.selected = null;
+                    updateRefreshForEntity(state.entityId, {
+                        selected: true
+                    });
                 }
-                if (isBlankState(state)) {
-                    continue;
+                if (state.opacity != null) {
+                    clearState.opacity = null;
+                    updateRefreshForEntity(state.entityId, {
+                        opacity: true
+                    });
                 }
-                if (!newStates[state.entityId]) {
-                    newStates[state.entityId] = {};
+                if (state.labelled != null) {
+                    clearState.labelled = null;
+                    updateRefreshForEntity(state.entityId, {});
                 }
-                newStates[state.entityId][state.menuItemId ? state.menuItemId : NO_MENU_ITEM_KEY] = {
-                    ...state
-                };
+                if (state.hidden != null) {
+                    clearState.hidden = null;
+                    updateRefreshForEntity(state.entityId, {});
+                }
+                if (state.isolated != null) {
+                    clearState.isolated = null;
+                    updateRefreshForEntity(state.entityId, {});
+                }
+                this.setStateValues(clearState);
+            }
+            // Process additions and updates.
+            const statesToSet = [...diff.toAdd, ...diff.toUpdate];
+            for (const state of statesToSet) {
+                // Determine what needs visual refresh based on what's changing.
+                if (state.hasOwnProperty("highlighted")) {
+                    updateRefreshForEntity(state.entityId, {
+                        highlighted: true
+                    });
+                }
+                if (state.hasOwnProperty("selected")) {
+                    updateRefreshForEntity(state.entityId, {
+                        selected: true
+                    });
+                }
+                if (state.hasOwnProperty("opacity")) {
+                    updateRefreshForEntity(state.entityId, {
+                        opacity: true
+                    });
+                }
+                if (state.hasOwnProperty("labelled")) {
+                    updateRefreshForEntity(state.entityId, {});
+                }
+                if (state.hasOwnProperty("hidden") || state.hasOwnProperty("isolated")) {
+                    updateRefreshForEntity(state.entityId, {});
+                }
+                this.setStateValues(state);
+            }
+            // Queue updates for all affected entities.
+            // TODO: if a massive list we should async batch this.
+            for (const entityId of diff.affectedEntityIds) {
+                const refresh = refreshMap.get(entityId);
+                this.queueUpdate({
+                    entityId: entityId,
+                    refresh: refresh || true
+                });
             }
-            this.states = newStates;
-            // Reflect the rest of the changes.
-            this.updateAllEntities();
+            this.viewer.scene.requestRender();
         }
         /**
          * Returns all states with the first detected Menu Item ID settings included.
@@ -12026,7 +12157,7 @@ var VisualsRegister;
         }
         SetIsolated(params) {
             var _a;
-            const { entityIds, isolated: isolate, requestRender, menuItemId, source } = params;
+            const { entityIds, isolated: isolate, requestRender, menuItemId, source, doUpdate } = params;
             for (let i = 0; i < entityIds.length; i++) {
                 const entityId = entityIds[i];
                 this.setStateValues({
@@ -12047,12 +12178,14 @@ var VisualsRegister;
                     (_a = this.onUpdate) === null || _a === void 0 ? void 0 : _a.Trigger(update);
                 }
             }
-            this.updateAllEntities({
-                requestRender: false,
-                refresh: isolate
-            });
-            if (requestRender != false) {
-                this.viewer.scene.requestRender();
+            if (doUpdate !== false) {
+                this.updateAllEntities({
+                    requestRender: false,
+                    refresh: isolate
+                });
+                if (requestRender != false) {
+                    this.viewer.scene.requestRender();
+                }
             }
         }
         GetIsIsolated(params) {
@@ -12088,7 +12221,7 @@ var VisualsRegister;
                 }
                 delete state.isolated;
             });
-            if (changed) {
+            if (changed && params.doUpdate !== false) {
                 this.updateAllEntities({
                     requestRender: params === null || params === void 0 ? void 0 : params.requestRender,
                     refresh: true
@@ -12142,7 +12275,7 @@ var VisualsRegister;
                 }
                 delete state.hidden;
             });
-            if (changed) {
+            if (changed && params.doUpdate !== false) {
                 this.updateAllEntities({
                     requestRender: params === null || params === void 0 ? void 0 : params.requestRender,
                     refresh: true
@@ -12536,16 +12669,27 @@ var VisualsRegister;
                 }
             }
         }
-        updateAllEntities(params) {
-            for (const entityId in this.rego) {
-                const regos = this.rego[entityId];
-                if (regos && regos.length) {
-                    this.queueUpdate({
-                        entityId: entityId,
-                        refresh: (params === null || params === void 0 ? void 0 : params.refresh) == null ? true : params.refresh
-                    });
+        async updateAllEntities(params) {
+            const ids = Object.keys(this.rego);
+            const interval = setInterval(() => {
+                const batch = ids.splice(0, 3000);
+                if (!batch.length || (params.isCancelled && params.isCancelled())) {
+                    clearInterval(interval);
+                    return;
                 }
-            }
+                for (const entityId of batch) {
+                    const regos = this.rego[entityId];
+                    if (regos && regos.length) {
+                        this.queueUpdate({
+                            entityId: entityId,
+                            refresh: (params === null || params === void 0 ? void 0 : params.refresh) == null ? true : params.refresh
+                        });
+                    }
+                }
+                if ((params === null || params === void 0 ? void 0 : params.requestRender) !== false) {
+                    this.viewer.scene.requestRender();
+                }
+            }, 10);
         }
         /**
          * Sets opacity for given set of entities.
@@ -20826,6 +20970,75 @@ var DataSourceStaticKmlManager;
     DataSourceStaticKmlManager.Manager = Manager;
 })(DataSourceStaticKmlManager || (DataSourceStaticKmlManager = {}));
 
+/**
+ * Render engine to handle LCC / XGrids data through the XGrids library.
+ */
+var XGridsRenderEngine;
+(function (XGridsRenderEngine) {
+    function Render(params) {
+        var _a, _b, _c;
+        const { api, viewer, tileset } = params;
+        if (!LCCRender) {
+            console.warn("[XGridsRenderEngine] Render() LCCRender library not available.");
+            return null;
+        }
+        const settings = tileset.settings;
+        let position = settings === null || settings === void 0 ? void 0 : settings.origin;
+        if (settings.dontTransform) {
+            position = null;
+        }
+        let m1 = undefined;
+        // Location matrix.
+        if ((position === null || position === void 0 ? void 0 : position.latitude) || (position === null || position === void 0 ? void 0 : position.longitude) || (position === null || position === void 0 ? void 0 : position.altitude)) {
+            m1 = Transforms.eastNorthUpToFixedFrame(Cartesian3.fromDegrees(EnsureNumber(position.longitude, 0), EnsureNumber(position.latitude, 0), EnsureNumber(position.altitude, 0)));
+        }
+        else {
+            m1 = Transforms.eastNorthUpToFixedFrame(Cartesian3.fromDegrees(0, 0, 0));
+        }
+        // Apply HPR + scale.
+        if (!settings.dontRotate && !settings.dontTransform) {
+            const translationMatrix = Matrix4.fromTranslation(new Cartesian3(0, 0, 0), new Matrix4());
+            const hpr = HeadingPitchRoll.fromDegrees(EnsureNumber((_a = settings.rotation) === null || _a === void 0 ? void 0 : _a.z), EnsureNumber((_b = settings.rotation) === null || _b === void 0 ? void 0 : _b.x), EnsureNumber((_c = settings.rotation) === null || _c === void 0 ? void 0 : _c.y), new HeadingPitchRoll());
+            const hprRotation = Matrix3.fromHeadingPitchRoll(hpr);
+            const scaleMatrix = Matrix4.fromUniformScale(EnsureNumber((position === null || position === void 0 ? void 0 : position.scale) || 1, 1), new Matrix4());
+            let combinedMatrix = Matrix4.multiply(m1, translationMatrix, new Matrix4());
+            combinedMatrix = Matrix4.multiply(combinedMatrix, Matrix4.fromRotation(hprRotation), new Matrix4());
+            combinedMatrix = Matrix4.multiply(combinedMatrix, scaleMatrix, new Matrix4());
+            m1 = combinedMatrix;
+        }
+        const loadUrl = Tileset.GetFileUrl({
+            file: tileset.rootFileName || "meta.lcc",
+            tilesetId: tileset.id,
+            viaCdn: true,
+            legacy: true,
+            cacheToken: tileset.generateVersion,
+            api: api
+        });
+        return window.LCCRender.load({
+            camera: viewer.camera,
+            scene: viewer.scene,
+            dataPath: loadUrl,
+            renderLib: Cesium,
+            canvas: viewer.canvas,
+            useEnv: false,
+            modelMatrix: m1,
+            useIndexDB: false,
+            appKey: null
+        });
+    }
+    XGridsRenderEngine.Render = Render;
+    function Remove(viewer, renderObject) {
+        if (!renderObject) {
+            return;
+        }
+        if (!LCCRender) {
+            console.warn("[XGridsRenderEngine] Remove() LCCRender library not available.");
+            return;
+        }
+    }
+    XGridsRenderEngine.Remove = Remove;
+})(XGridsRenderEngine || (XGridsRenderEngine = {}));
+
 async function getLegacyTileset(params) {
     const { apiGetter, menuItem, tileset } = params;
     try {
@@ -20860,6 +21073,12 @@ async function getTileset(params) {
 }
 var TilesetArbRenderManager;
 (function (TilesetArbRenderManager) {
+    let ERenderType;
+    (function (ERenderType) {
+        ERenderType["CesiumTileset"] = "CesiumTileset";
+        ERenderType["XGridsLCC"] = "XGridsLCC";
+        ERenderType["Unknown"] = "Unknown";
+    })(ERenderType = TilesetArbRenderManager.ERenderType || (TilesetArbRenderManager.ERenderType = {}));
     class Manager {
         get Disposed() {
             return this.disposed;
@@ -20870,6 +21089,12 @@ var TilesetArbRenderManager;
         get Styler() {
             return this.styler;
         }
+        get RenderType() {
+            return this.renderType;
+        }
+        get RenderTypeChanged() {
+            return this.renderTypeChanged;
+        }
         constructor(params) {
             this.disposed = false;
             this.cTileset = null;
@@ -20893,6 +21118,11 @@ var TilesetArbRenderManager;
             // Saves having to do a case-insensitive lookup every time.
             this.featurePropCache = new Map();
             this.featurePropsChecked = 0;
+            // How we're rendering the data.
+            this.renderType = ERenderType.Unknown;
+            this.renderTypeChanged = new BruceEvent();
+            // LCC object if we're using XGrids to render LCC data.
+            this.lccObject = null;
             this.viewer = params.viewer;
             this.getters = params.getters;
             this.visualsManager = params.register;
@@ -20938,7 +21168,7 @@ var TilesetArbRenderManager;
             }
             const tilesetId = (_c = this.item.tileset) === null || _c === void 0 ? void 0 : _c.TilesetID;
             (async () => {
-                var _a, _b, _c, _d, _e, _f, _g;
+                var _a, _b, _c, _d, _e, _f, _g, _h, _j;
                 if (tilesetId) {
                     let canAccess = false;
                     try {
@@ -20977,113 +21207,137 @@ var TilesetArbRenderManager;
                 if (tileset && loadUrlOverride) {
                     tileset.loadUrl = loadUrlOverride;
                 }
-                const LEGACY_TYPES = [
-                    Tileset.EType.LegacyEntitiesSet,
-                    Tileset.EType.LegacyExternal,
-                    Tileset.EType.LegacyStatic
-                ];
-                if (!type || LEGACY_TYPES.includes(type)) {
-                    // Legacy type. We re-request using ui.tileset endpoint.
-                    const legacyTileset = tileset ? await getLegacyTileset({
-                        apiGetter: this.getters.GetBruceGetter(),
-                        menuItem: this.item,
-                        tileset
-                    }) : null;
-                    if (this.disposed) {
-                        return;
-                    }
-                    let accountId = (_c = (_b = this.item) === null || _b === void 0 ? void 0 : _b.tileset) === null || _c === void 0 ? void 0 : _c.ClientAccountID;
-                    if (!accountId) {
-                        accountId = this.getters.GetAccountId();
-                    }
-                    this.cTileset = await TilesetRenderEngine.RenderLegacy({
-                        apiGetter: this.getters.GetBruceGetter(),
-                        tileset: legacyTileset,
-                        viewer: this.viewer,
-                        ionId: (_d = this.item.IonResource) === null || _d === void 0 ? void 0 : _d.AssetID,
-                        ionAccessToken: (_e = this.item.IonResource) === null || _e === void 0 ? void 0 : _e.AccessToken,
-                        loadUrl: loadUrlOverride,
-                        accountId: accountId,
-                        viaCdn: this.item.cdnEnabled == null ? true : Boolean(this.item.cdnEnabled),
-                        noMemoryLimit: this.item.noMaximumMemory,
-                        backFaceCulling: this.item.backFaceCulling
+                // LCC Tileset to load through XGrids libs if they're available.
+                if (tileset.type === Tileset.EType.LegacyStatic && tileset.rootFileName && (tileset.rootFileName.toLowerCase()).endsWith(".lcc")) {
+                    this.renderType = ERenderType.XGridsLCC;
+                    this.renderTypeChanged.Trigger(this.renderType);
+                    const api = this.getters.GetBruceApi({
+                        accountId: ((_c = (_b = this.item) === null || _b === void 0 ? void 0 : _b.tileset) === null || _c === void 0 ? void 0 : _c.ClientAccountID) || this.getters.GetAccountId()
                     });
-                }
-                else if (tileset) {
-                    this.cTileset = await TilesetRenderEngine.Render({
-                        apiGetter: this.getters.GetBruceGetter(),
-                        tileset: tileset,
+                    this.lccObject = XGridsRenderEngine.Render({
+                        api: api,
                         viewer: this.viewer,
-                        coords: null,
-                        accountId: (_g = (_f = this.item.tileset) === null || _f === void 0 ? void 0 : _f.ClientAccountID) !== null && _g !== void 0 ? _g : this.getters.GetAccountId(),
-                        viaCdn: this.item.cdnEnabled == null ? true : Boolean(this.item.cdnEnabled)
+                        tileset: tileset
                     });
-                }
-                if (this.disposed) {
-                    this.doDispose();
-                    return;
-                }
-                this.viewer.scene.requestRender();
-                TilesetRenderEngine.OnTilesetReady(this.cTileset).then(() => {
-                    if (this.disposed || this.viewer.isDestroyed()) {
+                    // Disposed while it was loading so we'll remove it now.
+                    if (this.Disposed && this.lccObject) {
+                        XGridsRenderEngine.Remove(this.viewer, this.lccObject);
+                        this.lccObject = null;
                         return;
                     }
-                    // Colour mask to apply to the Tileset as a whole.
-                    // Individual Entities can override this.
-                    // This is typically used for Tilesets without Entities to allow some sort of basic styling per-bookmark.
-                    try {
-                        const colorCss = this.item.colorMask;
-                        if (colorCss) {
-                            this.cTileset.style = new Cesium3DTileStyle({
-                                color: {
-                                    conditions: [
-                                        ["true", `color("${colorCss}")`]
-                                    ]
-                                }
-                            });
+                }
+                // Typical Cesium Tileset.
+                else {
+                    this.renderType = ERenderType.CesiumTileset;
+                    this.renderTypeChanged.Trigger(this.renderType);
+                    const LEGACY_TYPES = [
+                        Tileset.EType.LegacyEntitiesSet,
+                        Tileset.EType.LegacyExternal,
+                        Tileset.EType.LegacyStatic
+                    ];
+                    if (!type || LEGACY_TYPES.includes(type)) {
+                        // Legacy type. We re-request using ui.tileset endpoint.
+                        const legacyTileset = tileset ? await getLegacyTileset({
+                            apiGetter: this.getters.GetBruceGetter(),
+                            menuItem: this.item,
+                            tileset
+                        }) : null;
+                        if (this.disposed) {
+                            return;
                         }
-                    }
-                    catch (e) {
-                        console.error(e);
-                    }
-                    try {
-                        if (this.item.ApplyStyles ||
-                            this.item.Type == MenuItem.EType.IonTileset) {
-                            const api = this.getters.GetBruceApi();
-                            this.styler.Init({
-                                viewer: this.viewer,
-                                api: api,
-                                cTileset: this.cTileset,
-                                fallbackStyleId: this.item.styleId,
-                                styleMapping: this.item.StyleMapping,
-                                expandSources: false,
-                                menuItemId: this.item.id,
-                                register: this.visualsManager,
-                            });
+                        let accountId = (_e = (_d = this.item) === null || _d === void 0 ? void 0 : _d.tileset) === null || _e === void 0 ? void 0 : _e.ClientAccountID;
+                        if (!accountId) {
+                            accountId = this.getters.GetAccountId();
                         }
-                        this.onCTilesetLoad();
-                        this.viewer.scene.requestRender();
-                    }
-                    catch (e) {
-                        console.error(e);
-                    }
-                });
-                this.cTileset.tileLoad.addEventListener((tile) => {
-                    try {
-                        this.queueTile(tile, true);
-                    }
-                    catch (e) {
-                        console.error(e);
+                        this.cTileset = await TilesetRenderEngine.RenderLegacy({
+                            apiGetter: this.getters.GetBruceGetter(),
+                            tileset: legacyTileset,
+                            viewer: this.viewer,
+                            ionId: (_f = this.item.IonResource) === null || _f === void 0 ? void 0 : _f.AssetID,
+                            ionAccessToken: (_g = this.item.IonResource) === null || _g === void 0 ? void 0 : _g.AccessToken,
+                            loadUrl: loadUrlOverride,
+                            accountId: accountId,
+                            viaCdn: this.item.cdnEnabled == null ? true : Boolean(this.item.cdnEnabled),
+                            noMemoryLimit: this.item.noMaximumMemory,
+                            backFaceCulling: this.item.backFaceCulling
+                        });
                     }
-                });
-                this.cTileset.tileUnload.addEventListener((tile) => {
-                    try {
-                        this.queueTile(tile, false);
+                    else if (tileset) {
+                        this.cTileset = await TilesetRenderEngine.Render({
+                            apiGetter: this.getters.GetBruceGetter(),
+                            tileset: tileset,
+                            viewer: this.viewer,
+                            coords: null,
+                            accountId: (_j = (_h = this.item.tileset) === null || _h === void 0 ? void 0 : _h.ClientAccountID) !== null && _j !== void 0 ? _j : this.getters.GetAccountId(),
+                            viaCdn: this.item.cdnEnabled == null ? true : Boolean(this.item.cdnEnabled)
+                        });
                     }
-                    catch (e) {
-                        console.error(e);
+                    if (this.disposed) {
+                        this.doDispose();
+                        return;
                     }
-                });
+                    this.viewer.scene.requestRender();
+                    TilesetRenderEngine.OnTilesetReady(this.cTileset).then(() => {
+                        if (this.disposed || this.viewer.isDestroyed()) {
+                            return;
+                        }
+                        // Colour mask to apply to the Tileset as a whole.
+                        // Individual Entities can override this.
+                        // This is typically used for Tilesets without Entities to allow some sort of basic styling per-bookmark.
+                        try {
+                            const colorCss = this.item.colorMask;
+                            if (colorCss) {
+                                this.cTileset.style = new Cesium3DTileStyle({
+                                    color: {
+                                        conditions: [
+                                            ["true", `color("${colorCss}")`]
+                                        ]
+                                    }
+                                });
+                            }
+                        }
+                        catch (e) {
+                            console.error(e);
+                        }
+                        try {
+                            if (this.item.ApplyStyles ||
+                                this.item.Type == MenuItem.EType.IonTileset) {
+                                const api = this.getters.GetBruceApi();
+                                this.styler.Init({
+                                    viewer: this.viewer,
+                                    api: api,
+                                    cTileset: this.cTileset,
+                                    fallbackStyleId: this.item.styleId,
+                                    styleMapping: this.item.StyleMapping,
+                                    expandSources: false,
+                                    menuItemId: this.item.id,
+                                    register: this.visualsManager,
+                                });
+                            }
+                            this.onCTilesetLoad();
+                            this.viewer.scene.requestRender();
+                        }
+                        catch (e) {
+                            console.error(e);
+                        }
+                    });
+                    this.cTileset.tileLoad.addEventListener((tile) => {
+                        try {
+                            this.queueTile(tile, true);
+                        }
+                        catch (e) {
+                            console.error(e);
+                        }
+                    });
+                    this.cTileset.tileUnload.addEventListener((tile) => {
+                        try {
+                            this.queueTile(tile, false);
+                        }
+                        catch (e) {
+                            console.error(e);
+                        }
+                    });
+                }
             })();
         }
         /**
@@ -21227,6 +21481,10 @@ var TilesetArbRenderManager;
                 }
                 this.cTileset = null;
             }
+            if (this.lccObject) {
+                XGridsRenderEngine.Remove(this.viewer, this.lccObject);
+                this.lccObject = null;
+            }
             (_b = this.styler) === null || _b === void 0 ? void 0 : _b.Dispose();
             this.visualsManager.RemoveRegos({
                 menuItemId: this.item.id
@@ -34322,7 +34580,7 @@ class WidgetViewBar extends Widget.AWidget {
     }
 }
 
-const VERSION = "6.2.1";
+const VERSION = "6.2.3";
 
-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 };
+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, XGridsRenderEngine, 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