bruce-cesium 1.6.4 → 1.6.6

package/dist/bruce-cesium.es5.js

@@ -1,5 +1,6 @@
-import { BruceEvent, Cartes, Carto, Entity as Entity$1, Geometry, Tileset, 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 { Cartesian2, Cartographic, Math as Math$1, SceneMode, Cartesian3, Entity, Primitive, Cesium3DTileFeature, Color, HeightReference, EllipsoidTerrainProvider, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Cesium3DTileColorBlendMode, HeadingPitchRange, KmlDataSource, createOsmBuildings, Cesium3DTileStyle, Rectangle, CallbackProperty, createWorldTerrain, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, PolygonPipeline, Cesium3DTileset, Matrix4, IonResource, OrthographicFrustum, JulianDate, EllipsoidGeodesic, sampleTerrainMostDetailed, ColorMaterialProperty, Matrix3, EasingFunction, GeometryInstance } from 'cesium';
+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, Math as Math$1, Color, HeightReference, Cartesian3, EllipsoidTerrainProvider, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, SceneMode, HeadingPitchRange, KmlDataSource, createOsmBuildings, Cesium3DTileStyle, Rectangle, Cesium3DTileColorBlendMode, CallbackProperty, OrthographicFrustum, JulianDate, Cesium3DTileset, Matrix4, IonResource, createWorldTerrain, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, PolygonPipeline, EllipsoidGeodesic, sampleTerrainMostDetailed, ColorMaterialProperty, Matrix3, EasingFunction, GeometryInstance } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -1101,6 +1102,177 @@ var EntityUtils;
     EntityUtils.GetOpacity = GetOpacity;
 })(EntityUtils || (EntityUtils = {}));
 
+function distanceToSegment(fromPoint, toPoint1, toPoint2) {
+    var ab = Cartesian3.subtract(toPoint2, toPoint1, new Cartesian3());
+    var ap = Cartesian3.subtract(fromPoint, toPoint1, new Cartesian3());
+    var e = Cartesian3.dot(ap, ab);
+    if (e <= 0) {
+        return Cartesian3.distance(fromPoint, toPoint1);
+    }
+    var f = Cartesian3.dot(ab, ab);
+    if (e >= f) {
+        return Cartesian3.distance(fromPoint, toPoint2);
+    }
+    var proj = Cartesian3.multiplyByScalar(ab, e / f, new Cartesian3());
+    var projECEF = Cartesian3.add(toPoint1, proj, new Cartesian3());
+    return Cartesian3.distance(fromPoint, projECEF);
+}
+function pointInsidePolygon(point, polygon) {
+    var inside = false;
+    var x = point.latitude;
+    var y = point.longitude;
+    for (var i = 0, j = polygon.length - 1; i < polygon.length; j = i++) {
+        var xi = +polygon[i].latitude;
+        var yi = +polygon[i].longitude;
+        var xj = +polygon[j].latitude;
+        var yj = +polygon[j].longitude;
+        if (isNaN(xi) || isNaN(yi) || isNaN(xj) || isNaN(yj)) {
+            continue;
+        }
+        var intersect = (yi > y) !== (yj > y) && x < ((xj - xi) * (y - yi)) / (yj - yi) + xi;
+        if (intersect) {
+            inside = !inside;
+        }
+    }
+    return inside;
+}
+function distanceToPolygon(point, polygon) {
+    if (pointInsidePolygon(point, polygon)) {
+        var avgAltitude = polygon.reduce(function (sum, vertex) { return sum + vertex.altitude; }, 0) / polygon.length;
+        return Math.abs(point.altitude - avgAltitude);
+    }
+    var pointECEF = Cartesian3.fromDegrees(point.longitude, point.latitude, point.altitude);
+    var minDistance = Infinity;
+    for (var i = 0; i < polygon.length; i++) {
+        var point1 = polygon[i];
+        var point1Latitude = EnsureNumber(point1.latitude);
+        var point1Longitude = EnsureNumber(point1.longitude);
+        if (!point1Latitude && !point1Longitude) {
+            continue;
+        }
+        var point2 = polygon[(i + 1) % polygon.length];
+        var point2Latitude = EnsureNumber(point2.latitude);
+        var point2Longitude = EnsureNumber(point2.longitude);
+        if (!point2Latitude && !point2Longitude) {
+            continue;
+        }
+        var coord1ECEF = Cartesian3.fromDegrees(point1Longitude, point1Latitude, EnsureNumber(point1.altitude));
+        var coord2ECEF = Cartesian3.fromDegrees(point2Longitude, point2Latitude, EnsureNumber(point2.altitude));
+        var distance = distanceToSegment(pointECEF, coord1ECEF, coord2ECEF);
+        minDistance = Math.min(minDistance, distance);
+    }
+    return minDistance;
+}
+// Cache for distance calculations.
+// It will keep only the most recent 3000 entries.
+var distanceCache = new LRUCache(3000);
+function createCacheKey(point, entity) {
+    try {
+        var pointData = {
+            latitude: MathUtils.Round(+point.latitude, 5),
+            longitude: MathUtils.Round(+point.longitude, 5),
+            altitude: MathUtils.Round(+point.altitude, 4)
+        };
+        var entityData = __assign(__assign(__assign({}, entity.location), entity.geometry), entity.boundaries);
+        return JSON.stringify(pointData) + '|' + JSON.stringify(entityData);
+    }
+    catch (e) {
+        console.error(e);
+        return null;
+    }
+}
+/**
+ * Calculates distance while accounting for polylines and polygons.
+ * It does not account for multi-geometry.
+ * @param point
+ * @param entity
+ * @returns
+ */
+function calculateDistance(point, entity) {
+    var cacheKey = createCacheKey(point, entity);
+    var cachedResult = cacheKey ? distanceCache.Get(cacheKey) : null;
+    if (cachedResult || cachedResult == 0) {
+        return cachedResult;
+    }
+    var minDistance = Infinity;
+    var pointPos = Cartesian3.fromDegrees(point.longitude, point.latitude, point.altitude);
+    // We'll start by using the entity location if it's available.
+    var entityPos3d = null;
+    if (entity.location && entity.location.latitude) {
+        var latitude = EnsureNumber(entity.location.latitude);
+        var longitude = EnsureNumber(entity.location.longitude);
+        // Disallowing exact 0.
+        if (latitude || longitude) {
+            var altitude = EnsureNumber(entity.location.altitude);
+            entityPos3d = Cartesian3.fromDegrees(longitude, latitude, altitude);
+        }
+    }
+    if (!isNaN(entityPos3d.x)) {
+        minDistance = Cartesian3.distance(pointPos, entityPos3d);
+    }
+    // Check geometry if it's available.
+    if (entity.geometry) {
+        var passedGeometry = false;
+        if (entity.geometry.Polygon) {
+            var polygonRings = entity.geometry.Polygon;
+            var polygon = typeof polygonRings == "string" ? String(polygonRings) : polygonRings.length ? polygonRings[0].LinearRing : "";
+            var points = polygon ? Geometry.ParsePoints(polygon) : [];
+            if (points.length > 2) {
+                var distance = distanceToPolygon(point, points);
+                if (!isNaN(distance)) {
+                    minDistance = Math.min(minDistance, distance);
+                    passedGeometry = true;
+                }
+            }
+        }
+        if (!passedGeometry && entity.geometry.LineString) {
+            var points = Geometry.ParsePoints(entity.geometry.LineString);
+            if (points.length > 1) {
+                var pointsLen = points.length;
+                for (var i = 0; i < pointsLen; i++) {
+                    var point1 = points[i];
+                    var point1Latitude = EnsureNumber(point1.latitude);
+                    var point1Longitude = EnsureNumber(point1.longitude);
+                    if (!point1Latitude && !point1Longitude) {
+                        continue;
+                    }
+                    var point2 = points[(i + 1) % pointsLen];
+                    var point2Latitude = EnsureNumber(point2.latitude);
+                    var point2Longitude = EnsureNumber(point2.longitude);
+                    if (!point2Latitude && !point2Longitude) {
+                        continue;
+                    }
+                    var coord1ECEF = Cartesian3.fromDegrees(point1Longitude, point1Latitude, EnsureNumber(point1.altitude));
+                    var coord2ECEF = Cartesian3.fromDegrees(point2Longitude, point2Latitude, EnsureNumber(point2.altitude));
+                    var distance = distanceToSegment(pointPos, coord1ECEF, coord2ECEF);
+                    if (!isNaN(distance)) {
+                        minDistance = Math.min(minDistance, distance);
+                        passedGeometry = true;
+                    }
+                }
+            }
+        }
+    }
+    // Backup is using boundaries.
+    if (minDistance === Infinity && entity.boundaries) {
+        var point_1 = {
+            latitude: (EnsureNumber(entity.boundaries.minLatitude) + EnsureNumber(entity.boundaries.maxLatitude)) / 2,
+            longitude: (EnsureNumber(entity.boundaries.minLongitude) + EnsureNumber(entity.boundaries.maxLongitude)) / 2,
+            altitude: 0
+        };
+        // Disallowing exact 0.
+        if (point_1.latitude || point_1.longitude) {
+            if (Carto.ValidateCarto(point_1)) {
+                var boundsPoint = Cartesian3.fromDegrees(point_1.longitude, point_1.latitude, point_1.altitude);
+                minDistance = Cartesian3.distance(pointPos, boundsPoint);
+            }
+        }
+    }
+    if (cacheKey) {
+        distanceCache.Set(cacheKey, minDistance);
+    }
+    return minDistance;
+}
 var RenderManager;
 (function (RenderManager) {
     function DetermineZoomItem(params) {
@@ -1113,11 +1285,15 @@ var RenderManager;
             return null;
         }
         var is2d = viewer.scene.mode === SceneMode.SCENE2D;
-        var cameraPos = viewer.camera.position;
-        if (!Cartes.ValidateCartes3(cameraPos)) {
+        var cameraPos = viewer.camera.positionCartographic;
+        if (!cameraPos || !cameraPos.latitude) {
             return null;
         }
-        var distance = Cartesian3.distance(pos, cameraPos);
+        var distance = calculateDistance({
+            altitude: cameraPos.height,
+            latitude: Math$1.toDegrees(cameraPos.latitude),
+            longitude: Math$1.toDegrees(cameraPos.longitude)
+        }, entity);
         var zoomItem = (!distance && distance != 0) ? null : GetZoomControlFromDistance({
             zoomControl: zoomControl,
             distance: distance
@@ -2311,6 +2487,8 @@ var EntityRenderEngine;
     })(Model3d = EntityRenderEngine.Model3d || (EntityRenderEngine.Model3d = {}));
 })(EntityRenderEngine || (EntityRenderEngine = {}));
 
+var BATCH_SIZE = 500;
+var CHECK_BATCH_SIZE = 250;
 /**
  * Manager for rendering Bruce entities.
  * This will request entities based on setup menu item filter.
@@ -2385,7 +2563,7 @@ var EntitiesRenderManager;
                     this.getter = this.sharedGetters.GetOrCreateFilterGetter({
                         api: api,
                         attrFilter: (_e = this.item.BruceEntity.Filter) !== null && _e !== void 0 ? _e : {},
-                        batchSize: 500,
+                        batchSize: BATCH_SIZE,
                         typeId: this.item.BruceEntity["EntityType.ID"],
                         monitor: this.monitor,
                         viewer: this.viewer,
@@ -2463,7 +2641,7 @@ var EntitiesRenderManager;
         };
         Manager.prototype.doEntityCheck = function (ids) {
             return __awaiter(this, void 0, void 0, function () {
-                var api, CHECK_BATCH_SIZE_1, checkBatch, e_1;
+                var api, checkBatch, e_1;
                 var _this = this;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
@@ -2487,13 +2665,12 @@ var EntitiesRenderManager;
                                 return [2 /*return*/];
                             }
                             if (!(ids.length > 0)) return [3 /*break*/, 4];
-                            CHECK_BATCH_SIZE_1 = 150;
                             checkBatch = function () { return __awaiter(_this, void 0, void 0, function () {
                                 var entityIds, entities;
                                 return __generator(this, function (_a) {
                                     switch (_a.label) {
                                         case 0:
-                                            entityIds = ids.splice(0, CHECK_BATCH_SIZE_1);
+                                            entityIds = ids.splice(0, CHECK_BATCH_SIZE);
                                             return [4 /*yield*/, Entity$1.GetListByIds({
                                                     api: api,
                                                     entityIds: entityIds
@@ -2529,7 +2706,6 @@ var EntitiesRenderManager;
         };
         Manager.prototype.distributeForRender = function (entities) {
             var _this = this;
-            var BATCH_SIZE = 300;
             this.renderQueue = this.renderQueue.concat(entities);
             if (!this.renderQueueInterval && this.renderQueue.length) {
                 this.renderQueueInterval = setInterval(function () {
@@ -2614,6 +2790,8 @@ var EntitiesRenderManager;
     EntitiesRenderManager.Manager = Manager;
 })(EntitiesRenderManager || (EntitiesRenderManager = {}));
 
+var BATCH_SIZE$1 = 500;
+var CHECK_BATCH_SIZE$1 = 250;
 /**
  * Render manager for a group of pre-loaded entities.
  * The entities may or may not have records.
@@ -2648,7 +2826,7 @@ var EntitiesLoadedRenderManager;
                     if (this.disposed) {
                         throw (new Error("This item is disposed."));
                     }
-                    this.getter = new BatchedDataGetter.Getter(this.item.BruceEntity.Entities, this.monitor, 500);
+                    this.getter = new BatchedDataGetter.Getter(this.item.BruceEntity.Entities, this.monitor, BATCH_SIZE$1);
                     this.getterSub = this.getter.OnUpdate.Subscribe(function (entities) {
                         _this.onGetterUpdate(entities);
                     });
@@ -2694,7 +2872,7 @@ var EntitiesLoadedRenderManager;
         };
         Manager.prototype.doEntityCheck = function (ids) {
             return __awaiter(this, void 0, void 0, function () {
-                var api, CHECK_BATCH_SIZE_1, checkBatch, e_1;
+                var api, checkBatch, e_1;
                 var _this = this;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
@@ -2707,13 +2885,12 @@ var EntitiesLoadedRenderManager;
                                 return [2 /*return*/];
                             }
                             if (!(ids.length > 0)) return [3 /*break*/, 4];
-                            CHECK_BATCH_SIZE_1 = 150;
                             checkBatch = function () { return __awaiter(_this, void 0, void 0, function () {
                                 var entityIds, entities;
                                 return __generator(this, function (_a) {
                                     switch (_a.label) {
                                         case 0:
-                                            entityIds = ids.splice(0, CHECK_BATCH_SIZE_1);
+                                            entityIds = ids.splice(0, CHECK_BATCH_SIZE$1);
                                             return [4 /*yield*/, Entity$1.GetListByIds({
                                                     api: api,
                                                     entityIds: entityIds
@@ -4107,6 +4284,7 @@ var VisualsRegister;
     VisualsRegister.Register = Register;
 })(VisualsRegister || (VisualsRegister = {}));
 
+var BATCH_SIZE$2 = 500;
 /**
  * Render manager for rendering an array of entity ids.
  * This will render them in batches to avoid overloading the viewer.
@@ -4140,7 +4318,7 @@ var EntitiesIdsRenderManager;
                     if (this.disposed) {
                         throw (new Error("This item is disposed."));
                     }
-                    this.getter = new BatchedDataGetter.Getter(this.item.BruceEntity.EntityIds, this.monitor, 500);
+                    this.getter = new BatchedDataGetter.Getter(this.item.BruceEntity.EntityIds, this.monitor, BATCH_SIZE$2);
                     this.getterSub = this.getter.OnUpdate.Subscribe(function (ids) {
                         _this.onGetterUpdate(ids);
                     });
@@ -5504,7 +5682,7 @@ var SharedGetters;
 })(SharedGetters || (SharedGetters = {}));
 
 var MAX_BATCHES = 2;
-var BATCH_SIZE = 30;
+var BATCH_SIZE$3 = 30;
 var BATCH_DELAY = 200;
 var MAX_RANGE = 3000;
 var TilesetOsmRenderManager;
@@ -5699,7 +5877,7 @@ var TilesetOsmRenderManager;
                                 var isClose = this.getIsVisualWithinRange(feature, MAX_RANGE);
                                 if (isClose) {
                                     batch.push(feature);
-                                    if (batch.length >= BATCH_SIZE) {
+                                    if (batch.length >= BATCH_SIZE$3) {
                                         return batch;
                                     }
                                 }
@@ -5804,7 +5982,7 @@ var TilesetOsmRenderManager;
                         delete this._loadedCesiumEntities[key];
                         this.totalLoaded -= 1;
                         removed += 1;
-                        if (removed >= BATCH_SIZE) {
+                        if (removed >= BATCH_SIZE$3) {
                             return true;
                         }
                     }
@@ -7338,27 +7516,50 @@ function prepLegacyName(name) {
  * @returns
  */
 function renderDefaultTerrTile(id) {
-    var provider;
-    switch (id) {
-        case ProjectViewTile.EDefaultTerrain.CesiumWorldTerrain:
-            provider = createWorldTerrain({
-                requestVertexNormals: true,
-                requestWaterMask: false
-            });
-            break;
-        case ProjectViewTile.EDefaultTerrain.FlatTerrain:
-            provider = new EllipsoidTerrainProvider();
-            break;
-        case ProjectViewTile.EDefaultTerrain.LINZ:
-            provider = new CesiumTerrainProvider({
-                url: "https://s3-ap-southeast-2.amazonaws.com/digitalnewzealand/PROD/Tilesets/nz-dem",
-                requestVertexNormals: true,
-                requestWaterMask: false,
-                requestMetadata: false
-            });
-            break;
-    }
-    return provider;
+    return __awaiter(this, void 0, void 0, function () {
+        var CESIUM, provider, _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    CESIUM = Cesium;
+                    _a = id;
+                    switch (_a) {
+                        case ProjectViewTile.EDefaultTerrain.CesiumWorldTerrain: return [3 /*break*/, 1];
+                        case ProjectViewTile.EDefaultTerrain.FlatTerrain: return [3 /*break*/, 5];
+                        case ProjectViewTile.EDefaultTerrain.LINZ: return [3 /*break*/, 6];
+                    }
+                    return [3 /*break*/, 7];
+                case 1:
+                    if (!CESIUM.createWorldTerrainAsync) return [3 /*break*/, 3];
+                    return [4 /*yield*/, CESIUM.createWorldTerrainAsync({
+                            requestVertexNormals: true,
+                            requestWaterMask: false
+                        })];
+                case 2:
+                    provider = _b.sent();
+                    return [3 /*break*/, 4];
+                case 3:
+                    provider = createWorldTerrain({
+                        requestVertexNormals: true,
+                        requestWaterMask: false
+                    });
+                    _b.label = 4;
+                case 4: return [3 /*break*/, 7];
+                case 5:
+                    provider = new EllipsoidTerrainProvider();
+                    return [3 /*break*/, 7];
+                case 6:
+                    provider = new CesiumTerrainProvider({
+                        url: "https://s3-ap-southeast-2.amazonaws.com/digitalnewzealand/PROD/Tilesets/nz-dem",
+                        requestVertexNormals: true,
+                        requestWaterMask: false,
+                        requestMetadata: false
+                    });
+                    return [3 /*break*/, 7];
+                case 7: return [2 /*return*/, provider];
+            }
+        });
+    });
 }
 /**
  * Maps a legacy terrain's name to a default terrain id.
@@ -8139,28 +8340,42 @@ var TileRenderEngine;
         (function (LegacyNavigator) {
             function Render(params) {
                 var _a;
-                var bId = createLegacyTerrId(params.data);
-                var curProvider = params.viewer.terrainProvider;
-                if (curProvider._bId && curProvider._bId === bId) {
-                    return;
-                }
-                var provider = null;
-                if (isLegacyTerrainDefault(params.data.Name)) {
-                    var id = legacyTerrIdToDefaultId(params.data.Name);
-                    provider = renderDefaultTerrTile(id);
-                }
-                else if (params.data.SourceUrl) {
-                    provider = new CesiumTerrainProvider({
-                        url: params.data.SourceUrl,
-                        requestWaterMask: params.data.RequestWaterMask,
-                        requestVertexNormals: true
+                return __awaiter(this, void 0, void 0, function () {
+                    var bId, curProvider, provider, id;
+                    return __generator(this, function (_b) {
+                        switch (_b.label) {
+                            case 0:
+                                bId = createLegacyTerrId(params.data);
+                                curProvider = params.viewer.terrainProvider;
+                                if (curProvider._bId && curProvider._bId === bId) {
+                                    return [2 /*return*/];
+                                }
+                                provider = null;
+                                if (!isLegacyTerrainDefault(params.data.Name)) return [3 /*break*/, 2];
+                                id = legacyTerrIdToDefaultId(params.data.Name);
+                                return [4 /*yield*/, renderDefaultTerrTile(id)];
+                            case 1:
+                                provider = (_b.sent());
+                                return [3 /*break*/, 3];
+                            case 2:
+                                if (params.data.SourceUrl) {
+                                    provider = new CesiumTerrainProvider({
+                                        url: params.data.SourceUrl,
+                                        requestWaterMask: params.data.RequestWaterMask,
+                                        requestVertexNormals: true
+                                    });
+                                }
+                                _b.label = 3;
+                            case 3:
+                                if (provider) {
+                                    provider._bId = bId;
+                                    provider._bName = (_a = params.data) === null || _a === void 0 ? void 0 : _a.Name;
+                                    params.viewer.terrainProvider = provider;
+                                }
+                                return [2 /*return*/];
+                        }
                     });
-                }
-                if (provider) {
-                    provider._bId = bId;
-                    provider._bName = (_a = params.data) === null || _a === void 0 ? void 0 : _a.Name;
-                    params.viewer.terrainProvider = provider;
-                }
+                });
             }
             LegacyNavigator.Render = Render;
             function RenderView(params) {
@@ -8213,13 +8428,15 @@ var TileRenderEngine;
                                         break;
                                     }
                                 }
-                                if (terrainTile) {
-                                    Render({
+                                if (!terrainTile) return [3 /*break*/, 6];
+                                return [4 /*yield*/, Render({
                                         data: terrainTile,
                                         viewer: params.viewer,
-                                    });
-                                }
-                                return [2 /*return*/];
+                                    })];
+                            case 5:
+                                _c.sent();
+                                _c.label = 6;
+                            case 6: return [2 /*return*/];
                         }
                     });
                 });
@@ -8231,27 +8448,50 @@ var TileRenderEngine;
             function Render(params) {
                 var _a;
                 return __awaiter(this, void 0, void 0, function () {
-                    var enabledMeta, defaultTerr, provider, api, tileset, url, vertexes, settings;
+                    var enabledMeta, provider_1, leave, defaultTerr, provider, api, tileset, url, vertexes, settings;
                     return __generator(this, function (_b) {
                         switch (_b.label) {
                             case 0:
+                                params.tile = {
+                                    tilesetId: ProjectViewTile.EDefaultTerrain.CesiumWorldTerrain,
+                                    accountId: null
+                                };
                                 enabledMeta = (_a = params.viewer.terrainProvider) === null || _a === void 0 ? void 0 : _a._bMeta;
                                 if ((enabledMeta === null || enabledMeta === void 0 ? void 0 : enabledMeta.tilesetId) === params.tile.tilesetId &&
                                     (enabledMeta === null || enabledMeta === void 0 ? void 0 : enabledMeta.accountId) === params.tile.accountId) {
                                     return [2 /*return*/];
                                 }
+                                // Known default that may have been enabled prior to utility doing it.
+                                if (!enabledMeta) {
+                                    provider_1 = params.viewer.terrainProvider;
+                                    leave = false;
+                                    if (params.tile.tilesetId == ProjectViewTile.EDefaultTerrain.FlatTerrain &&
+                                        provider_1 instanceof EllipsoidTerrainProvider) {
+                                        leave = true;
+                                    }
+                                    // TODO: Check for cesium world terrain if we can easily determine that it's enabled.
+                                    if (leave) {
+                                        provider_1._bMeta = {
+                                            tilesetId: params.tile.tilesetId,
+                                            accountId: params.tile.accountId
+                                        };
+                                        return [2 /*return*/];
+                                    }
+                                }
                                 defaultTerr = params.tile.accountId ? null : ProjectViewTile.DefaultTerrains.find(function (x) { return x.id === params.tile.tilesetId; });
                                 provider = null;
-                                if (!defaultTerr) return [3 /*break*/, 1];
-                                provider = renderDefaultTerrTile(defaultTerr.id);
-                                return [3 /*break*/, 3];
+                                if (!defaultTerr) return [3 /*break*/, 2];
+                                return [4 /*yield*/, renderDefaultTerrTile(defaultTerr.id)];
                             case 1:
+                                provider = (_b.sent());
+                                return [3 /*break*/, 4];
+                            case 2:
                                 api = params.apiGetter.getApi(params.tile.accountId);
                                 return [4 /*yield*/, Tileset.Get({
                                         api: api,
                                         tilesetId: params.tile.tilesetId
                                     })];
-                            case 2:
+                            case 3:
                                 tileset = (_b.sent()).tileset;
                                 url = void 0;
                                 vertexes = true;
@@ -8276,8 +8516,8 @@ var TileRenderEngine;
                                         requestVertexNormals: vertexes
                                     });
                                 }
-                                _b.label = 3;
-                            case 3:
+                                _b.label = 4;
+                            case 4:
                                 if (provider) {
                                     provider._bMeta = {
                                         accountId: params.tile.accountId,
@@ -8456,7 +8696,7 @@ function renderLegacyNavigator(params, bookmark, 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;
     return __awaiter(this, void 0, void 0, function () {
-        var viewer, scene, vSettings, bSettings, defaults, camera, newLens, curLens, transition, pos, gOcclusion, hillShades, baseColor, shadows, size, ambientOcclusion, AO, lighting, light, quality, fxaa, dateTime, clock, terrain, selectedIds, hiddenIds, isolatedIds, entityOpacityMap, entityId, opacity, imagery, renderedRelationEntityIds, curEnabled, newItemIds, _i, curEnabled_1, id, menuItem;
+        var viewer, scene, vSettings, bSettings, defaults, camera, newLens, curLens, transition, pos, terrain, gOcclusion, hillShades, baseColor, 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 (_3) {
             switch (_3.label) {
                 case 0:
@@ -8512,18 +8752,29 @@ 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;
+                    if (!terrain) return [3 /*break*/, 2];
+                    return [4 /*yield*/, TileRenderEngine.Terrain.Navigator.Render({
+                            apiGetter: params.apiGetter,
+                            tile: terrain,
+                            viewer: params.manager.Viewer,
+                        })];
+                case 1:
+                    _3.sent();
+                    _3.label = 2;
+                case 2:
                     gOcclusion = bSettings === null || bSettings === void 0 ? void 0 : bSettings.groundOcclusion;
                     if (gOcclusion == null) {
-                        gOcclusion = (_m = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _m === void 0 ? void 0 : _m.groundOcclusion;
+                        gOcclusion = (_o = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _o === void 0 ? void 0 : _o.groundOcclusion;
                     }
                     if (gOcclusion == null) {
                         // TODO: Need global default.
                         gOcclusion = true;
                     }
                     scene.globe.depthTestAgainstTerrain = Boolean(gOcclusion);
-                    hillShades = (_o = bookmark === null || bookmark === void 0 ? void 0 : bookmark.Settings) === null || _o === void 0 ? void 0 : _o.hillShades;
+                    hillShades = (_p = bookmark === null || bookmark === void 0 ? void 0 : bookmark.Settings) === null || _p === void 0 ? void 0 : _p.hillShades;
                     if (hillShades == null) {
-                        hillShades = (_p = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _p === void 0 ? void 0 : _p.hillShades;
+                        hillShades = (_q = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _q === void 0 ? void 0 : _q.hillShades;
                     }
                     if (hillShades == null) {
                         hillShades = true;
@@ -8531,7 +8782,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 = (_q = defaults.settings) === null || _q === void 0 ? void 0 : _q.globeColor;
+                        baseColor = (_r = defaults.settings) === null || _r === void 0 ? void 0 : _r.globeColor;
                     }
                     if (baseColor == null) {
                         // TODO: Need global default.
@@ -8540,7 +8791,7 @@ function renderNavigator(params, bookmark, view) {
                     scene.globe.baseColor = Color.fromCssColorString(baseColor);
                     shadows = bSettings === null || bSettings === void 0 ? void 0 : bSettings.shadows;
                     if (shadows == null) {
-                        shadows = (_r = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _r === void 0 ? void 0 : _r.shadows;
+                        shadows = (_s = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _s === void 0 ? void 0 : _s.shadows;
                     }
                     if (shadows == null) {
                         shadows = {
@@ -8567,7 +8818,7 @@ function renderNavigator(params, bookmark, view) {
                     }
                     ambientOcclusion = bSettings === null || bSettings === void 0 ? void 0 : bSettings.ambientOcclusion;
                     if (ambientOcclusion == null) {
-                        ambientOcclusion = (_s = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _s === void 0 ? void 0 : _s.ambientOcclusion;
+                        ambientOcclusion = (_t = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _t === void 0 ? void 0 : _t.ambientOcclusion;
                     }
                     if (ambientOcclusion == null) {
                         ambientOcclusion = {
@@ -8590,7 +8841,7 @@ function renderNavigator(params, bookmark, view) {
                     }
                     lighting = bSettings === null || bSettings === void 0 ? void 0 : bSettings.lighting;
                     if (lighting == null) {
-                        lighting = (_t = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _t === void 0 ? void 0 : _t.lighting;
+                        lighting = (_u = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _u === void 0 ? void 0 : _u.lighting;
                     }
                     if (lighting == null) {
                         lighting = {
@@ -8605,7 +8856,7 @@ function renderNavigator(params, bookmark, view) {
                     }
                     quality = bSettings === null || bSettings === void 0 ? void 0 : bSettings.quality;
                     if (quality == null) {
-                        quality = (_u = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _u === void 0 ? void 0 : _u.quality;
+                        quality = (_v = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _v === void 0 ? void 0 : _v.quality;
                     }
                     if (quality == null) {
                         quality = {
@@ -8616,23 +8867,12 @@ function renderNavigator(params, bookmark, view) {
                     fxaa.enabled = Boolean(quality.fxaa);
                     dateTime = bSettings === null || bSettings === void 0 ? void 0 : bSettings.dateTime;
                     if (dateTime == null) {
-                        dateTime = (_v = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _v === void 0 ? void 0 : _v.dateTime;
+                        dateTime = (_w = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _w === void 0 ? void 0 : _w.dateTime;
                     }
                     if (dateTime != null) {
                         clock = viewer.clock;
                         clock.currentTime = JulianDate.fromIso8601(dateTime);
                     }
-                    terrain = (bSettings === null || bSettings === void 0 ? void 0 : bSettings.terrain) != null ? bSettings === null || bSettings === void 0 ? void 0 : bSettings.terrain : (_w = defaults.settings) === null || _w === void 0 ? void 0 : _w.terrain;
-                    if (!terrain) return [3 /*break*/, 2];
-                    return [4 /*yield*/, TileRenderEngine.Terrain.Navigator.Render({
-                            apiGetter: params.apiGetter,
-                            tile: terrain,
-                            viewer: params.manager.Viewer,
-                        })];
-                case 1:
-                    _3.sent();
-                    _3.label = 2;
-                case 2:
                     selectedIds = bSettings === null || bSettings === void 0 ? void 0 : bSettings.selectedEntityIds;
                     if (selectedIds == null) {
                         selectedIds = (_x = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _x === void 0 ? void 0 : _x.selectedEntityIds;