bruce-cesium 1.9.2 → 1.9.4

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
 import { BruceEvent, Cartes, Carto, Entity as Entity$1, Geometry, Tileset, MathUtils, LRUCache, ZoomControl, Style, EntityTag, Calculator, EntityLod, EntityType, ClientFile, ObjectUtils, DelayQueue, BatchedDataGetter, EntityRelationType, EntityCoords, EntityFilterGetter, EntitySource, MenuItem, EntityRelation, ProjectView, ProjectViewBookmark, ProjectViewTile, ProjectViewLegacyTile, ProgramKey, Camera } from 'bruce-models';
 import * as Cesium from 'cesium';
-import { Cartesian2, Cartographic, CallbackProperty, Cartesian3, Color, Rectangle, Math as Math$1, HeightReference, EllipsoidTerrainProvider, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, SceneMode, HeadingPitchRange, Cesium3DTileColorBlendMode, createOsmBuildings, Cesium3DTileStyle, OrthographicFrustum, JulianDate, NearFarScalar, createWorldTerrain, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, EllipsoidGeodesic, sampleTerrainMostDetailed, KmlDataSource, Cesium3DTileset, Matrix4, Matrix3, IonResource, PolygonPipeline, ColorMaterialProperty, EasingFunction, GeometryInstance } from 'cesium';
+import { Cartesian2, Cartographic, CallbackProperty, Cartesian3, Color, Rectangle, Math as Math$1, Entity, Primitive, Cesium3DTileFeature, HeightReference, EllipsoidTerrainProvider, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, SceneMode, HeadingPitchRange, Cesium3DTileColorBlendMode, Cesium3DTileStyle, createOsmBuildings, KmlDataSource, createWorldTerrain, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, Cesium3DTileset, Matrix4, Matrix3, IonResource, PolygonPipeline, OrthographicFrustum, JulianDate, NearFarScalar, ColorMaterialProperty, EasingFunction, GeometryInstance, EllipsoidGeodesic, sampleTerrainMostDetailed } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -1535,12 +1535,14 @@ function getStyle(api, entity, styleId) {
         });
     });
 }
+function shouldApplyFlatFix(terrain) {
+    return terrain instanceof EllipsoidTerrainProvider;
+}
 function getRenderGroupId(zoomItem, terrain) {
-    var isFlatTerrain = terrain instanceof EllipsoidTerrainProvider;
     if (!zoomItem) {
         return null;
     }
-    return zoomItem.MinZoom + "-" + zoomItem.MaxZoom + "-" + isFlatTerrain;
+    return zoomItem.MinZoom + "-" + zoomItem.MaxZoom + "-" + shouldApplyFlatFix(terrain);
 }
 var _fileValidationCache = {};
 var EntityRenderEngine;
@@ -2070,8 +2072,7 @@ var EntityRenderEngine;
             var flattenPoints = false;
             // We gain a lot of performance when not clamping.
             // If there is no terrain we can safely not clamp.
-            if (heightRef == HeightReference.CLAMP_TO_GROUND &&
-                ((_b = params.viewer) === null || _b === void 0 ? void 0 : _b.terrainProvider) instanceof EllipsoidTerrainProvider) {
+            if (heightRef == HeightReference.CLAMP_TO_GROUND && shouldApplyFlatFix((_b = params.viewer) === null || _b === void 0 ? void 0 : _b.terrainProvider)) {
                 heightRef = HeightReference.NONE;
                 flattenPoints = true;
             }
@@ -2207,8 +2208,7 @@ var EntityRenderEngine;
             var extrusion = getPolygonExtrusion(entity, params.tags, outerRing, posses, heightRef, style);
             posses = extrusion.posses;
             var flattenPoints = false;
-            if (heightRef == HeightReference.CLAMP_TO_GROUND &&
-                ((_b = params.viewer) === null || _b === void 0 ? void 0 : _b.terrainProvider) instanceof EllipsoidTerrainProvider) {
+            if (heightRef == HeightReference.CLAMP_TO_GROUND && shouldApplyFlatFix((_b = params.viewer) === null || _b === void 0 ? void 0 : _b.terrainProvider)) {
                 heightRef = HeightReference.NONE;
                 flattenPoints = true;
             }
@@ -2670,11 +2670,14 @@ var EntitiesRenderManager;
         };
         Manager.prototype.ReRender = function (params) {
             return __awaiter(this, void 0, void 0, function () {
-                var entityIds, force, data, e_1;
+                var entityIds, force, entities, data, e_1;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
-                            entityIds = params.entityIds, force = params.force;
+                            entityIds = params.entityIds, force = params.force, entities = params.entities;
+                            if (entities && !entityIds) {
+                                entityIds = entities.map(function (x) { var _a; return (_a = x.Bruce) === null || _a === void 0 ? void 0 : _a.ID; });
+                            }
                             if (entityIds == null) {
                                 entityIds = Object.keys(this.renderedEntities);
                             }
@@ -2682,8 +2685,13 @@ var EntitiesRenderManager;
                                 entityIds: entityIds,
                                 menuItemIds: [this.item.id]
                             });
+                            if (entities === null || entities === void 0 ? void 0 : entities.length) {
+                                entities = [].concat(entities).filter(function (x) { var _a; return entityIds.includes((_a = x.Bruce) === null || _a === void 0 ? void 0 : _a.ID); });
+                            }
                             if (!force) return [3 /*break*/, 5];
-                            _a.label = 1;
+                            if (!(entities === null || entities === void 0 ? void 0 : entities.length)) return [3 /*break*/, 1];
+                            this.renderEntities(entities, true);
+                            return [3 /*break*/, 4];
                         case 1:
                             _a.trys.push([1, 3, , 4]);
                             return [4 /*yield*/, Entity$1.GetListByIds({
@@ -2698,12 +2706,16 @@ var EntitiesRenderManager;
                             e_1 = _a.sent();
                             console.error(e_1);
                             return [3 /*break*/, 4];
-                        case 4: return [3 /*break*/, 7];
-                        case 5: return [4 /*yield*/, this.doEntityCheck(entityIds)];
-                        case 6:
+                        case 4: return [3 /*break*/, 8];
+                        case 5:
+                            if (!(entities === null || entities === void 0 ? void 0 : entities.length)) return [3 /*break*/, 6];
+                            this.distributeForRender(entities);
+                            return [3 /*break*/, 8];
+                        case 6: return [4 /*yield*/, this.doEntityCheck(entityIds)];
+                        case 7:
                             _a.sent();
-                            _a.label = 7;
-                        case 7: return [2 /*return*/];
+                            _a.label = 8;
+                        case 8: return [2 /*return*/];
                     }
                 });
             });
@@ -2850,6 +2862,7 @@ var EntitiesRenderManager;
                                     });
                                 }
                             }
+                            this.viewer.scene.requestRender();
                             return [3 /*break*/, 3];
                         case 2:
                             e_3 = _d.sent();
@@ -2919,10 +2932,13 @@ var EntitiesLoadedRenderManager;
         };
         Manager.prototype.ReRender = function (params) {
             return __awaiter(this, void 0, void 0, function () {
-                var entityIds, force;
+                var entityIds, force, entities;
                 var _this = this;
                 return __generator(this, function (_a) {
-                    entityIds = params.entityIds, force = params.force;
+                    entityIds = params.entityIds, force = params.force, entities = params.entities;
+                    if (entities && !entityIds) {
+                        entityIds = entities.map(function (x) { var _a; return (_a = x.Bruce) === null || _a === void 0 ? void 0 : _a.ID; });
+                    }
                     if (entityIds == null) {
                         entityIds = Object.keys(this.renderedEntities);
                     }
@@ -2937,7 +2953,12 @@ var EntitiesLoadedRenderManager;
                         entityIds: entityIds,
                         menuItemIds: [this.item.id]
                     });
-                    this.doEntityCheck(entityIds, force);
+                    if (entities === null || entities === void 0 ? void 0 : entities.length) {
+                        this.onGetterUpdate([].concat(entities).filter(function (x) { var _a; return entityIds.includes((_a = x.Bruce) === null || _a === void 0 ? void 0 : _a.ID); }), force);
+                    }
+                    else {
+                        this.doEntityCheck(entityIds, force);
+                    }
                     return [2 /*return*/];
                 });
             });
@@ -3048,6 +3069,7 @@ var EntitiesLoadedRenderManager;
                                     });
                                 }
                             }
+                            this.viewer.scene.requestRender();
                             return [3 /*break*/, 3];
                         case 2:
                             e_2 = _b.sent();
@@ -4421,10 +4443,13 @@ var EntitiesIdsRenderManager;
         };
         Manager.prototype.ReRender = function (params) {
             return __awaiter(this, void 0, void 0, function () {
-                var entityIds, force;
+                var entityIds, force, entities;
                 var _this = this;
                 return __generator(this, function (_a) {
-                    entityIds = params.entityIds, force = params.force;
+                    entityIds = params.entityIds, force = params.force, entities = params.entities;
+                    if (entities && !entityIds) {
+                        entityIds = entities.map(function (x) { var _a; return (_a = x.Bruce) === null || _a === void 0 ? void 0 : _a.ID; });
+                    }
                     if (entityIds == null) {
                         entityIds = Object.keys(this.renderedEntities);
                     }
@@ -4439,32 +4464,63 @@ var EntitiesIdsRenderManager;
                         entityIds: entityIds,
                         menuItemIds: [this.item.id]
                     });
-                    this.onGetterUpdate(entityIds, force);
+                    if (entities === null || entities === void 0 ? void 0 : entities.length) {
+                        this.renderEntities([].concat(entities).filter(function (x) { var _a; return entityIds.includes((_a = x.Bruce) === null || _a === void 0 ? void 0 : _a.ID); }), force);
+                    }
+                    else {
+                        this.onGetterUpdate(entityIds, force);
+                    }
                     return [2 /*return*/];
                 });
             });
         };
         Manager.prototype.onGetterUpdate = function (entityIds, force) {
-            var _a;
             if (force === void 0) { force = false; }
             return __awaiter(this, void 0, void 0, function () {
-                var api, entities, cEntities, i, entity, id, cEntity, visual, e_1;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
+                var api, entities, e_1;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
                         case 0:
                             if (this.disposed || this.viewer.isDestroyed()) {
                                 return [2 /*return*/];
                             }
-                            _b.label = 1;
+                            _a.label = 1;
                         case 1:
-                            _b.trys.push([1, 4, , 5]);
+                            _a.trys.push([1, 4, , 5]);
                             api = this.apiGetter.getApi();
                             return [4 /*yield*/, Entity$1.GetListByIds({
                                     api: api,
                                     entityIds: entityIds
                                 })];
                         case 2:
-                            entities = (_b.sent()).entities;
+                            entities = (_a.sent()).entities;
+                            return [4 /*yield*/, this.renderEntities(entities, force)];
+                        case 3:
+                            _a.sent();
+                            return [3 /*break*/, 5];
+                        case 4:
+                            e_1 = _a.sent();
+                            console.error(e_1);
+                            return [3 /*break*/, 5];
+                        case 5: return [2 /*return*/];
+                    }
+                });
+            });
+        };
+        Manager.prototype.renderEntities = function (entities, force) {
+            var _a;
+            if (force === void 0) { force = false; }
+            return __awaiter(this, void 0, void 0, function () {
+                var cEntities, i, entity, id, cEntity, visual, e_2;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0:
+                            if (this.disposed || this.viewer.isDestroyed()) {
+                                return [2 /*return*/];
+                            }
+                            _b.label = 1;
+                        case 1:
+                            _b.trys.push([1, 3, , 4]);
                             return [4 /*yield*/, EntityRenderEngine.Render({
                                     viewer: this.viewer,
                                     apiGetter: this.apiGetter,
@@ -4474,7 +4530,7 @@ var EntitiesIdsRenderManager;
                                     zoomControl: this.item.CameraZoomSettings,
                                     force: force
                                 })];
-                        case 3:
+                        case 2:
                             cEntities = _b.sent();
                             for (i = 0; i < entities.length; i++) {
                                 entity = entities[i];
@@ -4506,12 +4562,13 @@ var EntitiesIdsRenderManager;
                                     });
                                 }
                             }
-                            return [3 /*break*/, 5];
-                        case 4:
-                            e_1 = _b.sent();
-                            console.error(e_1);
-                            return [3 /*break*/, 5];
-                        case 5: return [2 /*return*/];
+                            this.viewer.scene.requestRender();
+                            return [3 /*break*/, 4];
+                        case 3:
+                            e_2 = _b.sent();
+                            console.error(e_2);
+                            return [3 /*break*/, 4];
+                        case 4: return [2 /*return*/];
                     }
                 });
             });
@@ -4570,11 +4627,15 @@ var EntityRenderManager;
         };
         Manager.prototype.ReRender = function (params) {
             return __awaiter(this, void 0, void 0, function () {
-                var entityIds, force;
+                var entityIds, force, entities;
+                var _this = this;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
-                            entityIds = params.entityIds, force = params.force;
+                            entityIds = params.entityIds, force = params.force, entities = params.entities;
+                            if (entities && !entityIds) {
+                                entityIds = entities.map(function (x) { var _a; return (_a = x.Bruce) === null || _a === void 0 ? void 0 : _a.ID; });
+                            }
                             if (entityIds && !entityIds.includes(this.item.BruceEntity.EntityId)) {
                                 return [2 /*return*/];
                             }
@@ -4582,23 +4643,28 @@ var EntityRenderManager;
                                 entityIds: entityIds,
                                 menuItemIds: [this.item.id]
                             });
-                            return [4 /*yield*/, this.onGetterUpdate(this.item.BruceEntity.EntityId, force)];
+                            if (!(entities === null || entities === void 0 ? void 0 : entities.length)) return [3 /*break*/, 2];
+                            return [4 /*yield*/, this.renderEntity(entities.find(function (x) { var _a; return ((_a = x.Bruce) === null || _a === void 0 ? void 0 : _a.ID) == _this.item.BruceEntity.EntityId; }), force)];
                         case 1:
                             _a.sent();
-                            return [2 /*return*/];
+                            return [3 /*break*/, 4];
+                        case 2: return [4 /*yield*/, this.onGetterUpdate(this.item.BruceEntity.EntityId, force)];
+                        case 3:
+                            _a.sent();
+                            _a.label = 4;
+                        case 4: return [2 /*return*/];
                     }
                 });
             });
         };
         Manager.prototype.onGetterUpdate = function (id, force) {
-            var _a;
             if (force === void 0) { force = false; }
             return __awaiter(this, void 0, void 0, function () {
-                var api, entity, cEntities, cEntity, visual, e_1;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
+                var api, entity, e_1;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
                         case 0:
-                            _b.trys.push([0, 3, , 4]);
+                            _a.trys.push([0, 2, , 3]);
                             if (this.disposed || this.viewer.isDestroyed()) {
                                 return [2 /*return*/];
                             }
@@ -4608,7 +4674,31 @@ var EntityRenderManager;
                                     entityId: id
                                 })];
                         case 1:
-                            entity = (_b.sent()).entity;
+                            entity = (_a.sent()).entity;
+                            this.renderEntity(entity, force);
+                            return [3 /*break*/, 3];
+                        case 2:
+                            e_1 = _a.sent();
+                            console.error(e_1);
+                            return [3 /*break*/, 3];
+                        case 3: return [2 /*return*/];
+                    }
+                });
+            });
+        };
+        Manager.prototype.renderEntity = function (entity, force) {
+            var _a;
+            if (force === void 0) { force = false; }
+            return __awaiter(this, void 0, void 0, function () {
+                var id, cEntities, cEntity, visual, e_2;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0:
+                            _b.trys.push([0, 2, , 3]);
+                            if (this.disposed || this.viewer.isDestroyed()) {
+                                return [2 /*return*/];
+                            }
+                            id = entity.Bruce.ID;
                             return [4 /*yield*/, EntityRenderEngine.Render({
                                     viewer: this.viewer,
                                     apiGetter: this.apiGetter,
@@ -4618,7 +4708,7 @@ var EntityRenderManager;
                                     zoomControl: this.item.CameraZoomSettings,
                                     force: force
                                 })];
-                        case 2:
+                        case 1:
                             cEntities = _b.sent();
                             cEntity = cEntities[id];
                             if (cEntity) {
@@ -4645,12 +4735,13 @@ var EntityRenderManager;
                                     menuItemId: this.item.id
                                 });
                             }
-                            return [3 /*break*/, 4];
-                        case 3:
-                            e_1 = _b.sent();
-                            console.error(e_1);
-                            return [3 /*break*/, 4];
-                        case 4: return [2 /*return*/];
+                            this.viewer.scene.requestRender();
+                            return [3 /*break*/, 3];
+                        case 2:
+                            e_2 = _b.sent();
+                            console.error(e_2);
+                            return [3 /*break*/, 3];
+                        case 3: return [2 /*return*/];
                     }
                 });
             });
@@ -7375,14 +7466,17 @@ var MenuItemManager;
          */
         Manager.prototype.ReRender = function (params) {
             return __awaiter(this, void 0, void 0, function () {
-                var entityIds, menuItemIds, force, items, i, item;
+                var entityIds, entities, menuItemIds, force, items, i, item;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
-                            entityIds = params.entityIds, menuItemIds = params.menuItemIds, force = params.force;
-                            if (!(entityIds === null || entityIds === void 0 ? void 0 : entityIds.length)) {
+                            entityIds = params.entityIds, entities = params.entities, menuItemIds = params.menuItemIds, force = params.force;
+                            if (!(entityIds === null || entityIds === void 0 ? void 0 : entityIds.length) && !(entities === null || entities === void 0 ? void 0 : entities.length)) {
                                 return [2 /*return*/];
                             }
+                            if (!entityIds && entities) {
+                                entityIds = entities.map(function (x) { var _a; return (_a = x.Bruce) === null || _a === void 0 ? void 0 : _a.ID; });
+                            }
                             items = (menuItemIds === null || menuItemIds === void 0 ? void 0 : menuItemIds.length) ? this.items.filter(function (x) { return menuItemIds.includes(x.id); }) : this.items;
                             i = 0;
                             _a.label = 1;
@@ -7392,6 +7486,7 @@ var MenuItemManager;
                             if (!item.renderManager) return [3 /*break*/, 3];
                             return [4 /*yield*/, item.renderManager.ReRender({
                                     entityIds: entityIds,
+                                    entities: entities,
                                     force: force
                                 })];
                         case 2:
@@ -8971,11 +9066,11 @@ function renderLegacyNavigator(params, bookmark, view) {
  * @param view
  */
 function renderNavigator(params, bookmark, view) {
-    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;
+    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, vSettings, bSettings, defaults, camera, newLens, curLens, transition, pos, terrain, gOcclusion, hillShades, baseColor, globeHidden, globeAlpha, shadows, size, ambientOcclusion, AO, lighting, light, quality, fxaa, dateTime, clock, selectedIds, hiddenIds, isolatedIds, entityOpacityMap, entityId, opacity, imagery, renderedRelationEntityIds, curEnabled, newItemIds, _i, curEnabled_1, id, menuItem;
-        return __generator(this, function (_5) {
-            switch (_5.label) {
+        var viewer, scene, vSettings, bSettings, defaults, camera, newLens, modePicker, is2d, curLens, modePicker_1, transition, pos, terrain, gOcclusion, hillShades, baseColor, globeHidden, globeAlpha, shadows, size, ambientOcclusion, AO, lighting, light, quality, fxaa, dateTime, clock, selectedIds, hiddenIds, isolatedIds, entityOpacityMap, entityId, opacity, imagery, renderedRelationEntityIds, curEnabled, newItemIds, _i, curEnabled_1, id, menuItem;
+        return __generator(this, function (_6) {
+            switch (_6.label) {
                 case 0:
                     viewer = params.manager.Viewer;
                     scene = viewer.scene;
@@ -8994,23 +9089,25 @@ function renderNavigator(params, bookmark, view) {
                         // TODO: Need global default.
                         newLens = Camera.EFrustum.Perspective;
                     }
-                    curLens = scene.camera.frustum instanceof OrthographicFrustum ?
-                        Camera.EFrustum.Orthographic :
-                        Camera.EFrustum.Perspective;
+                    modePicker = viewer === null || viewer === void 0 ? void 0 : viewer.sceneModePicker;
+                    is2d = ((_l = modePicker === null || modePicker === void 0 ? void 0 : modePicker.viewModel) === null || _l === void 0 ? void 0 : _l.sceneMode) === SceneMode.SCENE2D;
+                    curLens = is2d ? Camera.EFrustum.Orthographic : Camera.EFrustum.Perspective;
                     if (newLens != curLens) {
-                        if (newLens == Camera.EFrustum.Perspective) {
-                            scene.camera.switchToPerspectiveFrustum();
-                            scene.screenSpaceCameraController.enableTilt = true;
-                        }
-                        else {
-                            scene.camera.switchToOrthographicFrustum();
-                            scene.screenSpaceCameraController.enableTilt = false;
+                        modePicker_1 = viewer === null || viewer === void 0 ? void 0 : viewer.sceneModePicker;
+                        if (modePicker_1) {
+                            modePicker_1.viewModel.duration = 0;
+                            if (newLens == Camera.EFrustum.Perspective) {
+                                modePicker_1.viewModel._morphTo3D();
+                            }
+                            else {
+                                modePicker_1.viewModel._morphTo2D();
+                            }
                         }
                     }
                     if (!params.skipCamera) {
                         transition = params.skipTransition ? 0 : curLens === newLens ? camera.transition : 0;
                         if (transition == null) {
-                            transition = (_l = defaults.camera) === null || _l === void 0 ? void 0 : _l.transition;
+                            transition = (_m = defaults.camera) === null || _m === void 0 ? void 0 : _m.transition;
                         }
                         if (transition == null) {
                             // TODO: Need global default.
@@ -9029,7 +9126,7 @@ function renderNavigator(params, bookmark, view) {
                             });
                         }
                     }
-                    terrain = (bSettings === null || bSettings === void 0 ? void 0 : bSettings.terrain) != null ? bSettings === null || bSettings === void 0 ? void 0 : bSettings.terrain : (_m = defaults.settings) === null || _m === void 0 ? void 0 : _m.terrain;
+                    terrain = (bSettings === null || bSettings === void 0 ? void 0 : bSettings.terrain) != null ? bSettings === null || bSettings === void 0 ? void 0 : bSettings.terrain : (_o = defaults.settings) === null || _o === void 0 ? void 0 : _o.terrain;
                     if (!terrain) return [3 /*break*/, 2];
                     return [4 /*yield*/, TileRenderEngine.Terrain.Navigator.Render({
                             apiGetter: params.apiGetter,
@@ -9037,21 +9134,21 @@ function renderNavigator(params, bookmark, view) {
                             viewer: params.manager.Viewer,
                         })];
                 case 1:
-                    _5.sent();
-                    _5.label = 2;
+                    _6.sent();
+                    _6.label = 2;
                 case 2:
                     gOcclusion = bSettings === null || bSettings === void 0 ? void 0 : bSettings.groundOcclusion;
                     if (gOcclusion == null) {
-                        gOcclusion = (_o = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _o === void 0 ? void 0 : _o.groundOcclusion;
+                        gOcclusion = (_p = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _p === void 0 ? void 0 : _p.groundOcclusion;
                     }
                     if (gOcclusion == null) {
                         // TODO: Need global default.
                         gOcclusion = true;
                     }
                     scene.globe.depthTestAgainstTerrain = Boolean(gOcclusion);
-                    hillShades = (_p = bookmark === null || bookmark === void 0 ? void 0 : bookmark.Settings) === null || _p === void 0 ? void 0 : _p.hillShades;
+                    hillShades = (_q = bookmark === null || bookmark === void 0 ? void 0 : bookmark.Settings) === null || _q === void 0 ? void 0 : _q.hillShades;
                     if (hillShades == null) {
-                        hillShades = (_q = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _q === void 0 ? void 0 : _q.hillShades;
+                        hillShades = (_r = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _r === void 0 ? void 0 : _r.hillShades;
                     }
                     if (hillShades == null) {
                         hillShades = true;
@@ -9059,7 +9156,7 @@ function renderNavigator(params, bookmark, view) {
                     scene.globe.enableLighting = Boolean(hillShades);
                     baseColor = bSettings === null || bSettings === void 0 ? void 0 : bSettings.globeColor;
                     if (baseColor == null) {
-                        baseColor = (_r = defaults.settings) === null || _r === void 0 ? void 0 : _r.globeColor;
+                        baseColor = (_s = defaults.settings) === null || _s === void 0 ? void 0 : _s.globeColor;
                     }
                     if (baseColor == null) {
                         // TODO: Need global default.
@@ -9068,7 +9165,7 @@ function renderNavigator(params, bookmark, view) {
                     scene.globe.baseColor = Color.fromCssColorString(baseColor);
                     globeHidden = bSettings === null || bSettings === void 0 ? void 0 : bSettings.globeHidden;
                     if (globeHidden == null) {
-                        globeHidden = (_s = defaults.settings) === null || _s === void 0 ? void 0 : _s.globeHidden;
+                        globeHidden = (_t = defaults.settings) === null || _t === void 0 ? void 0 : _t.globeHidden;
                     }
                     if (globeHidden == null) {
                         globeHidden = false;
@@ -9076,7 +9173,7 @@ function renderNavigator(params, bookmark, view) {
                     scene.globe.show = !globeHidden;
                     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 = +((_u = defaults.settings) === null || _u === void 0 ? void 0 : _u.globeAlpha);
                     }
                     if (!scene.globe.translucency.enabled) {
                         scene.globe.translucency.enabled = true;
@@ -9086,7 +9183,7 @@ function renderNavigator(params, bookmark, view) {
                     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 = (_v = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _v === void 0 ? void 0 : _v.shadows;
                     }
                     if (shadows == null) {
                         shadows = {
@@ -9113,7 +9210,7 @@ function renderNavigator(params, bookmark, view) {
                     }
                     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 = (_w = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _w === void 0 ? void 0 : _w.ambientOcclusion;
                     }
                     if (ambientOcclusion == null) {
                         ambientOcclusion = {
@@ -9136,7 +9233,7 @@ function renderNavigator(params, bookmark, view) {
                     }
                     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 = (_x = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _x === void 0 ? void 0 : _x.lighting;
                     }
                     if (lighting == null) {
                         lighting = {
@@ -9151,7 +9248,7 @@ function renderNavigator(params, bookmark, view) {
                     }
                     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 = (_y = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _y === void 0 ? void 0 : _y.quality;
                     }
                     if (quality == null) {
                         quality = {
@@ -9162,7 +9259,7 @@ function renderNavigator(params, bookmark, view) {
                     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 = (_z = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _z === void 0 ? void 0 : _z.dateTime;
                     }
                     if (dateTime != null) {
                         clock = viewer.clock;
@@ -9170,7 +9267,7 @@ function renderNavigator(params, bookmark, view) {
                     }
                     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 = (_0 = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _0 === void 0 ? void 0 : _0.selectedEntityIds;
                     }
                     if (selectedIds != null) {
                         params.manager.VisualsRegister.ClearSelected();
@@ -9183,7 +9280,7 @@ function renderNavigator(params, bookmark, view) {
                     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 = (_1 = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _1 === void 0 ? void 0 : _1.hiddenEntityIds;
                     }
                     if (hiddenIds != null) {
                         params.manager.VisualsRegister.SetHidden({
@@ -9194,7 +9291,7 @@ function renderNavigator(params, bookmark, view) {
                     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 = (_2 = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _2 === void 0 ? void 0 : _2.isolatedEntityIds;
                     }
                     if (isolatedIds != null) {
                         params.manager.VisualsRegister.SetIsolated({
@@ -9205,7 +9302,7 @@ function renderNavigator(params, bookmark, view) {
                     params.manager.VisualsRegister.ClearOpacity();
                     entityOpacityMap = bSettings === null || bSettings === void 0 ? void 0 : bSettings.entityOpacityMap;
                     if (entityOpacityMap == null) {
-                        entityOpacityMap = (_2 = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _2 === void 0 ? void 0 : _2.entityOpacityMap;
+                        entityOpacityMap = (_3 = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _3 === void 0 ? void 0 : _3.entityOpacityMap;
                     }
                     if (entityOpacityMap != null) {
                         for (entityId in entityOpacityMap) {
@@ -9218,7 +9315,7 @@ function renderNavigator(params, bookmark, view) {
                             }
                         }
                     }
-                    imagery = (bSettings === null || bSettings === void 0 ? void 0 : bSettings.imagery) != null ? bSettings.imagery : (_3 = defaults.settings) === null || _3 === void 0 ? void 0 : _3.imagery;
+                    imagery = (bSettings === null || bSettings === void 0 ? void 0 : bSettings.imagery) != null ? bSettings.imagery : (_4 = defaults.settings) === null || _4 === void 0 ? void 0 : _4.imagery;
                     if (imagery == null) {
                         // TODO: Need global default.
                         imagery = [
@@ -9240,13 +9337,13 @@ function renderNavigator(params, bookmark, view) {
                             viewer: params.manager.Viewer,
                         })];
                 case 3:
-                    _5.sent();
+                    _6.sent();
                     renderedRelationEntityIds = bSettings === null || bSettings === void 0 ? void 0 : bSettings.renderedEntityRelations;
                     if (!renderedRelationEntityIds) {
                         renderedRelationEntityIds = [];
                     }
                     curEnabled = params.manager.GetEnabledItemIds();
-                    newItemIds = (_4 = bSettings === null || bSettings === void 0 ? void 0 : bSettings.menuItemIds) !== null && _4 !== void 0 ? _4 : [];
+                    newItemIds = (_5 = bSettings === null || bSettings === void 0 ? void 0 : bSettings.menuItemIds) !== null && _5 !== void 0 ? _5 : [];
                     for (_i = 0, curEnabled_1 = curEnabled; _i < curEnabled_1.length; _i++) {
                         id = curEnabled_1[_i];
                         if (newItemIds.indexOf(id) === -1 ||
@@ -9264,8 +9361,8 @@ function renderNavigator(params, bookmark, view) {
                             bookmark: bookmark
                         })];
                 case 4:
-                    _5.sent();
-                    _5.label = 5;
+                    _6.sent();
+                    _6.label = 5;
                 case 5:
                     if (!(renderedRelationEntityIds.length > 0)) return [3 /*break*/, 7];
                     menuItem = {
@@ -9281,8 +9378,8 @@ function renderNavigator(params, bookmark, view) {
                             item: menuItem
                         })];
                 case 6:
-                    _5.sent();
-                    _5.label = 7;
+                    _6.sent();
+                    _6.label = 7;
                 case 7: return [2 /*return*/];
             }
         });