bruce-cesium 2.2.4 → 2.2.6

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, ENVIRONMENT, ProjectView, ProjectViewBookmark, ProjectViewTile, ProjectViewLegacyTile, ProgramKey, Camera } from 'bruce-models';
 import * as Cesium from 'cesium';
-import { Entity, Primitive, Cesium3DTileFeature, Color, Cartesian2, Cartesian3, SceneMode, Math as Math$1, Cartographic, CallbackProperty, Rectangle, HeightReference, DistanceDisplayCondition, NearFarScalar, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Cesium3DTileColorBlendMode, HeadingPitchRange, createOsmBuildings, Cesium3DTileStyle, KmlDataSource, OrthographicFrustum, JulianDate, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, CesiumInspector, EllipsoidGeodesic, sampleTerrainMostDetailed, Cesium3DTileset, Matrix4, Matrix3, IonResource, ColorMaterialProperty, EasingFunction, GeometryInstance, PolygonPipeline } from 'cesium';
+import { Cartesian2, Cartographic, CallbackProperty, Cartesian3, Color, Rectangle, Math as Math$1, HeightReference, DistanceDisplayCondition, NearFarScalar, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, SceneMode, Cesium3DTileColorBlendMode, HeadingPitchRange, createOsmBuildings, Cesium3DTileStyle, KmlDataSource, PolygonPipeline, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, OrthographicFrustum, JulianDate, CesiumInspector, defined, EllipsoidGeodesic, sampleTerrainMostDetailed, Cesium3DTileset, Model, ColorMaterialProperty, Matrix3, Matrix4, EasingFunction, GeometryInstance, IonResource } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -547,6 +547,84 @@ var DrawingUtils;
         return pos3d;
     }
     DrawingUtils.EnsurePosHeight = EnsurePosHeight;
+    /**
+     * Returns an accurate 3d position from a given screen position.
+     * @param viewer
+     * @param cursor
+     * @returns
+     */
+    DrawingUtils.GetAccuratePosition = (function () {
+        var cachedPick = null;
+        var cacheTimestamp = null;
+        var cachedCameraState = null;
+        return function (viewer, cursor, pickOnly) {
+            if (pickOnly === void 0) { pickOnly = false; }
+            var scene = viewer.scene;
+            var camera = scene.camera;
+            // Check if we can use cached position.
+            if (cachedPick && cacheTimestamp) {
+                var timeElapsed = Date.now() - cacheTimestamp;
+                var isWithinCacheDuration = timeElapsed < 3000; // 3 seconds
+                var isNearPreviousPick = Cartesian2.distanceSquared(cursor, cachedPick.cursor) < 9; // 3 pixels
+                var directionDot = Cartesian3.dot(camera.directionWC, cachedCameraState.direction);
+                var directionLengths = Cartesian3.magnitude(camera.directionWC) * Cartesian3.magnitude(cachedCameraState.direction);
+                var angle = Math.acos(directionDot / directionLengths);
+                var hasCameraMoved = Math.abs(camera.positionWC.x - cachedCameraState.position.x) > 2 || // 2 meters
+                    Math.abs(camera.positionWC.y - cachedCameraState.position.y) > 2 ||
+                    angle > Math$1.toRadians(5); // 5 degrees
+                if (isWithinCacheDuration && isNearPreviousPick && !hasCameraMoved) {
+                    return cachedPick.position;
+                }
+            }
+            // Actual picking logic
+            // https://community.cesium.com/t/scene-pick-returning-point-inside-the-globe/18940/9
+            var pos3d = null;
+            // Means we can accurately pick right now.
+            if (!pickOnly && scene.globe.depthTestAgainstTerrain) {
+                pos3d = scene.pickPosition(cursor);
+            }
+            // Means we cannot guarantee an accurate pick.
+            // We want to prioritize pick-position when we can, so we'll try use it and if the result is sus then we'll use some fallbacks.
+            else {
+                if (!pickOnly) {
+                    pos3d = scene.pickPosition(cursor);
+                }
+                if (defined(pos3d)) {
+                    var carto = Cartographic.fromCartesian(pos3d);
+                    if (!defined(carto) || carto.height < 0) {
+                        pos3d = null;
+                    }
+                }
+                if (!defined(pos3d)) {
+                    pos3d = null;
+                    var ray = scene.camera.getPickRay(cursor);
+                    if (scene.pickPositionSupported) {
+                        var pickedObject = scene.pick(cursor, 1, 1);
+                        if (defined(pickedObject) &&
+                            (pickedObject instanceof Cesium3DTileFeature ||
+                                pickedObject.primitive instanceof Cesium3DTileset ||
+                                pickedObject.primitive instanceof Model)) {
+                            pos3d = scene.pickPosition(cursor);
+                        }
+                    }
+                    if (!pickOnly && !defined(pos3d)) {
+                        pos3d = scene.globe.pick(ray, scene);
+                    }
+                }
+            }
+            // Update cache.
+            cachedPick = {
+                position: pos3d,
+                cursor: cursor.clone()
+            };
+            cacheTimestamp = Date.now();
+            cachedCameraState = {
+                position: camera.positionWC.clone(),
+                direction: camera.directionWC.clone()
+            };
+            return pos3d;
+        };
+    })();
 })(DrawingUtils || (DrawingUtils = {}));
 
 /**
@@ -1302,7 +1380,7 @@ var RenderManager;
         if (!pos) {
             return null;
         }
-        var is2d = viewer.scene.mode === SceneMode.SCENE2D;
+        var isFlatEarth = viewer.scene.mode === SceneMode.SCENE2D;
         var cameraPos = viewer.camera.positionCartographic;
         if (!cameraPos || !cameraPos.latitude) {
             return null;
@@ -1316,9 +1394,9 @@ var RenderManager;
             zoomControl: zoomControl,
             distance: distance
         });
-        // In 2d cesium gets camera position very wrong.
+        // In flat earth mode cesium gets camera position very wrong.
         // TODO: Need to check if lat/lon is correct and use that for distance calc instead.
-        if (is2d && !zoomItem && zoomControl.length) {
+        if (isFlatEarth && !zoomItem && zoomControl.length) {
             zoomItem = zoomControl[zoomControl.length - 1];
         }
         return zoomItem;
@@ -10315,6 +10393,61 @@ var ViewUtils;
         return (_b = (_a = params.viewer[CESIUM_INSPECTOR_KEY]) === null || _a === void 0 ? void 0 : _a.viewModel) === null || _b === void 0 ? void 0 : _b.wireframe;
     }
     ViewUtils.GetTerrainWireframeStatus = GetTerrainWireframeStatus;
+    /**
+     * Changes between perspective and orthographic view.
+     * When Cesium stops being bad at picking positions in 2d mode we'll use the flat earth mode instead.
+     * @param params
+     */
+    function Set2dStatus(params) {
+        var viewer = params.viewer, is2d = params.status, moveCamera = params.moveCamera;
+        var curLens2d = viewer.camera.frustum instanceof OrthographicFrustum;
+        if (curLens2d && !is2d) {
+            viewer.camera.switchToPerspectiveFrustum();
+            viewer.scene.screenSpaceCameraController.enableTilt = true;
+        }
+        else if (!curLens2d && is2d) {
+            viewer.camera.switchToOrthographicFrustum();
+            viewer.scene.screenSpaceCameraController.enableTilt = false;
+            if (moveCamera != false) {
+                try {
+                    // Face camera downwards to make it look 2d.
+                    // We want to try make it look at the center-point of the current view.
+                    // If center cannot be calculated then we'll simply raise the camera and face it downwards.
+                    var scene = viewer.scene;
+                    var windowPosition = new Cartesian2(scene.canvas.clientWidth / 2, scene.canvas.clientHeight / 2);
+                    var ray = viewer.camera.getPickRay(windowPosition);
+                    var intersection = scene.globe.pick(ray, scene);
+                    var center = void 0;
+                    if (defined(intersection)) {
+                        center = Cartographic.fromCartesian(intersection);
+                    }
+                    // Use current camera position if we can't calculate the center.
+                    else {
+                        center = Cartographic.fromCartesian(viewer.camera.position);
+                        center.height = 0;
+                    }
+                    center.height = viewer.camera.positionCartographic.height + 100;
+                    viewer.camera.setView({
+                        destination: Cartographic.toCartesian(center),
+                        orientation: {
+                            heading: 0.0,
+                            pitch: Math$1.toRadians(-90.0),
+                            roll: 0.0
+                        }
+                    });
+                }
+                catch (e) {
+                    console.error(e);
+                }
+            }
+        }
+    }
+    ViewUtils.Set2dStatus = Set2dStatus;
+    function Get2dStatus(params) {
+        var viewer = params.viewer;
+        return viewer.camera.frustum instanceof OrthographicFrustum;
+    }
+    ViewUtils.Get2dStatus = Get2dStatus;
 })(ViewUtils || (ViewUtils = {}));
 
 // TODO: Move these to the data model.
@@ -10468,11 +10601,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, _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, vSettings, bSettings, defaults, camera, newLens, modePicker, is2d, curLens, modePicker_1, transition, pos, terrain, hillShades, baseColor, globeHidden, terrainWireframe, 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, gOcclusion;
-        return __generator(this, function (_7) {
-            switch (_7.label) {
+        var viewer, scene, 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, entityOpacityMap, entityId, opacity, imagery, renderedRelationEntityIds, curEnabled, newItemIds, _i, curEnabled_1, id, menuItem, gOcclusion;
+        return __generator(this, function (_6) {
+            switch (_6.label) {
                 case 0:
                     viewer = params.manager.Viewer;
                     scene = viewer.scene;
@@ -10491,25 +10624,21 @@ function renderNavigator(params, bookmark, view) {
                         // TODO: Need global default.
                         newLens = 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) {
-                        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();
-                            }
-                        }
+                    shouldBe2d = newLens == Camera.EFrustum.Orthographic;
+                    curIs2d = ViewUtils.Get2dStatus({
+                        viewer: viewer
+                    });
+                    if (shouldBe2d != curIs2d) {
+                        ViewUtils.Set2dStatus({
+                            status: shouldBe2d,
+                            viewer: viewer,
+                            moveCamera: false
+                        });
                     }
                     if (!params.skipCamera) {
-                        transition = params.skipTransition ? 0 : curLens === newLens ? camera.transition : 0;
+                        transition = params.skipTransition ? 0 : shouldBe2d === curIs2d ? camera.transition : 0;
                         if (transition == null) {
-                            transition = (_m = defaults.camera) === null || _m === void 0 ? void 0 : _m.transition;
+                            transition = (_l = defaults.camera) === null || _l === void 0 ? void 0 : _l.transition;
                         }
                         if (transition == null) {
                             // TODO: Need global default.
@@ -10528,7 +10657,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 : (_o = defaults.settings) === null || _o === void 0 ? void 0 : _o.terrain;
+                    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;
                     if (!terrain) return [3 /*break*/, 2];
                     return [4 /*yield*/, TileRenderEngine.Terrain.Navigator.Render({
                             apiGetter: params.apiGetter,
@@ -10536,12 +10665,12 @@ function renderNavigator(params, bookmark, view) {
                             viewer: params.manager.Viewer,
                         })];
                 case 1:
-                    _7.sent();
-                    _7.label = 2;
+                    _6.sent();
+                    _6.label = 2;
                 case 2:
-                    hillShades = (_p = bookmark === null || bookmark === void 0 ? void 0 : bookmark.Settings) === null || _p === void 0 ? void 0 : _p.hillShades;
+                    hillShades = (_o = bookmark === null || bookmark === void 0 ? void 0 : bookmark.Settings) === null || _o === void 0 ? void 0 : _o.hillShades;
                     if (hillShades == null) {
-                        hillShades = (_q = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _q === void 0 ? void 0 : _q.hillShades;
+                        hillShades = (_p = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _p === void 0 ? void 0 : _p.hillShades;
                     }
                     if (hillShades == null) {
                         hillShades = true;
@@ -10549,7 +10678,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 = (_q = defaults.settings) === null || _q === void 0 ? void 0 : _q.globeColor;
                     }
                     if (baseColor == null) {
                         // TODO: Need global default.
@@ -10558,7 +10687,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 = (_r = defaults.settings) === null || _r === void 0 ? void 0 : _r.globeHidden;
                     }
                     if (globeHidden == null) {
                         globeHidden = false;
@@ -10566,7 +10695,7 @@ function renderNavigator(params, bookmark, view) {
                     scene.globe.show = !globeHidden;
                     terrainWireframe = bSettings === null || bSettings === void 0 ? void 0 : bSettings.terrainWireframe;
                     if (terrainWireframe == null) {
-                        terrainWireframe = (_t = defaults.settings) === null || _t === void 0 ? void 0 : _t.terrainWireframe;
+                        terrainWireframe = (_s = defaults.settings) === null || _s === void 0 ? void 0 : _s.terrainWireframe;
                     }
                     if (terrainWireframe == null) {
                         terrainWireframe = false;
@@ -10577,7 +10706,7 @@ function renderNavigator(params, bookmark, view) {
                     });
                     globeAlpha = +(bSettings === null || bSettings === void 0 ? void 0 : bSettings.globeAlpha);
                     if (isNaN(globeAlpha)) {
-                        globeAlpha = +((_u = defaults.settings) === null || _u === void 0 ? void 0 : _u.globeAlpha);
+                        globeAlpha = +((_t = defaults.settings) === null || _t === void 0 ? void 0 : _t.globeAlpha);
                     }
                     if (!scene.globe.translucency.enabled) {
                         scene.globe.translucency.enabled = true;
@@ -10587,12 +10716,11 @@ 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 = (_v = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _v === void 0 ? void 0 : _v.shadows;
+                        shadows = (_u = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _u === void 0 ? void 0 : _u.shadows;
                     }
                     if (shadows == null) {
-                        // Experimenting with default on.
                         shadows = {
-                            enabled: true
+                            enabled: false
                         };
                     }
                     if (shadows.enabled) {
@@ -10615,7 +10743,7 @@ function renderNavigator(params, bookmark, view) {
                     }
                     ambientOcclusion = bSettings === null || bSettings === void 0 ? void 0 : bSettings.ambientOcclusion;
                     if (ambientOcclusion == null) {
-                        ambientOcclusion = (_w = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _w === void 0 ? void 0 : _w.ambientOcclusion;
+                        ambientOcclusion = (_v = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _v === void 0 ? void 0 : _v.ambientOcclusion;
                     }
                     if (ambientOcclusion == null) {
                         ambientOcclusion = {
@@ -10638,7 +10766,7 @@ function renderNavigator(params, bookmark, view) {
                     }
                     lighting = bSettings === null || bSettings === void 0 ? void 0 : bSettings.lighting;
                     if (lighting == null) {
-                        lighting = (_x = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _x === void 0 ? void 0 : _x.lighting;
+                        lighting = (_w = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _w === void 0 ? void 0 : _w.lighting;
                     }
                     if (lighting == null) {
                         lighting = {
@@ -10653,7 +10781,7 @@ function renderNavigator(params, bookmark, view) {
                     }
                     quality = bSettings === null || bSettings === void 0 ? void 0 : bSettings.quality;
                     if (quality == null) {
-                        quality = (_y = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _y === void 0 ? void 0 : _y.quality;
+                        quality = (_x = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _x === void 0 ? void 0 : _x.quality;
                     }
                     if (quality == null) {
                         quality = {
@@ -10664,7 +10792,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 = (_z = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _z === void 0 ? void 0 : _z.dateTime;
+                        dateTime = (_y = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _y === void 0 ? void 0 : _y.dateTime;
                     }
                     if (dateTime != null) {
                         clock = viewer.clock;
@@ -10672,7 +10800,7 @@ function renderNavigator(params, bookmark, view) {
                     }
                     selectedIds = bSettings === null || bSettings === void 0 ? void 0 : bSettings.selectedEntityIds;
                     if (selectedIds == null) {
-                        selectedIds = (_0 = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _0 === void 0 ? void 0 : _0.selectedEntityIds;
+                        selectedIds = (_z = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _z === void 0 ? void 0 : _z.selectedEntityIds;
                     }
                     if (selectedIds != null) {
                         params.manager.VisualsRegister.ClearSelected();
@@ -10685,7 +10813,7 @@ function renderNavigator(params, bookmark, view) {
                     params.manager.VisualsRegister.ClearHidden();
                     hiddenIds = bSettings === null || bSettings === void 0 ? void 0 : bSettings.hiddenEntityIds;
                     if (hiddenIds == null) {
-                        hiddenIds = (_1 = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _1 === void 0 ? void 0 : _1.hiddenEntityIds;
+                        hiddenIds = (_0 = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _0 === void 0 ? void 0 : _0.hiddenEntityIds;
                     }
                     if (hiddenIds != null) {
                         params.manager.VisualsRegister.SetHidden({
@@ -10696,7 +10824,7 @@ function renderNavigator(params, bookmark, view) {
                     params.manager.VisualsRegister.ClearIsolated();
                     isolatedIds = bSettings === null || bSettings === void 0 ? void 0 : bSettings.isolatedEntityIds;
                     if (isolatedIds == null) {
-                        isolatedIds = (_2 = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _2 === void 0 ? void 0 : _2.isolatedEntityIds;
+                        isolatedIds = (_1 = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _1 === void 0 ? void 0 : _1.isolatedEntityIds;
                     }
                     if (isolatedIds != null) {
                         params.manager.VisualsRegister.SetIsolated({
@@ -10707,7 +10835,7 @@ function renderNavigator(params, bookmark, view) {
                     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) {
@@ -10720,7 +10848,7 @@ function renderNavigator(params, bookmark, view) {
                             }
                         }
                     }
-                    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 = [
@@ -10742,13 +10870,13 @@ function renderNavigator(params, bookmark, view) {
                             viewer: params.manager.Viewer,
                         })];
                 case 3:
-                    _7.sent();
+                    _6.sent();
                     renderedRelationEntityIds = bSettings === null || bSettings === void 0 ? void 0 : bSettings.renderedEntityRelations;
                     if (!renderedRelationEntityIds) {
                         renderedRelationEntityIds = [];
                     }
                     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];
                         if (newItemIds.indexOf(id) === -1 ||
@@ -10766,8 +10894,8 @@ function renderNavigator(params, bookmark, view) {
                             bookmark: bookmark
                         })];
                 case 4:
-                    _7.sent();
-                    _7.label = 5;
+                    _6.sent();
+                    _6.label = 5;
                 case 5:
                     if (!(renderedRelationEntityIds.length > 0)) return [3 /*break*/, 7];
                     menuItem = {
@@ -10783,18 +10911,17 @@ function renderNavigator(params, bookmark, view) {
                             item: menuItem
                         })];
                 case 6:
-                    _7.sent();
-                    _7.label = 7;
+                    _6.sent();
+                    _6.label = 7;
                 case 7:
                     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.
                         gOcclusion = true;
                     }
-                    console.log("Applying Ground Occlusion", Boolean(gOcclusion));
                     scene.globe.depthTestAgainstTerrain = Boolean(gOcclusion);
                     return [2 /*return*/];
             }
@@ -10874,7 +11001,7 @@ var ViewRenderEngine;
     ViewRenderEngine.Render = Render;
 })(ViewRenderEngine || (ViewRenderEngine = {}));
 
-var VERSION = "2.2.4";
+var VERSION = "2.2.6";
 
 export { VERSION, CesiumViewMonitor, ViewerUtils, MenuItemManager, EntityRenderEngine, MenuItemCreator, VisualsRegister, RenderManager, EntitiesIdsRenderManager, EntitiesLoadedRenderManager, EntitiesRenderManager, EntityRenderManager, TilesetCadRenderManager, TilesetArbRenderManager, TilesetEntitiesRenderManager, TilesetOsmRenderManager, TilesetPointcloudRenderManager, TilesetGooglePhotosRenderManager, DataSourceStaticKmlManager, RelationsRenderManager, SharedGetters, CesiumParabola, ViewRenderEngine, TileRenderEngine, TilesetRenderEngine, CESIUM_INSPECTOR_KEY, ViewUtils, DrawingUtils, MeasureUtils, EntityUtils };
 //# sourceMappingURL=bruce-cesium.es5.js.map