bruce-cesium 4.7.6 → 4.7.7

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
-import { BruceEvent, Cartes, Entity as Entity$1, Carto, Geometry, MathUtils, LRUCache, Api, Calculator, ClientFile, EntityTag, EntityType, ObjectUtils, Style, ProjectViewTile, DelayQueue, EntityLod, Bounds, ZoomControl, EntityRelationType, ENVIRONMENT, EntityHistoricData, Tileset, EntityCoords, DataLab, EntitySource, MenuItem, EntityRelation, ProgramKey, ProjectView, ProjectViewBookmark, Camera, ProjectViewLegacyTile, AbstractApi, EntityAttribute, EntityAttachment, EntityAttachmentType, Session } from 'bruce-models';
+import { BruceEvent, Cartes, Entity as Entity$1, Carto, Geometry, MathUtils, LRUCache, Api, Calculator, ClientFile, EntityTag, EntityType, ObjectUtils, Style, ProjectViewTile, DelayQueue, EntityLod, Bounds, ZoomControl, EntityRelationType, ENVIRONMENT, EntityHistoricData, Tileset, EntityCoords, DataLab, EntitySource, MenuItem, EntityRelation, ProgramKey, ProjectView, ProjectViewBookmark, Camera, ProjectViewLegacyTile, EntityAttribute, EntityAttachment, EntityAttachmentType, 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, ColorBlendMode, HeadingPitchRoll, Transforms, Model, PolygonHierarchy, PolylineGraphics, ColorMaterialProperty, Primitive, Cesium3DTileFeature, SceneMode, GeoJsonDataSource, Cesium3DTileColorBlendMode, HeadingPitchRange, Cesium3DTileStyle, Ion, KmlDataSource, SceneTransforms, OrthographicFrustum, EasingFunction, NearFarScalar, Cesium3DTileset, Matrix4, Matrix3, IonResource, EllipsoidGeodesic, EllipsoidTerrainProvider, sampleTerrainMostDetailed, defined, CesiumInspector, ClockRange, PolygonPipeline, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, BoundingSphere, GeometryInstance, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, Quaternion, 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, SceneMode, GeoJsonDataSource, Primitive, Cesium3DTileFeature, Cesium3DTileColorBlendMode, HeadingPitchRange, Cesium3DTileStyle, Ion, KmlDataSource, OrthographicFrustum, EasingFunction, NearFarScalar, SceneTransforms, EllipsoidTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, CesiumInspector, defined, ClockRange, EllipsoidGeodesic, sampleTerrainMostDetailed, Cesium3DTileset, PolygonPipeline, Matrix4, Matrix3, IonResource, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, BoundingSphere, GeometryInstance, Quaternion, ScreenSpaceEventHandler, ScreenSpaceEventType, CzmlDataSource, Intersect, Fullscreen } from 'cesium';
 
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation. All rights reserved.
@@ -11968,6 +11968,10 @@ var EntitiesRenderManager;
             // Highly experimental flag to try improve rendering large sets of polygons and polylines.
             // Many things are not supported when this is enabled.
             this.useGeojson = false;
+            // Zoom control to reference.
+            this.zoomControl = [];
+            // Scenario for retrieving Entities.
+            this.scenario = null;
             var viewer = params.viewer, apiGetter = params.apiGetter, monitor = params.monitor, item = params.item, visualsManager = params.register, sharedGetters = params.sharedGetters;
             this.viewer = viewer;
             this.sharedGetters = sharedGetters;
@@ -11989,15 +11993,16 @@ var EntitiesRenderManager;
         });
         Manager.prototype.Init = function (params) {
             var _this = this;
-            var _a, _b, _c, _d, _e, _f;
+            var _a, _b, _c, _d, _e, _f, _g;
             if (this.disposed) {
                 throw (new Error("This item is disposed."));
             }
             if (params === null || params === void 0 ? void 0 : params.item) {
                 this.item = params.item;
             }
-            if (!((_a = this.item.CameraZoomSettings) === null || _a === void 0 ? void 0 : _a.length)) {
-                this.item.CameraZoomSettings = [
+            this.zoomControl = this.item.CameraZoomSettings;
+            if (!((_a = this.zoomControl) === null || _a === void 0 ? void 0 : _a.length)) {
+                this.zoomControl = [
                     {
                         MinZoom: 0,
                         MaxZoom: 200000,
@@ -12008,10 +12013,11 @@ var EntitiesRenderManager;
                     }
                 ];
             }
-            if (this.useGeojson && this.item.CameraZoomSettings.length > 1) {
+            if (this.useGeojson && this.zoomControl.length > 1) {
                 console.warn("Geojson rendering does not support multiple zoom controls. Only the first one will be used.");
-                this.item.CameraZoomSettings = [this.item.CameraZoomSettings[0]];
+                this.zoomControl = [this.zoomControl[0]];
             }
+            this.scenario = (_b = this.item.BruceEntity) === null || _b === void 0 ? void 0 : _b["Scenario.ID"];
             var isTagItem = Boolean(this.item.BruceEntity.ExpandLayers);
             var tagsToRender = isTagItem ? this.item.BruceEntity.SelectedExpandLayers : null;
             if (!tagsToRender) {
@@ -12020,9 +12026,9 @@ var EntitiesRenderManager;
             tagsToRender = [].concat(tagsToRender);
             var shouldRender = !isTagItem || tagsToRender.length > 0;
             this.unsetGetter();
-            (_b = this.viewMonitorRemoval) === null || _b === void 0 ? void 0 : _b.call(this);
+            (_c = this.viewMonitorRemoval) === null || _c === void 0 ? void 0 : _c.call(this);
             this.viewMonitorRemoval = null;
-            (_c = this.entityCheckQueue) === null || _c === void 0 ? void 0 : _c.Dispose();
+            (_d = this.entityCheckQueue) === null || _d === void 0 ? void 0 : _d.Dispose();
             this.entityCheckQueue = null;
             clearInterval(this.renderQueueInterval);
             this.renderQueueInterval = null;
@@ -12034,27 +12040,26 @@ var EntitiesRenderManager;
                     menuItemId: this.item.id,
                     retainTagIds: tagsToRender
                 });
-                (_d = this.clustering) === null || _d === void 0 ? void 0 : _d.Dispose();
+                (_e = this.clustering) === null || _e === void 0 ? void 0 : _e.Dispose();
             }
             else {
                 this.visualsManager.RemoveRegos({
                     menuItemId: this.item.id
                 });
-                (_e = this.clustering) === null || _e === void 0 ? void 0 : _e.Dispose();
+                (_f = this.clustering) === null || _f === void 0 ? void 0 : _f.Dispose();
                 return;
             }
             if (this.item.enableClustering) {
-                this.clustering = new PointClustering(this.visualsManager, this.item.id, (_f = this.item) === null || _f === void 0 ? void 0 : _f.clustering);
+                this.clustering = new PointClustering(this.visualsManager, this.item.id, (_g = this.item) === null || _g === void 0 ? void 0 : _g.clustering);
             }
             this.setGetter();
             this.viewMonitorRemoval = this.monitor.Updated().Subscribe(function () {
                 _this.entityCheckQueue.Call();
             });
             this.entityCheckQueue = new DelayQueue(function () {
-                var _a;
                 // Don't bother checking for zoom control changes if we only have 1 item.
                 // We'll let Cesium handle hide/show at max zoom range. 
-                var shouldCheck = ((_a = _this.item) === null || _a === void 0 ? void 0 : _a.CameraZoomSettings) && _this.item.CameraZoomSettings.length > 1;
+                var shouldCheck = _this.zoomControl && _this.zoomControl.length > 1;
                 if (shouldCheck) {
                     _this.doEntityCheck(Object.keys(_this.renderedEntities));
                 }
@@ -12084,10 +12089,11 @@ var EntitiesRenderManager;
                 cdn: this.item.cdnEnabled,
                 historicAttrKey: this.item.BruceEntity.historicAttrKey,
                 historicInterpolation: this.item.historicInterpolation,
-                schemaId: (_b = this.item.BruceEntity) === null || _b === void 0 ? void 0 : _b.schemaId
+                schemaId: (_b = this.item.BruceEntity) === null || _b === void 0 ? void 0 : _b.schemaId,
+                scenario: this.scenario
             });
             var minMax = RenderManager.GetZoomMinMax({
-                zoomControl: this.item.CameraZoomSettings
+                zoomControl: this.zoomControl
             });
             this.getter.IncludeMenuItem(this.item.id, (tagsToRender === null || tagsToRender === void 0 ? void 0 : tagsToRender.length) ? tagsToRender : [], minMax[0], minMax[1]);
             this.getterSub = this.getter.OnUpdate.Subscribe(function (entities) {
@@ -12197,16 +12203,24 @@ var EntitiesRenderManager;
             });
         };
         Manager.prototype.UpdateSettings = function (params) {
-            var CameraZoomSettings = params.zoomControl, queueRerender = params.queueRerender;
+            var CameraZoomSettings = params.zoomControl, queueRerender = params.queueRerender, scenario = params.scenario;
             if (this.disposed) {
                 return;
             }
+            var changed = false;
             if (CameraZoomSettings === null || CameraZoomSettings === void 0 ? void 0 : CameraZoomSettings.length) {
-                this.item.CameraZoomSettings = CameraZoomSettings;
-                if (this.renderAsGeojson && this.item.CameraZoomSettings.length > 1) {
+                this.zoomControl = CameraZoomSettings;
+                if (this.renderAsGeojson && this.zoomControl.length > 1) {
                     console.warn("Geojson rendering does not support multiple zoom controls. Only the first one will be used.");
-                    this.item.CameraZoomSettings = [this.item.CameraZoomSettings[0]];
+                    this.zoomControl = [this.zoomControl[0]];
                 }
+                changed = true;
+            }
+            if (scenario != null) {
+                this.scenario = scenario;
+                changed = true;
+            }
+            if (changed) {
                 this.setGetter();
             }
             if (queueRerender != false) {
@@ -12319,7 +12333,7 @@ var EntitiesRenderManager;
                                 entities = entities.filter(function (x) { var _a; return ((_a = x.Bruce) === null || _a === void 0 ? void 0 : _a["EntityType.ID"]) == typeId_1; });
                             }
                             if (!this.useGeojson) return [3 /*break*/, 5];
-                            zoomItem = this.item.CameraZoomSettings[0];
+                            zoomItem = this.zoomControl[0];
                             if (!(zoomItem.DisplayType == ZoomControl.EDisplayType.Point)) return [3 /*break*/, 2];
                             // We'll just render these as individuals since we don't support point geojson.
                             return [4 /*yield*/, this.renderAsIndividuals(entities, force)];
@@ -12369,7 +12383,7 @@ var EntitiesRenderManager;
                                 var _a;
                                 _this.renderedEntities[(_a = entity.Bruce) === null || _a === void 0 ? void 0 : _a.ID] = true;
                             });
-                            zoomItem = this.item.CameraZoomSettings[0];
+                            zoomItem = this.zoomControl[0];
                             if (!(zoomItem.DisplayType == ZoomControl.EDisplayType.Model3D && entities.length)) return [3 /*break*/, 2];
                             return [4 /*yield*/, EntityLod.GetLods({
                                     api: this.apiGetter.getApi(),
@@ -12767,7 +12781,7 @@ var EntitiesRenderManager;
                                     entities: entities,
                                     menuItemId: this.item.id,
                                     visualRegister: this.visualsManager,
-                                    zoomControl: this.item.CameraZoomSettings,
+                                    zoomControl: this.zoomControl,
                                     entitiesHistoric: entitiesHistoric,
                                     entityHistoricDrawTrack: this.item.historicDrawTrack,
                                     force: force,
@@ -15085,9 +15099,10 @@ var TilesetRenderEngine;
     }
     TilesetRenderEngine.RenderLegacy = RenderLegacy;
     var Styler = /** @class */ (function () {
-        function Styler(viewer, api, cTileset, fallbackStyleId, styleMapping, expandSources, menuItemId, register) {
-            var _a;
+        function Styler() {
             this.disposed = false;
+            // Indicates if the styler has been loaded/initialized and is ready to style.
+            this.loaded = false;
             this.styleMappingLoaded = false;
             this.styleMappingsLoaded = {};
             this.fallbackStyle = null;
@@ -15096,6 +15111,7 @@ var TilesetRenderEngine;
             // Dictionary of Entity ID -> boolean to indicate which Entities have been styled.
             // This is used to determine if the Style colour needs to be overriden or not.
             this.styledEntityIds = {};
+            this.scenario = 0;
             this.runningQueues = 0;
             this.recordLoadQueue = [];
             this.recordCheckQueue = [];
@@ -15104,30 +15120,6 @@ var TilesetRenderEngine;
             this._styleProgress = 0;
             // Event for when the style progress changes.
             this.OnStyleProgress = new BruceEvent();
-            this.viewer = viewer;
-            this.api = api;
-            this.cTileset = cTileset;
-            this.expandSources = expandSources;
-            this.fallbackStyleId = fallbackStyleId;
-            this.styleMapping = styleMapping;
-            if (styleMapping) {
-                // Dereference.
-                styleMapping = JSON.parse(JSON.stringify(styleMapping));
-            }
-            // ND-1641. BOOKMARKS - (DEMO) View does not match bookmark.
-            // We have some evil hard-coded style mappings that need to be fixed.
-            // These exist within legacy project views.
-            // Update: This now also lets people have a style mapping without a real style record.
-            if ((_a = this.styleMapping) === null || _a === void 0 ? void 0 : _a.length) {
-                for (var i = 0; i < this.styleMapping.length; i++) {
-                    var mapItem = this.styleMapping[i];
-                    var mapStyle = mapItem.style ? mapItem.style : mapItem.Style;
-                    this.styleMapping[i].style = correctStyle(mapStyle);
-                }
-            }
-            this.register = register;
-            this.menuItemId = menuItemId;
-            this.loadStyles();
         }
         Object.defineProperty(Styler.prototype, "Disposed", {
             get: function () {
@@ -15136,6 +15128,13 @@ var TilesetRenderEngine;
             enumerable: false,
             configurable: true
         });
+        Object.defineProperty(Styler.prototype, "Loaded", {
+            get: function () {
+                return this.loaded;
+            },
+            enumerable: false,
+            configurable: true
+        });
         Object.defineProperty(Styler.prototype, "StyleProgress", {
             get: function () {
                 return this._styleProgress;
@@ -15143,6 +15142,44 @@ var TilesetRenderEngine;
             enumerable: false,
             configurable: true
         });
+        Styler.prototype.Init = function (params) {
+            var _a;
+            var viewer = params.viewer, api = params.api, cTileset = params.cTileset, fallbackStyleId = params.fallbackStyleId, styleMapping = params.styleMapping, expandSources = params.expandSources, menuItemId = params.menuItemId, register = params.register, scenario = params.scenario;
+            this.viewer = viewer;
+            this.api = api;
+            this.cTileset = cTileset;
+            this.register = register;
+            this.menuItemId = menuItemId;
+            if (expandSources != null) {
+                this.expandSources = expandSources;
+            }
+            if (fallbackStyleId != null) {
+                this.fallbackStyleId = fallbackStyleId;
+            }
+            if (this.styleMapping) {
+                this.styleMapping = styleMapping;
+                if (this.styleMapping) {
+                    // Dereference.
+                    this.styleMapping = JSON.parse(JSON.stringify(this.styleMapping));
+                }
+                // ND-1641. BOOKMARKS - (DEMO) View does not match bookmark.
+                // We have some evil hard-coded style mappings that need to be fixed.
+                // These exist within legacy project views.
+                // Update: This now also lets people have a style mapping without a real style record.
+                if ((_a = this.styleMapping) === null || _a === void 0 ? void 0 : _a.length) {
+                    for (var i = 0; i < this.styleMapping.length; i++) {
+                        var mapItem = this.styleMapping[i];
+                        var mapStyle = mapItem.style ? mapItem.style : mapItem.Style;
+                        this.styleMapping[i].style = correctStyle(mapStyle);
+                    }
+                }
+            }
+            if (scenario != null) {
+                this.scenario = scenario;
+            }
+            this.loadStyles();
+            this.loaded = true;
+        };
         /**
          * Updates style mapping and fallback style.
          * This will trigger a re-style of all entities, and will stop existing style loads.
@@ -15178,22 +15215,30 @@ var TilesetRenderEngine;
             if (params.expandSources != null) {
                 this.expandSources = params.expandSources;
             }
-            // Empty queues.
-            // Requeue all.
-            this.recordLoadQueue = [];
-            this.recordCheckQueue = [];
-            var regos = this.register.GetRegos({
-                menuItemId: this.menuItemId
-            });
-            // Reset progress.
-            this.updateStyleProgress();
-            this.styleMappingLoaded = false;
-            this.styleMappingsLoaded = {};
-            this.QueueEntities(regos);
-            this.loadStyles();
+            if (params.scenario != null) {
+                this.scenario = params.scenario;
+            }
+            if (this.loaded) {
+                // Empty queues.
+                // Requeue all.
+                this.recordLoadQueue = [];
+                this.recordCheckQueue = [];
+                var regos = this.register.GetRegos({
+                    menuItemId: this.menuItemId
+                });
+                // Reset progress.
+                this.updateStyleProgress();
+                this.styleMappingLoaded = false;
+                this.styleMappingsLoaded = {};
+                this.QueueEntities(regos);
+                this.loadStyles();
+            }
         };
         Styler.prototype.QueueEntities = function (entities, highPriority) {
             if (highPriority === void 0) { highPriority = false; }
+            if (!this.loaded) {
+                return;
+            }
             // We set a default colour right away to avoid race conditions at later times.
             for (var i = 0; i < entities.length; i++) {
                 var entity = entities[i];
@@ -15240,7 +15285,8 @@ var TilesetRenderEngine;
                                     api: this.api,
                                     entityIds: batch,
                                     migrated: true,
-                                    expandSources: this.expandSources
+                                    expandSources: this.expandSources,
+                                    scenario: this.scenario
                                 })];
                         case 2:
                             entities = (_c.sent()).entities;
@@ -15489,8 +15535,10 @@ var TilesetRenderEngine;
                             _c.label = 19;
                         case 19:
                             this.styleMappingsLoaded[styleMap.EntityTypeID] = true;
-                            this.processTilesetFeatureCheckQueue();
-                            this.processQueue();
+                            if (this.loaded) {
+                                this.processTilesetFeatureCheckQueue();
+                                this.processQueue();
+                            }
                             _c.label = 20;
                         case 20:
                             i++;
@@ -15500,7 +15548,7 @@ var TilesetRenderEngine;
                                 return [2 /*return*/];
                             }
                             this.styleMappingLoaded = true;
-                            if (!!this.disposed) return [3 /*break*/, 23];
+                            if (!(!this.disposed && this.loaded)) return [3 /*break*/, 23];
                             return [4 /*yield*/, this.processTilesetFeatureCheckQueue()];
                         case 22:
                             _c.sent();
@@ -15778,7 +15826,7 @@ var TilesetCadRenderManager;
         function Manager(params) {
             this.disposed = false;
             this.cTileset = null;
-            this.styler = null;
+            this.styler = new TilesetRenderEngine.Styler();
             // Indicates the hierarchy depth limit has been hit.
             // This likely means poor data so we have to disable drilling otherwise lag would be too bad.
             // The result is no entity type IDs are known so most styles fail.
@@ -15864,13 +15912,23 @@ var TilesetCadRenderManager;
                             }
                             this.viewer.scene.requestRender();
                             TilesetRenderEngine.OnTilesetReady(this.cTileset).then(function () {
-                                var _a;
+                                var _a, _b;
                                 try {
                                     if (_this.disposed || cTileset.isDestroyed()) {
                                         return;
                                     }
                                     _this.onCTilesetLoad();
-                                    _this.styler = new TilesetRenderEngine.Styler(_this.viewer, api, _this.cTileset, _this.item.styleId, _this.item.StyleMapping, (_a = _this.item.BruceEntity) === null || _a === void 0 ? void 0 : _a.ExpandSources, _this.item.id, _this.visualsManager);
+                                    _this.styler.Init({
+                                        viewer: _this.viewer,
+                                        api: api,
+                                        cTileset: _this.cTileset,
+                                        fallbackStyleId: _this.item.styleId,
+                                        styleMapping: _this.item.StyleMapping,
+                                        expandSources: (_a = _this.item.BruceEntity) === null || _a === void 0 ? void 0 : _a.ExpandSources,
+                                        menuItemId: _this.item.id,
+                                        register: _this.visualsManager,
+                                        scenario: (_b = _this.item.BruceEntity) === null || _b === void 0 ? void 0 : _b["Scenario.ID"]
+                                    });
                                     _this.viewer.scene.requestRender();
                                 }
                                 catch (e) {
@@ -16532,12 +16590,13 @@ var EntityFilterGetter;
             this.maxHeight = 100000;
             this.viewRect = null;
             this.viewCenter = null;
+            this.scenario = 0;
             this.historicRefreshAbortController = null;
             // Entity IDs found for the latest integrity.
             // We use this for refreshing historic data without having to repeat geographic queries.
             this.gatheredIntegrity = null;
             this.gatheredEntityIds = [];
-            var api = params.api, viewer = params.viewer, viewPort = params.viewPort, typeId = params.typeId, schemaId = params.schemaId, batchSize = params.batchSize, attrFilter = params.attrFilter, historicAttrKey = params.historicAttrKey, historicInterpolation = params.historicInterpolation, viaCdn = params.viaCdn;
+            var api = params.api, viewer = params.viewer, viewPort = params.viewPort, typeId = params.typeId, schemaId = params.schemaId, batchSize = params.batchSize, attrFilter = params.attrFilter, historicAttrKey = params.historicAttrKey, historicInterpolation = params.historicInterpolation, viaCdn = params.viaCdn, scenario = params.scenario;
             this.api = api;
             this.typeId = typeId;
             this.schemaId = schemaId;
@@ -16548,6 +16607,7 @@ var EntityFilterGetter;
             this.viewPort = viewPort;
             this.attrFilter = attrFilter;
             this.viewer = viewer;
+            this.scenario = scenario ? scenario : 0;
             this.updateBounds();
         }
         Object.defineProperty(Getter.prototype, "OnUpdate", {
@@ -16590,6 +16650,9 @@ var EntityFilterGetter;
             if (this.historicAttrKey) {
                 integrity += this.historicAttrKey;
             }
+            if (this.scenario) {
+                integrity += this.scenario;
+            }
             return integrity;
         };
         Getter.prototype.viewAreaSub = function () {
@@ -16868,6 +16931,7 @@ var EntityFilterGetter;
                                                                 }
                                                                 return [4 /*yield*/, Entity$1.GetList({
                                                                         api: this.api,
+                                                                        scenario: this.scenario,
                                                                         historicKey: this.historicAttrKey,
                                                                         historicPoint: this.historicAttrDateTime,
                                                                         schemaId: this.schemaId,
@@ -17052,6 +17116,7 @@ var EntityFilterGetter;
                                                                 }
                                                                 return [4 /*yield*/, Entity$1.GetList({
                                                                         api: this.api,
+                                                                        scenario: this.scenario,
                                                                         historicKey: this.historicAttrKey,
                                                                         historicPoint: historicAttrDateTime,
                                                                         schemaId: this.schemaId,
@@ -17149,6 +17214,7 @@ function createFilterGetterCacheKey(params) {
     cacheKey += params.schemaId ? params.schemaId : "";
     cacheKey += JSON.stringify(params.tagIds ? params.tagIds : []);
     cacheKey += params.historicAttrKey ? params.historicAttrKey : "";
+    cacheKey += params.scenario ? params.scenario : 0;
     if (params.historicAttrKey) {
         cacheKey += params.historicInterpolation ? "true" : "false";
     }
@@ -17777,7 +17843,7 @@ var TilesetEntitiesRenderManager;
             this.initCounter = 0;
             this.disposed = false;
             this.cTileset = null;
-            this.styler = null;
+            this.styler = new TilesetRenderEngine.Styler();
             var viewer = params.viewer, visualsManager = params.register, apiGetter = params.getters, item = params.item;
             this.viewer = viewer;
             this.getters = apiGetter;
@@ -17906,7 +17972,16 @@ var TilesetEntitiesRenderManager;
                                     }
                                     if (_this.item.ApplyStyles) {
                                         var api_1 = _this.getters.GetBruceApi();
-                                        _this.styler = new TilesetRenderEngine.Styler(_this.viewer, api_1, _this.cTileset, +_this.item.styleId, [], false, _this.item.id, _this.visualsManager);
+                                        _this.styler.Init({
+                                            viewer: _this.viewer,
+                                            api: api_1,
+                                            cTileset: _this.cTileset,
+                                            fallbackStyleId: +_this.item.styleId,
+                                            styleMapping: [],
+                                            expandSources: false,
+                                            menuItemId: _this.item.id,
+                                            register: _this.visualsManager
+                                        });
                                     }
                                     _this.onCTilesetLoad();
                                     _this.viewer.scene.requestRender();
@@ -18370,7 +18445,7 @@ var TilesetArbRenderManager;
         function Manager(params) {
             this.disposed = false;
             this.cTileset = null;
-            this.styler = null;
+            this.styler = new TilesetRenderEngine.Styler();
             this.tilesetType = null;
             this.viewer = params.viewer;
             this.getters = params.getters;
@@ -18553,6 +18628,9 @@ var TilesetArbRenderManager;
                             }
                             this.viewer.scene.requestRender();
                             TilesetRenderEngine.OnTilesetReady(this.cTileset).then(function () {
+                                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.
@@ -18575,7 +18653,16 @@ var TilesetArbRenderManager;
                                     if (_this.item.ApplyStyles ||
                                         _this.item.Type == MenuItem.EType.IonTileset) {
                                         var api = _this.getters.GetBruceApi();
-                                        _this.styler = new TilesetRenderEngine.Styler(_this.viewer, api, _this.cTileset, _this.item.styleId, _this.item.StyleMapping, false, _this.item.id, _this.visualsManager);
+                                        _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();
@@ -18585,6 +18672,9 @@ var TilesetArbRenderManager;
                                 }
                             });
                             this.cTileset.tileLoad.addEventListener(function (tile) {
+                                if (_this.disposed || _this.viewer.isDestroyed()) {
+                                    return;
+                                }
                                 try {
                                     _this.mapCTile(tile);
                                 }
@@ -28536,7 +28626,7 @@ var WidgetViewBar = /** @class */ (function (_super) {
     return WidgetViewBar;
 }(Widget.AWidget));
 
-var VERSION = "4.7.6";
+var VERSION = "4.7.7";
 
 export { VERSION, CesiumViewMonitor, ViewerUtils, ViewerEventTracker, MenuItemManager, EntityRenderEngine, EntityRenderEnginePoint, EntityRenderEnginePolyline, EntityRenderEnginePolygon, EntityRenderEngineModel3d, MenuItemCreator, VisualsRegister, RenderManager, EntitiesIdsRenderManager, DataLabRenderManager, EntitiesLoadedRenderManager, EntitiesRenderManager, EntityRenderManager, TilesetCadRenderManager, TilesetArbRenderManager, TilesetEntitiesRenderManager, TilesetOsmRenderManager, TilesetPointcloudRenderManager, TilesetGooglePhotosRenderManager, DataSourceStaticKmlManager, GoogleSearchRenderManager, RelationsRenderManager, SharedGetters, CesiumParabola, EntityLabel, ViewRenderEngine, TileRenderEngine, TilesetRenderEngine, CESIUM_INSPECTOR_KEY, CESIUM_TIMELINE_KEY, ViewUtils, DrawingUtils, MeasureUtils, EntityUtils, CesiumEntityStyler, CesiumAnimatedProperty, CesiumAnimatedInOut, Draw3dPolygon, Draw3dPolyline, MeasureCreator, 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