bruce-cesium 3.5.6 → 3.5.8

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
 import { BruceEvent, Cartes, Carto, Entity as Entity$1, Geometry, Tileset, MathUtils, LRUCache, ProjectViewTile, DelayQueue, ZoomControl, Style, EntityTag, Calculator, EntityLod, EntityType, ClientFile, ObjectUtils, Bounds, Api, EntityRelationType, ENVIRONMENT, EntityCoords, EntitySource, MenuItem, EntityRelation, ProgramKey, AbstractApi, ProjectViewBookmark, EntityAttachment, EntityAttachmentType, EntityAttribute, ProjectView, ProjectViewLegacyTile, Camera } from 'bruce-models';
 import * as Cesium from 'cesium';
-import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, DistanceDisplayCondition, NearFarScalar, Model, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, SceneMode, GeoJsonDataSource, ColorMaterialProperty, Cesium3DTileColorBlendMode, HeadingPitchRange, Ion, Cesium3DTileStyle, KmlDataSource, SceneTransforms, EllipsoidTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, OrthographicFrustum, EasingFunction, Cesium3DTileset, Matrix4, Matrix3, IonResource, CesiumInspector, defined, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, BoundingSphere, GeometryInstance, ScreenSpaceEventHandler, ScreenSpaceEventType, Intersect } from 'cesium';
+import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, SceneMode, GeoJsonDataSource, ColorMaterialProperty, DistanceDisplayCondition, NearFarScalar, Model, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Cesium3DTileColorBlendMode, HeadingPitchRange, Primitive, Cesium3DTileFeature, Cesium3DTileStyle, Ion, KmlDataSource, SceneTransforms, EllipsoidTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, Cesium3DTileset, OrthographicFrustum, EasingFunction, Matrix4, Matrix3, IonResource, PolygonPipeline, BoundingSphere, GeometryInstance, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, ScreenSpaceEventHandler, ScreenSpaceEventType, CesiumInspector, Intersect } from 'cesium';
 
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1211,7 +1211,7 @@ var CesiumEntityStyler;
      * @returns
      */
     function SetDefaultColor(params) {
-        var viewer = params.viewer, entity = params.entity, requestRender = params.requestRender;
+        var viewer = params.viewer, entity = params.entity, requestRender = params.requestRender, override = params.override;
         if (!entity) {
             return;
         }
@@ -1223,6 +1223,13 @@ var CesiumEntityStyler;
             if (!isAlive(viewer, part)) {
                 continue;
             }
+            // If we're not overriding then we check to ensure a colour is not already set.
+            if (override == false) {
+                var stored = part[getStoreKey("default")];
+                if (stored) {
+                    continue;
+                }
+            }
             if (part instanceof Cesium3DTileFeature) {
                 var opacity = getAppliedOpacity(part);
                 storeColor(viewer, "default", params.color, part);
@@ -11681,11 +11688,12 @@ var TilesetRenderEngine;
             }
         };
         Styler.prototype.processQueue = function () {
+            var _a, _b;
             return __awaiter(this, void 0, void 0, function () {
-                var MAX_BATCHES, BATCH_DELAY, batch, rerun, entities, _loop_1, this_1, i;
+                var MAX_BATCHES, BATCH_DELAY, batch, rerun, entities, tagIds, i, entity, eTagIds, j, tags, _loop_1, this_1, i;
                 var _this = this;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
+                return __generator(this, function (_c) {
+                    switch (_c.label) {
                         case 0:
                             MAX_BATCHES = 2;
                             BATCH_DELAY = 200;
@@ -11698,23 +11706,47 @@ var TilesetRenderEngine;
                             this.runningQueues += 1;
                             batch = [];
                             rerun = false;
-                            _a.label = 1;
+                            _c.label = 1;
                         case 1:
-                            _a.trys.push([1, , 4, 5]);
+                            _c.trys.push([1, , 6, 7]);
                             batch = this.getEntityIdsForQueue();
-                            if (!(batch.length > 0)) return [3 /*break*/, 3];
+                            if (!(batch.length > 0)) return [3 /*break*/, 5];
                             return [4 /*yield*/, Entity$1.GetListByIds({
                                     api: this.api,
                                     entityIds: batch
                                 })];
                         case 2:
-                            entities = (_a.sent()).entities;
+                            entities = (_c.sent()).entities;
+                            tagIds = [];
+                            for (i = 0; i < entities.length; i++) {
+                                entity = entities[i];
+                                if ((_b = (_a = entity === null || entity === void 0 ? void 0 : entity.Bruce) === null || _a === void 0 ? void 0 : _a["Layer.ID"]) === null || _b === void 0 ? void 0 : _b.length) {
+                                    eTagIds = entity.Bruce["Layer.ID"];
+                                    for (j = 0; j < eTagIds.length; j++) {
+                                        tagIds.push(eTagIds[j]);
+                                    }
+                                }
+                            }
+                            // Turn into unique list.
+                            if (tagIds.length) {
+                                tagIds = tagIds.filter(function (v, i, a) { return a.indexOf(v) === i; });
+                            }
+                            tags = [];
+                            if (!tagIds.length) return [3 /*break*/, 4];
+                            return [4 /*yield*/, EntityTag.GetListByIds({
+                                    tagIds: tagIds,
+                                    api: this.api
+                                })];
+                        case 3:
+                            tags = (_c.sent()).tags;
+                            _c.label = 4;
+                        case 4:
                             _loop_1 = function (i) {
                                 var entityId = batch[i];
                                 var record = entities.find(function (e) { var _a; return ((_a = e.Bruce) === null || _a === void 0 ? void 0 : _a.ID) == entityId; });
                                 var feature = this_1.getEntityRego(entityId);
                                 if (feature) {
-                                    this_1.styleTilesetFeatureFullData(feature, record);
+                                    this_1.styleTilesetFeatureFullData(feature, record, tags);
                                 }
                             };
                             this_1 = this;
@@ -11723,9 +11755,9 @@ var TilesetRenderEngine;
                             }
                             rerun = batch.length > 0;
                             this.viewer.scene.requestRender();
-                            _a.label = 3;
-                        case 3: return [3 /*break*/, 5];
-                        case 4:
+                            _c.label = 5;
+                        case 5: return [3 /*break*/, 7];
+                        case 6:
                             setTimeout(function () {
                                 _this.runningQueues -= 1;
                                 if (rerun || _this.recordLoadQueue.length > 0) {
@@ -11733,7 +11765,7 @@ var TilesetRenderEngine;
                                 }
                             }, BATCH_DELAY);
                             return [7 /*endfinally*/];
-                        case 5:
+                        case 7:
                             this.viewer.scene.requestRender();
                             return [2 /*return*/];
                     }
@@ -12004,16 +12036,16 @@ var TilesetRenderEngine;
             }
         };
         Styler.prototype.styleTilesetFeature = function (entity) {
-            this.styleTilesetFeatureFullData(entity, null);
+            this.styleTilesetFeatureFullData(entity, null, []);
         };
-        Styler.prototype.styleTilesetFeatureFullData = function (entity, data) {
+        Styler.prototype.styleTilesetFeatureFullData = function (entity, data, tags) {
             var _a;
             var visual = entity.visual;
             if (!visual || !(visual instanceof Cesium3DTileFeature)) {
                 return;
             }
             var style = this.getTilesetFeatureStyle(entity.entityId, entity.entityTypeId);
-            var bColor = style && ((_a = style.modelStyle) === null || _a === void 0 ? void 0 : _a.fillColor) ? Calculator.GetColor(style.modelStyle.fillColor, data, []) : null;
+            var bColor = style && ((_a = style.modelStyle) === null || _a === void 0 ? void 0 : _a.fillColor) ? Calculator.GetColor(style.modelStyle.fillColor, data, tags) : null;
             var cColor = null;
             if (bColor == null) {
                 cColor = Color.WHITE;
@@ -12024,7 +12056,8 @@ var TilesetRenderEngine;
             CesiumEntityStyler.SetDefaultColor({
                 color: cColor,
                 entity: visual,
-                viewer: this.viewer
+                viewer: this.viewer,
+                override: false
             });
         };
         Styler.prototype.getTilesetFeatureStyle = function (entityId, entityTypeId) {
@@ -19404,9 +19437,6 @@ var MenuItemCreator;
                         _d.label = 6;
                     case 6:
                         bookmark = _c;
-                        if (view.DataVersion != bookmark.DataVersion) {
-                            console.warn("View and bookmark settings version mismatch.");
-                        }
                         enabledIds = [];
                         menuItems = [];
                         version = view.DataVersion;
@@ -21085,58 +21115,58 @@ function renderLegacyNavigator(iteration, params, bookmark, view) {
  * @param view
  */
 function renderNavigator(iteration, params, bookmark, view, getters) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5;
     return __awaiter(this, void 0, void 0, function () {
-        var viewer, scene, cTokenSet, _7, programKey, valid, e_1, valid, vSettings, bSettings, defaults, camera, newLens, shouldBe2d, curIs2d, transition, pos, terrain, hillShades, baseColor, globeHidden, terrainWireframe, globeAlpha, shadows, size, ambientOcclusion, AO, lighting, light, quality, fxaa, dateTime, clock, selectedIds, hiddenIds, isolatedIds, labelledIds, curLabelledIds, toUnLabel, entityOpacityMap, entityId, opacity, imagery, i, layer, legacyRelationIds, relations, curEnabled, newItemIds, _i, curEnabled_1, id, shouldRemove, rendered, menuItem, menuItem, gOcclusion;
-        return __generator(this, function (_8) {
-            switch (_8.label) {
+        var viewer, scene, cTokenSet, _6, programKey, valid, e_1, valid, vSettings, bSettings, defaults, camera, newLens, shouldBe2d, curIs2d, transition, pos, terrain, hillShades, baseColor, globeHidden, terrainWireframe, globeAlpha, shadows, size, ambientOcclusion, AO, lighting, light, quality, fxaa, dateTime, clock, selectedIds, hiddenIds, isolatedIds, labelledIds, curLabelledIds, toUnLabel, entityOpacityMap, entityId, opacity, imagery, i, layer, legacyRelationIds, relations, curEnabled, newItemIds, _i, curEnabled_1, id, shouldRemove, rendered, menuItem, menuItem, gOcclusion;
+        return __generator(this, function (_7) {
+            switch (_7.label) {
                 case 0:
                     viewer = params.manager.Viewer;
                     scene = viewer.scene;
                     if (!Ion.defaultAccessToken) return [3 /*break*/, 2];
                     return [4 /*yield*/, ViewerUtils.AssertIonToken(Ion.defaultAccessToken)];
                 case 1:
-                    _7 = _8.sent();
+                    _6 = _7.sent();
                     return [3 /*break*/, 3];
                 case 2:
-                    _7 = false;
-                    _8.label = 3;
+                    _6 = false;
+                    _7.label = 3;
                 case 3:
-                    cTokenSet = _7;
+                    cTokenSet = _6;
                     if (!!cTokenSet) return [3 /*break*/, 9];
-                    _8.label = 4;
+                    _7.label = 4;
                 case 4:
-                    _8.trys.push([4, 8, , 9]);
+                    _7.trys.push([4, 8, , 9]);
                     return [4 /*yield*/, ProgramKey.Get({
                             programId: ProgramKey.EProgramId.CesiumIon,
                             api: getters.GetBruceApi()
                         })];
                 case 5:
-                    programKey = (_8.sent()).programKey;
+                    programKey = (_7.sent()).programKey;
                     if (!(programKey === null || programKey === void 0 ? void 0 : programKey.Key)) return [3 /*break*/, 7];
                     return [4 /*yield*/, ViewerUtils.AssertIonToken(programKey.Key)];
                 case 6:
-                    valid = _8.sent();
+                    valid = _7.sent();
                     if (valid) {
                         Ion.defaultAccessToken = programKey.Key;
                         cTokenSet = true;
                     }
-                    _8.label = 7;
+                    _7.label = 7;
                 case 7: return [3 /*break*/, 9];
                 case 8:
-                    e_1 = _8.sent();
+                    e_1 = _7.sent();
                     console.error(e_1);
                     return [3 /*break*/, 9];
                 case 9:
                     if (!!cTokenSet) return [3 /*break*/, 11];
                     return [4 /*yield*/, ViewerUtils.AssertIonToken(CESIUM_DEFAULT_TOKEN)];
                 case 10:
-                    valid = _8.sent();
+                    valid = _7.sent();
                     if (valid) {
                         Ion.defaultAccessToken = CESIUM_DEFAULT_TOKEN;
                         cTokenSet = true;
                     }
-                    _8.label = 11;
+                    _7.label = 11;
                 case 11:
                     vSettings = view.Settings;
                     bSettings = ((_a = bookmark === null || bookmark === void 0 ? void 0 : bookmark.Settings) !== null && _a !== void 0 ? _a : {});
@@ -21204,15 +21234,15 @@ function renderNavigator(iteration, params, bookmark, view, getters) {
                             viewer: params.manager.Viewer,
                         })];
                 case 12:
-                    _8.sent();
+                    _7.sent();
                     if (!assertIteration$1(params.viewer, iteration)) {
                         return [2 /*return*/];
                     }
-                    _8.label = 13;
+                    _7.label = 13;
                 case 13:
-                    hillShades = (_o = bookmark === null || bookmark === void 0 ? void 0 : bookmark.Settings) === null || _o === void 0 ? void 0 : _o.hillShades;
+                    hillShades = bSettings === null || bSettings === void 0 ? void 0 : bSettings.hillShades;
                     if (hillShades == null) {
-                        hillShades = (_p = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _p === void 0 ? void 0 : _p.hillShades;
+                        hillShades = (_o = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _o === void 0 ? void 0 : _o.hillShades;
                     }
                     if (hillShades == null) {
                         hillShades = true;
@@ -21220,7 +21250,7 @@ function renderNavigator(iteration, params, bookmark, view, getters) {
                     scene.globe.enableLighting = Boolean(hillShades);
                     baseColor = bSettings === null || bSettings === void 0 ? void 0 : bSettings.globeColor;
                     if (baseColor == null) {
-                        baseColor = (_q = defaults.settings) === null || _q === void 0 ? void 0 : _q.globeColor;
+                        baseColor = (_p = defaults.settings) === null || _p === void 0 ? void 0 : _p.globeColor;
                     }
                     if (baseColor == null) {
                         // TODO: Need global default.
@@ -21229,7 +21259,7 @@ function renderNavigator(iteration, params, bookmark, view, getters) {
                     scene.globe.baseColor = Color.fromCssColorString(baseColor);
                     globeHidden = bSettings === null || bSettings === void 0 ? void 0 : bSettings.globeHidden;
                     if (globeHidden == null) {
-                        globeHidden = (_r = defaults.settings) === null || _r === void 0 ? void 0 : _r.globeHidden;
+                        globeHidden = (_q = defaults.settings) === null || _q === void 0 ? void 0 : _q.globeHidden;
                     }
                     if (globeHidden == null) {
                         globeHidden = false;
@@ -21237,7 +21267,7 @@ function renderNavigator(iteration, params, bookmark, view, getters) {
                     scene.globe.show = !globeHidden;
                     terrainWireframe = bSettings === null || bSettings === void 0 ? void 0 : bSettings.terrainWireframe;
                     if (terrainWireframe == null) {
-                        terrainWireframe = (_s = defaults.settings) === null || _s === void 0 ? void 0 : _s.terrainWireframe;
+                        terrainWireframe = (_r = defaults.settings) === null || _r === void 0 ? void 0 : _r.terrainWireframe;
                     }
                     if (terrainWireframe == null) {
                         terrainWireframe = false;
@@ -21248,7 +21278,7 @@ function renderNavigator(iteration, params, bookmark, view, getters) {
                     });
                     globeAlpha = +(bSettings === null || bSettings === void 0 ? void 0 : bSettings.globeAlpha);
                     if (isNaN(globeAlpha)) {
-                        globeAlpha = +((_t = defaults.settings) === null || _t === void 0 ? void 0 : _t.globeAlpha);
+                        globeAlpha = +((_s = defaults.settings) === null || _s === void 0 ? void 0 : _s.globeAlpha);
                     }
                     if (!scene.globe.translucency.enabled) {
                         scene.globe.translucency.enabled = true;
@@ -21258,7 +21288,7 @@ function renderNavigator(iteration, params, bookmark, view, getters) {
                     scene.globe.translucency.frontFaceAlphaByDistance.nearValue = EnsureNumber(globeAlpha, 1);
                     shadows = bSettings === null || bSettings === void 0 ? void 0 : bSettings.shadows;
                     if (shadows == null) {
-                        shadows = (_u = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _u === void 0 ? void 0 : _u.shadows;
+                        shadows = (_t = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _t === void 0 ? void 0 : _t.shadows;
                     }
                     if (shadows == null) {
                         shadows = {
@@ -21279,7 +21309,7 @@ function renderNavigator(iteration, params, bookmark, view, getters) {
                     viewer.shadowMap.darkness = EnsureNumber(shadows.darkness, 0.3);
                     ambientOcclusion = bSettings === null || bSettings === void 0 ? void 0 : bSettings.ambientOcclusion;
                     if (ambientOcclusion == null) {
-                        ambientOcclusion = (_v = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _v === void 0 ? void 0 : _v.ambientOcclusion;
+                        ambientOcclusion = (_u = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _u === void 0 ? void 0 : _u.ambientOcclusion;
                     }
                     if (ambientOcclusion == null) {
                         ambientOcclusion = {
@@ -21302,7 +21332,7 @@ function renderNavigator(iteration, params, bookmark, view, getters) {
                     }
                     lighting = bSettings === null || bSettings === void 0 ? void 0 : bSettings.lighting;
                     if (lighting == null) {
-                        lighting = (_w = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _w === void 0 ? void 0 : _w.lighting;
+                        lighting = (_v = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _v === void 0 ? void 0 : _v.lighting;
                     }
                     if (lighting == null) {
                         lighting = {
@@ -21317,7 +21347,7 @@ function renderNavigator(iteration, params, bookmark, view, getters) {
                     }
                     quality = bSettings === null || bSettings === void 0 ? void 0 : bSettings.quality;
                     if (quality == null) {
-                        quality = (_x = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _x === void 0 ? void 0 : _x.quality;
+                        quality = (_w = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _w === void 0 ? void 0 : _w.quality;
                     }
                     if (quality == null) {
                         quality = {
@@ -21328,7 +21358,7 @@ function renderNavigator(iteration, params, bookmark, view, getters) {
                     fxaa.enabled = Boolean(quality.fxaa);
                     dateTime = bSettings === null || bSettings === void 0 ? void 0 : bSettings.dateTime;
                     if (dateTime == null) {
-                        dateTime = (_y = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _y === void 0 ? void 0 : _y.dateTime;
+                        dateTime = (_x = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _x === void 0 ? void 0 : _x.dateTime;
                     }
                     if (dateTime != null) {
                         clock = viewer.clock;
@@ -21336,7 +21366,7 @@ function renderNavigator(iteration, params, bookmark, view, getters) {
                     }
                     selectedIds = bSettings === null || bSettings === void 0 ? void 0 : bSettings.selectedEntityIds;
                     if (selectedIds == null) {
-                        selectedIds = (_z = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _z === void 0 ? void 0 : _z.selectedEntityIds;
+                        selectedIds = (_y = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _y === void 0 ? void 0 : _y.selectedEntityIds;
                     }
                     if (selectedIds != null) {
                         params.manager.VisualsRegister.ClearSelected();
@@ -21350,7 +21380,7 @@ function renderNavigator(iteration, params, bookmark, view, getters) {
                     params.manager.VisualsRegister.ClearHidden();
                     hiddenIds = bSettings === null || bSettings === void 0 ? void 0 : bSettings.hiddenEntityIds;
                     if (hiddenIds == null) {
-                        hiddenIds = (_0 = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _0 === void 0 ? void 0 : _0.hiddenEntityIds;
+                        hiddenIds = (_z = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _z === void 0 ? void 0 : _z.hiddenEntityIds;
                     }
                     if (hiddenIds != null) {
                         params.manager.VisualsRegister.SetHidden({
@@ -21362,7 +21392,7 @@ function renderNavigator(iteration, params, bookmark, view, getters) {
                     params.manager.VisualsRegister.ClearIsolated();
                     isolatedIds = bSettings === null || bSettings === void 0 ? void 0 : bSettings.isolatedEntityIds;
                     if (isolatedIds == null) {
-                        isolatedIds = (_1 = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _1 === void 0 ? void 0 : _1.isolatedEntityIds;
+                        isolatedIds = (_0 = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _0 === void 0 ? void 0 : _0.isolatedEntityIds;
                     }
                     if (isolatedIds != null) {
                         params.manager.VisualsRegister.SetIsolated({
@@ -21373,7 +21403,7 @@ function renderNavigator(iteration, params, bookmark, view, getters) {
                     }
                     labelledIds = bSettings === null || bSettings === void 0 ? void 0 : bSettings.labelledEntityIds;
                     if (labelledIds == null) {
-                        labelledIds = (_2 = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _2 === void 0 ? void 0 : _2.labelledEntityIds;
+                        labelledIds = (_1 = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _1 === void 0 ? void 0 : _1.labelledEntityIds;
                     }
                     if (!(labelledIds === null || labelledIds === void 0 ? void 0 : labelledIds.length)) {
                         params.manager.VisualsRegister.ClearLabelled({
@@ -21397,7 +21427,7 @@ function renderNavigator(iteration, params, bookmark, view, getters) {
                     params.manager.VisualsRegister.ClearOpacity();
                     entityOpacityMap = bSettings === null || bSettings === void 0 ? void 0 : bSettings.entityOpacityMap;
                     if (entityOpacityMap == null) {
-                        entityOpacityMap = (_3 = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _3 === void 0 ? void 0 : _3.entityOpacityMap;
+                        entityOpacityMap = (_2 = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _2 === void 0 ? void 0 : _2.entityOpacityMap;
                     }
                     if (entityOpacityMap != null) {
                         for (entityId in entityOpacityMap) {
@@ -21411,7 +21441,7 @@ function renderNavigator(iteration, params, bookmark, view, getters) {
                             }
                         }
                     }
-                    imagery = (bSettings === null || bSettings === void 0 ? void 0 : bSettings.imagery) != null ? bSettings.imagery : (_4 = defaults.settings) === null || _4 === void 0 ? void 0 : _4.imagery;
+                    imagery = (bSettings === null || bSettings === void 0 ? void 0 : bSettings.imagery) != null ? bSettings.imagery : (_3 = defaults.settings) === null || _3 === void 0 ? void 0 : _3.imagery;
                     if (imagery == null) {
                         // TODO: Need global default.
                         imagery = [
@@ -21466,7 +21496,7 @@ function renderNavigator(iteration, params, bookmark, view, getters) {
                     }
                     viewer.scene.requestRender();
                     curEnabled = params.manager.GetEnabledItemIds();
-                    newItemIds = (_5 = bSettings === null || bSettings === void 0 ? void 0 : bSettings.menuItemIds) !== null && _5 !== void 0 ? _5 : [];
+                    newItemIds = (_4 = bSettings === null || bSettings === void 0 ? void 0 : bSettings.menuItemIds) !== null && _4 !== void 0 ? _4 : [];
                     for (_i = 0, curEnabled_1 = curEnabled; _i < curEnabled_1.length; _i++) {
                         id = curEnabled_1[_i];
                         shouldRemove = void 0;
@@ -21502,11 +21532,11 @@ function renderNavigator(iteration, params, bookmark, view, getters) {
                             bookmark: bookmark
                         })];
                 case 14:
-                    _8.sent();
+                    _7.sent();
                     if (!assertIteration$1(params.viewer, iteration)) {
                         return [2 /*return*/];
                     }
-                    _8.label = 15;
+                    _7.label = 15;
                 case 15:
                     if (legacyRelationIds.length || relations.length) {
                         if (relations.length) {
@@ -21541,7 +21571,7 @@ function renderNavigator(iteration, params, bookmark, view, getters) {
                     }
                     gOcclusion = bSettings === null || bSettings === void 0 ? void 0 : bSettings.groundOcclusion;
                     if (gOcclusion == null) {
-                        gOcclusion = (_6 = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _6 === void 0 ? void 0 : _6.groundOcclusion;
+                        gOcclusion = (_5 = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _5 === void 0 ? void 0 : _5.groundOcclusion;
                     }
                     if (gOcclusion == null) {
                         // TODO: Need global default.
@@ -21646,7 +21676,7 @@ var ViewRenderEngine;
     ViewRenderEngine.Render = Render;
 })(ViewRenderEngine || (ViewRenderEngine = {}));
 
-var VERSION = "3.5.6";
+var VERSION = "3.5.8";
 
 export { VERSION, CesiumViewMonitor, ViewerUtils, MenuItemManager, EntityRenderEngine, MenuItemCreator, VisualsRegister, RenderManager, EntitiesIdsRenderManager, EntitiesLoadedRenderManager, EntitiesRenderManager, EntityRenderManager, TilesetCadRenderManager, TilesetArbRenderManager, TilesetEntitiesRenderManager, TilesetOsmRenderManager, TilesetPointcloudRenderManager, TilesetGooglePhotosRenderManager, DataSourceStaticKmlManager, RelationsRenderManager, SharedGetters, CesiumParabola, EntityLabel, ViewRenderEngine, TileRenderEngine, TilesetRenderEngine, CESIUM_INSPECTOR_KEY, ViewUtils, DrawingUtils, MeasureUtils, EntityUtils, CesiumEntityStyler, Draw3dPolygon, Draw3dPolyline };
 //# sourceMappingURL=bruce-cesium.es5.js.map