bruce-cesium 2.4.8 → 2.5.0

package/dist/bruce-cesium.umd.js

@@ -2583,11 +2583,29 @@
                 });
                 cEntity._siblingGraphics = [];
                 if (width > 0 && cLineColor) {
-                    var borderPosses = posses;
+                    var borderHeight = undefined;
+                    if (heightRef != Cesium.HeightReference.CLAMP_TO_GROUND) {
+                        if (flattenPoints) {
+                            borderHeight = 0;
+                        }
+                        // Set height to smallest height value from points.
+                        else {
+                            for (var i = 0; i < points.length; i++) {
+                                var point = points[i];
+                                if (!borderHeight || point.altitude < borderHeight) {
+                                    borderHeight = point.altitude;
+                                }
+                            }
+                        }
+                    }
+                    var borderPosses = [];
                     if (flattenPoints) {
                         borderPosses = points.map(function (x) { return Cesium.Cartesian3.fromDegrees(EnsureNumber(x.longitude), EnsureNumber(x.latitude), EnsureNumber(0)); });
                         bruceModels.Cartes.CloseRing3(borderPosses);
                     }
+                    else {
+                        borderPosses = posses.map(function (x) { return x.clone ? x.clone() : __assign({}, x); });
+                    }
                     var cEntityBorder = new Cesium.Entity({
                         // polyline: new Cesium.PolylineGraphics({
                         //     positions: borderPosses,
@@ -2603,11 +2621,12 @@
                             positions: borderPosses,
                             material: cLineColor,
                             heightReference: heightRef,
+                            height: borderHeight,
                             width: width,
                             fill: true,
                             zIndex: zIndex + 1,
                             cornerType: Cesium.CornerType.MITERED,
-                            classificationType: Cesium.ClassificationType.TERRAIN,
+                            classificationType: Cesium.ClassificationType.BOTH,
                             distanceDisplayCondition: getDisplayCondition(params.minDistance, params.maxDistance, width),
                             shadows: Cesium.ShadowMode.ENABLED
                         },
@@ -2634,11 +2653,12 @@
                                 positions: borderPosses,
                                 material: cLineColor,
                                 heightReference: heightRef,
+                                height: borderHeight,
                                 width: width,
                                 fill: true,
                                 zIndex: zIndex + 1,
                                 cornerType: Cesium.CornerType.MITERED,
-                                classificationType: Cesium.ClassificationType.TERRAIN,
+                                classificationType: Cesium.ClassificationType.BOTH,
                                 distanceDisplayCondition: getDisplayCondition(params.minDistance, params.maxDistance, width),
                                 shadows: Cesium.ShadowMode.ENABLED,
                             },
@@ -9611,6 +9631,26 @@
         MenuItemCreator.RenderBookmarkItems = RenderBookmarkItems;
     })(exports.MenuItemCreator || (exports.MenuItemCreator = {}));
 
+    // Used to track if a current in-progress render is the latest.
+    // If we're midway through an async function that is rendering 10 imageries and this changes, then we stop the function.
+    var ITERATION_KEY = "nextspace-tile-render-engine-iteration";
+    function newIteration(viewer, tile) {
+        // Create key specific to the kind of tile we're rendering.
+        var key = ITERATION_KEY + tile;
+        // Generate a new iteration ID, include the tile type in it so we can identify it easier.
+        var value = bruceModels.ObjectUtils.UId() + tile;
+        viewer[key] = value;
+        return value;
+    }
+    /**
+     * Checks if a given iteration is still the active one for a given viewer.
+     * @param viewer
+     * @param iteration
+     */
+    function assertIteration(viewer, iteration) {
+        var suffix = iteration.includes("imagery") ? "imagery" : "terrain";
+        return viewer[ITERATION_KEY + suffix] === iteration;
+    }
     var DEFAULT_BING_KEY = "AqL0uYT5T84jiJeX55_b9zJeeP3MX2p1WLOHH4ljIEPZ7ZL2M81bYLzyYeSwuzzl";
     var DEFAULT_MAPBOX_KEY = "pk.eyJ1IjoiYWxleHRodW5kZXIiLCJhIjoiY2psbHJxbnN5MTBvbzNxczZwMHNpeTI0MCJ9.fdoj2QW_7n8RV4e0NCFgZA";
     var re = /[\0-\x1F\x7F-\x9F\xAD\u0378\u0379\u037F-\u0383\u038B\u038D\u03A2\u0528-\u0530\u0557\u0558\u0560\u0588\u058B-\u058E\u0590\u05C8-\u05CF\u05EB-\u05EF\u05F5-\u0605\u061C\u061D\u06DD\u070E\u070F\u074B\u074C\u07B2-\u07BF\u07FB-\u07FF\u082E\u082F\u083F\u085C\u085D\u085F-\u089F\u08A1\u08AD-\u08E3\u08FF\u0978\u0980\u0984\u098D\u098E\u0991\u0992\u09A9\u09B1\u09B3-\u09B5\u09BA\u09BB\u09C5\u09C6\u09C9\u09CA\u09CF-\u09D6\u09D8-\u09DB\u09DE\u09E4\u09E5\u09FC-\u0A00\u0A04\u0A0B-\u0A0E\u0A11\u0A12\u0A29\u0A31\u0A34\u0A37\u0A3A\u0A3B\u0A3D\u0A43-\u0A46\u0A49\u0A4A\u0A4E-\u0A50\u0A52-\u0A58\u0A5D\u0A5F-\u0A65\u0A76-\u0A80\u0A84\u0A8E\u0A92\u0AA9\u0AB1\u0AB4\u0ABA\u0ABB\u0AC6\u0ACA\u0ACE\u0ACF\u0AD1-\u0ADF\u0AE4\u0AE5\u0AF2-\u0B00\u0B04\u0B0D\u0B0E\u0B11\u0B12\u0B29\u0B31\u0B34\u0B3A\u0B3B\u0B45\u0B46\u0B49\u0B4A\u0B4E-\u0B55\u0B58-\u0B5B\u0B5E\u0B64\u0B65\u0B78-\u0B81\u0B84\u0B8B-\u0B8D\u0B91\u0B96-\u0B98\u0B9B\u0B9D\u0BA0-\u0BA2\u0BA5-\u0BA7\u0BAB-\u0BAD\u0BBA-\u0BBD\u0BC3-\u0BC5\u0BC9\u0BCE\u0BCF\u0BD1-\u0BD6\u0BD8-\u0BE5\u0BFB-\u0C00\u0C04\u0C0D\u0C11\u0C29\u0C34\u0C3A-\u0C3C\u0C45\u0C49\u0C4E-\u0C54\u0C57\u0C5A-\u0C5F\u0C64\u0C65\u0C70-\u0C77\u0C80\u0C81\u0C84\u0C8D\u0C91\u0CA9\u0CB4\u0CBA\u0CBB\u0CC5\u0CC9\u0CCE-\u0CD4\u0CD7-\u0CDD\u0CDF\u0CE4\u0CE5\u0CF0\u0CF3-\u0D01\u0D04\u0D0D\u0D11\u0D3B\u0D3C\u0D45\u0D49\u0D4F-\u0D56\u0D58-\u0D5F\u0D64\u0D65\u0D76-\u0D78\u0D80\u0D81\u0D84\u0D97-\u0D99\u0DB2\u0DBC\u0DBE\u0DBF\u0DC7-\u0DC9\u0DCB-\u0DCE\u0DD5\u0DD7\u0DE0-\u0DF1\u0DF5-\u0E00\u0E3B-\u0E3E\u0E5C-\u0E80\u0E83\u0E85\u0E86\u0E89\u0E8B\u0E8C\u0E8E-\u0E93\u0E98\u0EA0\u0EA4\u0EA6\u0EA8\u0EA9\u0EAC\u0EBA\u0EBE\u0EBF\u0EC5\u0EC7\u0ECE\u0ECF\u0EDA\u0EDB\u0EE0-\u0EFF\u0F48\u0F6D-\u0F70\u0F98\u0FBD\u0FCD\u0FDB-\u0FFF\u10C6\u10C8-\u10CC\u10CE\u10CF\u1249\u124E\u124F\u1257\u1259\u125E\u125F\u1289\u128E\u128F\u12B1\u12B6\u12B7\u12BF\u12C1\u12C6\u12C7\u12D7\u1311\u1316\u1317\u135B\u135C\u137D-\u137F\u139A-\u139F\u13F5-\u13FF\u169D-\u169F\u16F1-\u16FF\u170D\u1715-\u171F\u1737-\u173F\u1754-\u175F\u176D\u1771\u1774-\u177F\u17DE\u17DF\u17EA-\u17EF\u17FA-\u17FF\u180F\u181A-\u181F\u1878-\u187F\u18AB-\u18AF\u18F6-\u18FF\u191D-\u191F\u192C-\u192F\u193C-\u193F\u1941-\u1943\u196E\u196F\u1975-\u197F\u19AC-\u19AF\u19CA-\u19CF\u19DB-\u19DD\u1A1C\u1A1D\u1A5F\u1A7D\u1A7E\u1A8A-\u1A8F\u1A9A-\u1A9F\u1AAE-\u1AFF\u1B4C-\u1B4F\u1B7D-\u1B7F\u1BF4-\u1BFB\u1C38-\u1C3A\u1C4A-\u1C4C\u1C80-\u1CBF\u1CC8-\u1CCF\u1CF7-\u1CFF\u1DE7-\u1DFB\u1F16\u1F17\u1F1E\u1F1F\u1F46\u1F47\u1F4E\u1F4F\u1F58\u1F5A\u1F5C\u1F5E\u1F7E\u1F7F\u1FB5\u1FC5\u1FD4\u1FD5\u1FDC\u1FF0\u1FF1\u1FF5\u1FFF\u200B-\u200F\u202A-\u202E\u2060-\u206F\u2072\u2073\u208F\u209D-\u209F\u20BB-\u20CF\u20F1-\u20FF\u218A-\u218F\u23F4-\u23FF\u2427-\u243F\u244B-\u245F\u2700\u2B4D-\u2B4F\u2B5A-\u2BFF\u2C2F\u2C5F\u2CF4-\u2CF8\u2D26\u2D28-\u2D2C\u2D2E\u2D2F\u2D68-\u2D6E\u2D71-\u2D7E\u2D97-\u2D9F\u2DA7\u2DAF\u2DB7\u2DBF\u2DC7\u2DCF\u2DD7\u2DDF\u2E3C-\u2E7F\u2E9A\u2EF4-\u2EFF\u2FD6-\u2FEF\u2FFC-\u2FFF\u3040\u3097\u3098\u3100-\u3104\u312E-\u3130\u318F\u31BB-\u31BF\u31E4-\u31EF\u321F\u32FF\u4DB6-\u4DBF\u9FCD-\u9FFF\uA48D-\uA48F\uA4C7-\uA4CF\uA62C-\uA63F\uA698-\uA69E\uA6F8-\uA6FF\uA78F\uA794-\uA79F\uA7AB-\uA7F7\uA82C-\uA82F\uA83A-\uA83F\uA878-\uA87F\uA8C5-\uA8CD\uA8DA-\uA8DF\uA8FC-\uA8FF\uA954-\uA95E\uA97D-\uA97F\uA9CE\uA9DA-\uA9DD\uA9E0-\uA9FF\uAA37-\uAA3F\uAA4E\uAA4F\uAA5A\uAA5B\uAA7C-\uAA7F\uAAC3-\uAADA\uAAF7-\uAB00\uAB07\uAB08\uAB0F\uAB10\uAB17-\uAB1F\uAB27\uAB2F-\uABBF\uABEE\uABEF\uABFA-\uABFF\uD7A4-\uD7AF\uD7C7-\uD7CA\uD7FC-\uF8FF\uFA6E\uFA6F\uFADA-\uFAFF\uFB07-\uFB12\uFB18-\uFB1C\uFB37\uFB3D\uFB3F\uFB42\uFB45\uFBC2-\uFBD2\uFD40-\uFD4F\uFD90\uFD91\uFDC8-\uFDEF\uFDFE\uFDFF\uFE1A-\uFE1F\uFE27-\uFE2F\uFE53\uFE67\uFE6C-\uFE6F\uFE75\uFEFD-\uFF00\uFFBF-\uFFC1\uFFC8\uFFC9\uFFD0\uFFD1\uFFD8\uFFD9\uFFDD-\uFFDF\uFFE7\uFFEF-\uFFFB\uFFFE\uFFFF]/g;
@@ -10149,13 +10189,14 @@
                 function RenderView(params) {
                     var _a;
                     return __awaiter(this, void 0, void 0, function () {
-                        var api, view, bookmark, vSettings, bSettings, data, dataNames, i, source, tiles, i, name_1, j, tile, enabled, layers, _loop_1, i, i, tile, layer, i, layer;
+                        var iteration, api, view, bookmark, vSettings, bSettings, data, dataNames, i, source, tiles, i, name_1, j, tile, enabled, layers, _loop_1, i, i, tile, layer, i, layer;
                         return __generator(this, function (_b) {
                             switch (_b.label) {
                                 case 0:
                                     if (!params.apiGetter) {
                                         params.apiGetter = bruceModels.ENVIRONMENT.Api().GetBruceGetter();
                                     }
+                                    iteration = newIteration(params.viewer, "imagery");
                                     api = params.apiGetter.getApi();
                                     return [4 /*yield*/, bruceModels.ProjectView.Get({
                                             api: api,
@@ -10163,6 +10204,9 @@
                                         })];
                                 case 1:
                                     view = (_b.sent()).view;
+                                    if (!assertIteration(params.viewer, iteration)) {
+                                        return [2 /*return*/];
+                                    }
                                     bookmark = null;
                                     if (!params.bookmarkId) return [3 /*break*/, 3];
                                     return [4 /*yield*/, bruceModels.ProjectViewBookmark.Get({
@@ -10172,6 +10216,9 @@
                                         })];
                                 case 2:
                                     bookmark = (_b.sent()).bookmark;
+                                    if (!assertIteration(params.viewer, iteration)) {
+                                        return [2 /*return*/];
+                                    }
                                     _b.label = 3;
                                 case 3:
                                     vSettings = view.Settings;
@@ -10195,6 +10242,9 @@
                                         })];
                                 case 4:
                                     _b.sent();
+                                    if (!assertIteration(params.viewer, iteration)) {
+                                        return [2 /*return*/];
+                                    }
                                     for (i = 0; i < dataNames.length; i++) {
                                         name_1 = dataNames[i];
                                         for (j = 0; j < tiles.length; j++) {
@@ -10241,6 +10291,9 @@
                                     if (layer) {
                                         layers.push(layer);
                                     }
+                                    if (!assertIteration(params.viewer, iteration)) {
+                                        return [2 /*return*/];
+                                    }
                                     _b.label = 7;
                                 case 7:
                                     i++;
@@ -10452,13 +10505,66 @@
                 Navigator.GetOrCreateLayer = GetOrCreateLayer;
                 function Render(params) {
                     return __awaiter(this, void 0, void 0, function () {
-                        var i, enabled, curEnabled, toDisable, curEnabledArr, _loop_2, i, i, _loop_3, i;
+                        var tmpTiles, _loop_2, i, organize, iteration, curEnabled, toDisable, _loop_3, i, i, organized, i, enabled;
                         return __generator(this, function (_a) {
                             switch (_a.label) {
                                 case 0:
                                     if (!params.apiGetter) {
                                         params.apiGetter = bruceModels.ENVIRONMENT.Api().GetBruceGetter();
                                     }
+                                    tmpTiles = [];
+                                    _loop_2 = function (i) {
+                                        var tile = params.tiles[i];
+                                        if (!tmpTiles.find(function (x) { return (x.accountId == tile.accountId) && (x.tilesetId == tile.tilesetId); })) {
+                                            tmpTiles.push(tile);
+                                        }
+                                    };
+                                    for (i = 0; i < params.tiles.length; i++) {
+                                        _loop_2(i);
+                                    }
+                                    params.tiles = tmpTiles;
+                                    organize = function () {
+                                        var curEnabledArr = [];
+                                        for (var i = 0; i < curEnabled.length; i++) {
+                                            var layer = curEnabled.get(i);
+                                            curEnabledArr.push(layer);
+                                        }
+                                        var _loop_4 = function (i) {
+                                            var enabled = params.tiles[i];
+                                            var layer = curEnabledArr.find(function (x) { var _a, _b; return ((_a = x._bMeta) === null || _a === void 0 ? void 0 : _a.accountId) === enabled.accountId && ((_b = x._bMeta) === null || _b === void 0 ? void 0 : _b.tilesetId) === enabled.tilesetId; });
+                                            if (layer) {
+                                                params.viewer.imageryLayers.raiseToTop(layer);
+                                                layer.alpha = EnsureNumber(enabled.alpha == null ? 1 : enabled.alpha);
+                                                layer.brightness = EnsureNumber(enabled.brightness == null ? 1 : enabled.brightness);
+                                                layer.contrast = EnsureNumber(enabled.contrast == null ? 1 : enabled.contrast);
+                                                layer.hue = EnsureNumber(enabled.hue == null ? 0 : enabled.hue);
+                                                layer.saturation = EnsureNumber(enabled.saturation == null ? 1 : enabled.saturation);
+                                                layer.gamma = EnsureNumber(enabled.gamma == null ? 1 : enabled.gamma);
+                                            }
+                                        };
+                                        for (var i = 0; i < params.tiles.length; i++) {
+                                            _loop_4(i);
+                                        }
+                                        params.viewer.scene.requestRender();
+                                    };
+                                    iteration = newIteration(params.viewer, "imagery");
+                                    curEnabled = params.viewer.imageryLayers;
+                                    toDisable = [];
+                                    _loop_3 = function (i) {
+                                        var layer = curEnabled.get(i);
+                                        var meta = layer === null || layer === void 0 ? void 0 : layer._bMeta;
+                                        var disable = !params.tiles.find(function (x) { return x.accountId === (meta === null || meta === void 0 ? void 0 : meta.accountId) && x.tilesetId === (meta === null || meta === void 0 ? void 0 : meta.tilesetId); });
+                                        if (disable) {
+                                            toDisable.push(layer);
+                                        }
+                                    };
+                                    for (i = 0; i < curEnabled.length; i++) {
+                                        _loop_3(i);
+                                    }
+                                    for (i = 0; i < toDisable.length; i++) {
+                                        params.viewer.imageryLayers.remove(toDisable[i]);
+                                    }
+                                    organized = false;
                                     i = 0;
                                     _a.label = 1;
                                 case 1:
@@ -10474,48 +10580,21 @@
                                         })];
                                 case 2:
                                     _a.sent();
+                                    if (!assertIteration(params.viewer, iteration)) {
+                                        return [2 /*return*/];
+                                    }
+                                    // Organize as we load in case there are lots of imageries.
+                                    // We want to ensure what the user sees is as close to correct as we can get.
+                                    organize();
+                                    organized = true;
                                     _a.label = 3;
                                 case 3:
                                     i++;
                                     return [3 /*break*/, 1];
                                 case 4:
-                                    curEnabled = params.viewer.imageryLayers;
-                                    toDisable = [];
-                                    curEnabledArr = [];
-                                    _loop_2 = function (i) {
-                                        var layer = curEnabled.get(i);
-                                        var meta = layer === null || layer === void 0 ? void 0 : layer._bMeta;
-                                        var disable = !params.tiles.find(function (x) { return x.accountId === (meta === null || meta === void 0 ? void 0 : meta.accountId) && x.tilesetId === (meta === null || meta === void 0 ? void 0 : meta.tilesetId); });
-                                        if (disable) {
-                                            toDisable.push(layer);
-                                        }
-                                        else {
-                                            curEnabledArr.push(layer);
-                                        }
-                                    };
-                                    for (i = 0; i < curEnabled.length; i++) {
-                                        _loop_2(i);
+                                    if (!organized) {
+                                        organize();
                                     }
-                                    for (i = 0; i < toDisable.length; i++) {
-                                        params.viewer.imageryLayers.remove(toDisable[i]);
-                                    }
-                                    _loop_3 = function (i) {
-                                        var enabled = params.tiles[i];
-                                        var layer = curEnabledArr.find(function (x) { var _a, _b; return ((_a = x._bMeta) === null || _a === void 0 ? void 0 : _a.accountId) === enabled.accountId && ((_b = x._bMeta) === null || _b === void 0 ? void 0 : _b.tilesetId) === enabled.tilesetId; });
-                                        if (layer) {
-                                            params.viewer.imageryLayers.raiseToTop(layer);
-                                            layer.alpha = EnsureNumber(enabled.alpha == null ? 1 : enabled.alpha);
-                                            layer.brightness = EnsureNumber(enabled.brightness == null ? 1 : enabled.brightness);
-                                            layer.contrast = EnsureNumber(enabled.contrast == null ? 1 : enabled.contrast);
-                                            layer.hue = EnsureNumber(enabled.hue == null ? 0 : enabled.hue);
-                                            layer.saturation = EnsureNumber(enabled.saturation == null ? 1 : enabled.saturation);
-                                            layer.gamma = EnsureNumber(enabled.gamma == null ? 1 : enabled.gamma);
-                                        }
-                                    };
-                                    for (i = 0; i < params.tiles.length; i++) {
-                                        _loop_3(i);
-                                    }
-                                    params.viewer.scene.requestRender();
                                     return [2 /*return*/];
                             }
                         });
@@ -10572,13 +10651,14 @@
                 function RenderView(params) {
                     var _a, _b;
                     return __awaiter(this, void 0, void 0, function () {
-                        var api, view, bookmark, vSettings, bSettings, terrainTiles, terrainTile, terrainTileName, i, tile;
+                        var iteration, api, view, bookmark, vSettings, bSettings, terrainTiles, terrainTile, terrainTileName, i, tile;
                         return __generator(this, function (_c) {
                             switch (_c.label) {
                                 case 0:
                                     if (!params.apiGetter) {
                                         params.apiGetter = bruceModels.ENVIRONMENT.Api().GetBruceGetter();
                                     }
+                                    iteration = newIteration(params.viewer, "terrain");
                                     api = params.apiGetter.getApi();
                                     return [4 /*yield*/, bruceModels.ProjectView.Get({
                                             api: api,
@@ -10587,6 +10667,9 @@
                                 case 1:
                                     view = (_c.sent()).view;
                                     bookmark = null;
+                                    if (!assertIteration(params.viewer, iteration)) {
+                                        return [2 /*return*/];
+                                    }
                                     if (!params.bookmarkId) return [3 /*break*/, 3];
                                     return [4 /*yield*/, bruceModels.ProjectViewBookmark.Get({
                                             api: api,
@@ -10595,6 +10678,9 @@
                                         })];
                                 case 2:
                                     bookmark = (_c.sent()).bookmark;
+                                    if (!assertIteration(params.viewer, iteration)) {
+                                        return [2 /*return*/];
+                                    }
                                     _c.label = 3;
                                 case 3:
                                     vSettings = view.Settings;
@@ -10615,6 +10701,9 @@
                                         })];
                                 case 4:
                                     _c.sent();
+                                    if (!assertIteration(params.viewer, iteration)) {
+                                        return [2 /*return*/];
+                                    }
                                     for (i = 0; i < terrainTiles.length; i++) {
                                         tile = terrainTiles[i];
                                         if (TileRenderEngine.CompareLegacyNames(tile.Name, terrainTileName)) {
@@ -10629,6 +10718,9 @@
                                         })];
                                 case 5:
                                     _c.sent();
+                                    if (!assertIteration(params.viewer, iteration)) {
+                                        return [2 /*return*/];
+                                    }
                                     _c.label = 6;
                                 case 6:
                                     params.viewer.scene.requestRender();
@@ -10644,13 +10736,14 @@
                 function Render(params) {
                     var _a;
                     return __awaiter(this, void 0, void 0, function () {
-                        var enabledMeta, provider_1, leave, defaultTerr, provider, api, tileset, url, vertexes, settings;
+                        var iteration, enabledMeta, provider_1, leave, defaultTerr, provider, api, tileset, url, vertexes, settings;
                         return __generator(this, function (_b) {
                             switch (_b.label) {
                                 case 0:
                                     if (!params.apiGetter) {
                                         params.apiGetter = bruceModels.ENVIRONMENT.Api().GetBruceGetter();
                                     }
+                                    iteration = newIteration(params.viewer, "terrain");
                                     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) {
@@ -10664,8 +10757,9 @@
                                             provider_1 instanceof Cesium.EllipsoidTerrainProvider) {
                                             leave = true;
                                         }
-                                        // TODO: Check for cesium world terrain if we can easily determine that it's enabled.
+                                        // TODO: Also check for "cesium world terrain" if we can easily determine that it's enabled.
                                         if (leave) {
+                                            // Mark it so we don't have to do this magic logic again.
                                             provider_1._bMeta = {
                                                 tilesetId: params.tile.tilesetId,
                                                 accountId: params.tile.accountId
@@ -10691,12 +10785,18 @@
                                     // When loading stuff in the same account as the default it's likely already loaded,
                                     // but if we just made an API instance for some external account then it won't be loaded yet.
                                     _b.sent();
+                                    if (!assertIteration(params.viewer, iteration)) {
+                                        return [2 /*return*/];
+                                    }
                                     return [4 /*yield*/, bruceModels.Tileset.Get({
                                             api: api,
                                             tilesetId: params.tile.tilesetId
                                         })];
                                 case 4:
                                     tileset = (_b.sent()).tileset;
+                                    if (!assertIteration(params.viewer, iteration)) {
+                                        return [2 /*return*/];
+                                    }
                                     url = void 0;
                                     vertexes = true;
                                     if (tileset.type === bruceModels.Tileset.EType.Terrain) {
@@ -10821,6 +10921,14 @@
                     }
                 };
             }
+            else if (provider instanceof Cesium.EllipsoidTerrainProvider) {
+                return {
+                    terrain: {
+                        tilesetId: bruceModels.ProjectViewTile.EDefaultTerrain.FlatTerrain,
+                        accountId: null
+                    }
+                };
+            }
             return null;
         }
         ViewUtils.GatherTerrainTile = GatherTerrainTile;
@@ -11236,13 +11344,34 @@
     var MIN_SHADOW_SIZE = 2048;
     var MAX_SHADOW_SIZE = 32768;
     var RELATION_MENU_ITEM_ID = "BOOKMARK_ENTITY_RELATIONS";
+    // Used to track if a current in-progress render is the latest.
+    // If we're midway through an async function that is rendering a bookmark and this changes, then we stop the function.
+    var ITERATION_KEY$1 = "nextspace-view-render-engine-iteration";
+    /**
+     * Creates a new iteration state.
+     * This will stop any existing renders from processing to their end.
+     * @param viewer
+     * @returns
+     */
+    function newIteration$1(viewer) {
+        viewer[ITERATION_KEY$1] = bruceModels.ObjectUtils.UId();
+        return viewer[ITERATION_KEY$1];
+    }
+    /**
+     * Checks if a given iteration is still the active one for a given viewer.
+     * @param viewer
+     * @param iteration
+     */
+    function assertIteration$1(viewer, iteration) {
+        return viewer[ITERATION_KEY$1] == iteration;
+    }
     /**
      * Renders DATA_VERSION = 1 navigator.
      * @param params
      * @param bookmark
      * @param view
      */
-    function renderLegacyNavigator(params, bookmark, view) {
+    function renderLegacyNavigator(iteration, params, bookmark, view) {
         var _a, _b, _c, _d, _e;
         return __awaiter(this, void 0, void 0, function () {
             var vSettings, bSettings, manager, VR, scene, baseColor, frustum, curFrustum, camera, pos, go, fxaa, pointer, clock, timeStr, enabledItems, newItemIds, _i, enabledItems_1, id, menuItem;
@@ -11262,15 +11391,17 @@
                             })];
                     case 1:
                         _f.sent();
-                        return [4 /*yield*/, exports.TileRenderEngine.Map.LegacyNavigator.RenderView({
-                                apiGetter: params.apiGetter,
-                                bookmarkId: params.bookmarkId,
-                                viewer: manager.Viewer,
-                                viewId: params.viewId,
-                                ignoreIds: []
-                            })];
-                    case 2:
-                        _f.sent();
+                        if (!assertIteration$1(params.viewer, iteration)) {
+                            return [2 /*return*/];
+                        }
+                        // We don't wait for imageries to load, this does not affect rendering other things.
+                        exports.TileRenderEngine.Map.LegacyNavigator.RenderView({
+                            apiGetter: params.apiGetter,
+                            bookmarkId: params.bookmarkId,
+                            viewer: manager.Viewer,
+                            viewId: params.viewId,
+                            ignoreIds: []
+                        });
                         baseColor = bSettings === null || bSettings === void 0 ? void 0 : bSettings.globeColor;
                         if (baseColor == null) {
                             // TODO: Need global default.
@@ -11344,7 +11475,7 @@
                                 });
                             }
                         }
-                        if (!bookmark) return [3 /*break*/, 4];
+                        if (!bookmark) return [3 /*break*/, 3];
                         return [4 /*yield*/, exports.MenuItemCreator.RenderBookmarkItems({
                                 apiGetter: params.apiGetter,
                                 getters: params.getters,
@@ -11352,11 +11483,14 @@
                                 view: view,
                                 bookmark: bookmark
                             })];
-                    case 3:
+                    case 2:
                         _f.sent();
-                        _f.label = 4;
-                    case 4:
-                        if (!((_e = bSettings === null || bSettings === void 0 ? void 0 : bSettings.drawnRelationEntityIDs) === null || _e === void 0 ? void 0 : _e.length)) return [3 /*break*/, 6];
+                        if (!assertIteration$1(params.viewer, iteration)) {
+                            return [2 /*return*/];
+                        }
+                        _f.label = 3;
+                    case 3:
+                        if (!((_e = bSettings === null || bSettings === void 0 ? void 0 : bSettings.drawnRelationEntityIDs) === null || _e === void 0 ? void 0 : _e.length)) return [3 /*break*/, 5];
                         menuItem = {
                             id: RELATION_MENU_ITEM_ID,
                             Caption: "Entity relations",
@@ -11370,10 +11504,13 @@
                                 getters: params.getters,
                                 item: menuItem
                             })];
-                    case 5:
+                    case 4:
                         _f.sent();
-                        _f.label = 6;
-                    case 6: return [2 /*return*/];
+                        if (!assertIteration$1(params.viewer, iteration)) {
+                            return [2 /*return*/];
+                        }
+                        _f.label = 5;
+                    case 5: return [2 /*return*/];
                 }
             });
         });
@@ -11384,7 +11521,7 @@
      * @param bookmark
      * @param view
      */
-    function renderNavigator(params, bookmark, view) {
+    function renderNavigator(iteration, 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;
         return __awaiter(this, void 0, void 0, function () {
             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;
@@ -11450,6 +11587,9 @@
                             })];
                     case 1:
                         _6.sent();
+                        if (!assertIteration$1(params.viewer, iteration)) {
+                            return [2 /*return*/];
+                        }
                         _6.label = 2;
                     case 2:
                         hillShades = (_o = bookmark === null || bookmark === void 0 ? void 0 : bookmark.Settings) === null || _o === void 0 ? void 0 : _o.hillShades;
@@ -11648,13 +11788,12 @@
                                 }
                             ];
                         }
-                        return [4 /*yield*/, exports.TileRenderEngine.Map.Navigator.Render({
-                                apiGetter: params.apiGetter,
-                                tiles: imagery,
-                                viewer: params.manager.Viewer,
-                            })];
-                    case 3:
-                        _6.sent();
+                        // We don't wait for imageries to load, this does not affect rendering other things.
+                        exports.TileRenderEngine.Map.Navigator.Render({
+                            apiGetter: params.apiGetter,
+                            tiles: imagery,
+                            viewer: params.manager.Viewer,
+                        });
                         renderedRelationEntityIds = bSettings === null || bSettings === void 0 ? void 0 : bSettings.renderedEntityRelations;
                         if (!renderedRelationEntityIds) {
                             renderedRelationEntityIds = [];
@@ -11670,18 +11809,21 @@
                                 });
                             }
                         }
-                        if (!bookmark) return [3 /*break*/, 5];
+                        if (!bookmark) return [3 /*break*/, 4];
                         return [4 /*yield*/, exports.MenuItemCreator.RenderBookmarkItems({
                                 getters: params.getters,
                                 manager: params.manager,
                                 view: view,
                                 bookmark: bookmark
                             })];
-                    case 4:
+                    case 3:
                         _6.sent();
-                        _6.label = 5;
-                    case 5:
-                        if (!(renderedRelationEntityIds.length > 0)) return [3 /*break*/, 7];
+                        if (!assertIteration$1(params.viewer, iteration)) {
+                            return [2 /*return*/];
+                        }
+                        _6.label = 4;
+                    case 4:
+                        if (!(renderedRelationEntityIds.length > 0)) return [3 /*break*/, 6];
                         menuItem = {
                             id: RELATION_MENU_ITEM_ID,
                             Caption: "Entity relations",
@@ -11694,10 +11836,13 @@
                                 getters: params.getters,
                                 item: menuItem
                             })];
-                    case 6:
+                    case 5:
                         _6.sent();
-                        _6.label = 7;
-                    case 7:
+                        if (!assertIteration$1(params.viewer, iteration)) {
+                            return [2 /*return*/];
+                        }
+                        _6.label = 6;
+                    case 6:
                         gOcclusion = bSettings === null || bSettings === void 0 ? void 0 : bSettings.groundOcclusion;
                         if (gOcclusion == null) {
                             gOcclusion = (_5 = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _5 === void 0 ? void 0 : _5.groundOcclusion;
@@ -11716,7 +11861,7 @@
         function Render(params) {
             var _a;
             return __awaiter(this, void 0, void 0, function () {
-                var api, view, _b, bookmark, bookmarkId, _c, version, bWidget;
+                var iteration, api, view, _b, bookmark, bookmarkId, _c, version, bWidget;
                 return __generator(this, function (_d) {
                     switch (_d.label) {
                         case 0:
@@ -11729,6 +11874,7 @@
                             else if (!params.viewer && params.manager) {
                                 params.viewer = params.manager.Viewer;
                             }
+                            iteration = newIteration$1(params.viewer);
                             if (!params.getters) {
                                 params.getters = bruceModels.ENVIRONMENT.Api();
                             }
@@ -11773,17 +11919,23 @@
                             bookmark = _c;
                             _d.label = 7;
                         case 7:
+                            if (!assertIteration$1(params.viewer, iteration)) {
+                                return [2 /*return*/];
+                            }
                             version = view.DataVersion;
                             if (!(version == 1)) return [3 /*break*/, 9];
-                            return [4 /*yield*/, renderLegacyNavigator(params, bookmark, view)];
+                            return [4 /*yield*/, renderLegacyNavigator(iteration, params, bookmark, view)];
                         case 8:
                             _d.sent();
                             return [3 /*break*/, 11];
-                        case 9: return [4 /*yield*/, renderNavigator(params, bookmark, view)];
+                        case 9: return [4 /*yield*/, renderNavigator(iteration, params, bookmark, view)];
                         case 10:
                             _d.sent();
                             _d.label = 11;
                         case 11:
+                            if (!assertIteration$1(params.viewer, iteration)) {
+                                return [2 /*return*/];
+                            }
                             bWidget = (_a = params.viewer) === null || _a === void 0 ? void 0 : _a[VIEWER_BOOKMARKS_WIDGET_KEY];
                             if (bWidget) {
                                 bWidget.ViewId = params.viewId ? params.viewId : view === null || view === void 0 ? void 0 : view.ID;
@@ -14605,7 +14757,7 @@
         ViewerUtils.CreateWidgets = CreateWidgets;
     })(exports.ViewerUtils || (exports.ViewerUtils = {}));
 
-    var VERSION$1 = "2.4.8";
+    var VERSION$1 = "2.5.0";
 
     exports.VERSION = VERSION$1;
     exports.CesiumViewMonitor = CesiumViewMonitor;