bruce-cesium 3.1.8 → 3.2.0

package/dist/bruce-cesium.umd.js

@@ -246,18 +246,17 @@
          * @returns
          */
         function GetTerrainHeight(params) {
-            var _a;
             return __awaiter(this, void 0, void 0, function () {
-                var pos3d, viewer, terrainProviderReady, sample, height, e_1;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
+                var pos3d, viewer, sample, height, e_1;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
                         case 0:
                             pos3d = params.pos3d, viewer = params.viewer;
-                            _b.label = 1;
+                            _a.label = 1;
                         case 1:
-                            _b.trys.push([1, 3, , 4]);
-                            terrainProviderReady = Boolean((_a = viewer === null || viewer === void 0 ? void 0 : viewer.terrainProvider) === null || _a === void 0 ? void 0 : _a.ready);
-                            if (!terrainProviderReady) {
+                            _a.trys.push([1, 3, , 4]);
+                            // If the terrain provider is not ready let's not ping it.
+                            if (!viewer.terrainProvider || viewer.terrainProvider["ready"] == false) {
                                 return [2 /*return*/, {
                                         height: 0,
                                         error: "Terrain provider not ready."
@@ -270,7 +269,7 @@
                             }
                             return [4 /*yield*/, Cesium.sampleTerrainMostDetailed(viewer.scene.terrainProvider, [Cesium.Cartographic.fromCartesian(pos3d)])];
                         case 2:
-                            sample = _b.sent();
+                            sample = _a.sent();
                             height = (sample === null || sample === void 0 ? void 0 : sample.length) ? sample[0].height : null;
                             if (isNaN(height)) {
                                 return [2 /*return*/, {
@@ -282,7 +281,7 @@
                                     height: height
                                 }];
                         case 3:
-                            e_1 = _b.sent();
+                            e_1 = _a.sent();
                             return [2 /*return*/, {
                                     height: 0,
                                     error: e_1
@@ -453,15 +452,14 @@
          * @param minimumHeight height relative to ground
          */
         function RaisePos3d(viewer, pos3d, minimumHeight) {
-            var _a;
             if (minimumHeight === void 0) { minimumHeight = 0; }
             return __awaiter(this, void 0, void 0, function () {
-                var terrainProviderReady, carto, terrainCarto, sample, terrainHeight;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
+                var carto, terrainCarto, sample, terrainHeight;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
                         case 0:
-                            terrainProviderReady = Boolean((_a = viewer === null || viewer === void 0 ? void 0 : viewer.terrainProvider) === null || _a === void 0 ? void 0 : _a.ready);
-                            if (!terrainProviderReady) {
+                            // If the terrain provider is not ready let's not ping it.
+                            if (!viewer.terrainProvider || viewer.terrainProvider["ready"] == false) {
                                 return [2 /*return*/, pos3d];
                             }
                             carto = Cesium.Cartographic.fromCartesian(pos3d);
@@ -472,12 +470,12 @@
                             return [3 /*break*/, 3];
                         case 1: return [4 /*yield*/, Cesium.sampleTerrainMostDetailed(viewer.scene.terrainProvider, [terrainCarto])];
                         case 2:
-                            sample = _b.sent();
+                            sample = _a.sent();
                             terrainHeight = (sample === null || sample === void 0 ? void 0 : sample.length) ? sample[0].height : null;
                             if (terrainHeight != null) {
                                 carto.height = Math.max(carto.height, terrainHeight + minimumHeight);
                             }
-                            _b.label = 3;
+                            _a.label = 3;
                         case 3: return [2 /*return*/, Cesium.Cartesian3.fromRadians(carto.longitude, carto.latitude, carto.height)];
                     }
                 });
@@ -862,12 +860,12 @@
          * @param params
          */
         function GetLocation(params) {
-            var _a, _b;
+            var _a;
             return __awaiter(this, void 0, void 0, function () {
-                var api, viewer, samples, visualRegister, minimumAlt, paddingAlt, MAX_DISTANCE_BETWEEN_SAMPLES, MAX_TERRAIN_SAMPLES, terrainSamples, MAX_API_CALLS, apiCalls, MAX_VALID_SAMPLES, validSamples, MIN_RECT_DIAGONAL_LENGTH, terrainProviderReady, data, spheres, processPosHeight, ensureHeightRefs, getEntityPositions, allPosses, i, sample, samplePosses, valid, j, samplePos, k, allPos, distance, rect, factor, marginX, marginY, diagonalLen, terrData, posCarto, height, MIN_POSSES_LEN, allPointSphere, rectSphere, combinedSphere;
+                var api, viewer, samples, visualRegister, minimumAlt, paddingAlt, MAX_DISTANCE_BETWEEN_SAMPLES, MAX_TERRAIN_SAMPLES, terrainSamples, MAX_API_CALLS, apiCalls, MAX_VALID_SAMPLES, validSamples, MIN_RECT_DIAGONAL_LENGTH, data, spheres, processPosHeight, ensureHeightRefs, getEntityPositions, allPosses, i, sample, samplePosses, valid, j, samplePos, k, allPos, distance, rect, factor, marginX, marginY, diagonalLen, terrData, posCarto, height, MIN_POSSES_LEN, allPointSphere, rectSphere, combinedSphere;
                 var _this = this;
-                return __generator(this, function (_c) {
-                    switch (_c.label) {
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
                         case 0:
                             api = params.api, viewer = params.viewer, samples = params.samples, visualRegister = params.visualRegister, minimumAlt = params.minimumAlt, paddingAlt = params.paddingAlt;
                             if (!paddingAlt) {
@@ -884,7 +882,6 @@
                             if (MIN_RECT_DIAGONAL_LENGTH < 1500) {
                                 MIN_RECT_DIAGONAL_LENGTH = 1500;
                             }
-                            terrainProviderReady = Boolean((_a = viewer === null || viewer === void 0 ? void 0 : viewer.terrainProvider) === null || _a === void 0 ? void 0 : _a.ready);
                             data = {
                                 pos3d: null,
                                 rectangle: null,
@@ -901,7 +898,7 @@
                                             if (!(carto === null || carto === void 0 ? void 0 : carto.latitude)) return [3 /*break*/, 6];
                                             baseHeight = 0;
                                             if (!(heightRef == null || heightRef == Cesium.HeightReference.RELATIVE_TO_GROUND || heightRef == Cesium.HeightReference.NONE)) return [3 /*break*/, 5];
-                                            if (!terrainProviderReady) return [3 /*break*/, 4];
+                                            if (!(!viewer.terrainProvider || viewer.terrainProvider["ready"] == false)) return [3 /*break*/, 4];
                                             if (!(terrainSamples > MAX_TERRAIN_SAMPLES)) return [3 /*break*/, 1];
                                             baseHeight = viewer.scene.globe.getHeight(carto);
                                             return [3 /*break*/, 3];
@@ -1302,13 +1299,13 @@
                             }); };
                             allPosses = [];
                             i = 0;
-                            _c.label = 1;
+                            _b.label = 1;
                         case 1:
                             if (!(i < samples.length)) return [3 /*break*/, 4];
                             sample = samples[i];
                             return [4 /*yield*/, getEntityPositions(sample)];
                         case 2:
-                            samplePosses = _c.sent();
+                            samplePosses = _b.sent();
                             if (samplePosses === null || samplePosses === void 0 ? void 0 : samplePosses.length) {
                                 valid = !(allPosses === null || allPosses === void 0 ? void 0 : allPosses.length);
                                 if (!valid) {
@@ -1335,7 +1332,7 @@
                                     }
                                 }
                             }
-                            _c.label = 3;
+                            _b.label = 3;
                         case 3:
                             i++;
                             return [3 /*break*/, 1];
@@ -1353,7 +1350,7 @@
                                 terrData = exports.ViewUtils.GatherTerrainTile({
                                     viewer: viewer
                                 });
-                                if (((_b = terrData === null || terrData === void 0 ? void 0 : terrData.terrain) === null || _b === void 0 ? void 0 : _b.tilesetId) == bruceModels.ProjectViewTile.EDefaultTerrain.FlatTerrain) {
+                                if (((_a = terrData === null || terrData === void 0 ? void 0 : terrData.terrain) === null || _a === void 0 ? void 0 : _a.tilesetId) == bruceModels.ProjectViewTile.EDefaultTerrain.FlatTerrain) {
                                     MIN_RECT_DIAGONAL_LENGTH = 0;
                                 }
                                 posCarto = Cesium.Cartographic.fromCartesian(allPosses[0]);
@@ -2107,8 +2104,7 @@
      * @returns
      */
     var getTerrainOffset = function (viewer, pos3d) {
-        var _a;
-        if (!((_a = viewer.terrainProvider) === null || _a === void 0 ? void 0 : _a.ready)) {
+        if (!viewer.terrainProvider || viewer.terrainProvider["ready"] == false) {
             return null;
         }
         var terrain = exports.ViewUtils.GatherTerrainTile({
@@ -2122,8 +2118,8 @@
         var keys = Array.from(_terrainCache.Entries());
         var tolerance = viewer.entities.values.length > TERRAIN_HEIGHT_TOLERANCE_LOW_ENTITY_THRESHOLD ? TERRAIN_HEIGHT_TOLERANCE : TERRAIN_HEIGHT_TOLERANCE_LOW_COUNT;
         for (var i = 0; i < keys.length; i++) {
-            var _b = keys[i], key_1 = _b[0], offset_1 = _b[1];
-            var _c = key_1.split("_"), terrainId2 = _c[0], x = _c[1], y = _c[2], z = _c[3];
+            var _a = keys[i], key_1 = _a[0], offset_1 = _a[1];
+            var _b = key_1.split("_"), terrainId2 = _b[0], x = _b[1], y = _b[2], z = _b[3];
             if (terrainId2 != terrainId) {
                 continue;
             }
@@ -2999,6 +2995,35 @@
         }
         return newPosses;
     }
+    /**
+     * Util to support both old and newer versions of Cesium for creating 3D model primitives.
+     * @param url
+     */
+    function getModelEntity(url, scale) {
+        return __awaiter(this, void 0, void 0, function () {
+            var CESIUM;
+            return __generator(this, function (_a) {
+                CESIUM = Cesium;
+                // Newer versions of Cesium have a fromGltfAsync method.
+                if (CESIUM.Model.hasOwnProperty("fromGltfAsync")) {
+                    return [2 /*return*/, CESIUM.Model.fromGltfAsync({
+                            url: url,
+                            asynchronous: true,
+                            scale: scale
+                        })];
+                }
+                // Older versions of Cesium have a fromGltf method.
+                else if (Cesium.Model.hasOwnProperty("fromGltf")) {
+                    return [2 /*return*/, CESIUM.Model.fromGltf({
+                            url: url,
+                            asynchronous: true,
+                            scale: scale
+                        })];
+                }
+                return [2 /*return*/, null];
+            });
+        });
+    }
     (function (EntityRenderEngine) {
         function Render(params) {
             var _a, _b, _c, _d, _e, _f, _g, _h;
@@ -3983,6 +4008,7 @@
         var Model3d;
         (function (Model3d) {
             function Render(params) {
+                var _this = this;
                 var entity = params.entity;
                 var transform = entity === null || entity === void 0 ? void 0 : entity.transform;
                 var heading = EnsureNumber(transform === null || transform === void 0 ? void 0 : transform.heading);
@@ -4051,54 +4077,58 @@
                 var fileRadiusKey = "model3d_".concat(params.lodUrl, "_").concat(scale * styleScale, "_radius");
                 var heightProm = _fileRadiusCache.Get(fileRadiusKey);
                 if (!heightProm) {
-                    heightProm = new Promise(function (res) {
-                        try {
-                            // We'll have an async secondary model created for calculating boundaries.
-                            // Once calculated we remove it.
-                            var modelPrim_1 = Cesium.Model.fromGltf({
-                                url: params.lodUrl,
-                                asynchronous: true,
-                                scale: scale * styleScale
-                            });
-                            modelPrim_1.readyPromise.then(function (loaded) {
-                                var kill = function () {
-                                    if (params.viewer && !params.viewer.isDestroyed() && params.viewer.scene.primitives.contains(modelPrim_1)) {
-                                        params.viewer.scene.primitives.remove(modelPrim_1);
-                                    }
-                                    if (!modelPrim_1.isDestroyed()) {
-                                        modelPrim_1.destroy();
-                                    }
-                                };
-                                if (!cEntity || !(loaded === null || loaded === void 0 ? void 0 : loaded.boundingSphere)) {
-                                    kill();
+                    heightProm = new Promise(function (res) { return __awaiter(_this, void 0, void 0, function () {
+                        var modelPrim_1, e_6;
+                        return __generator(this, function (_a) {
+                            switch (_a.label) {
+                                case 0:
+                                    _a.trys.push([0, 2, , 3]);
+                                    return [4 /*yield*/, getModelEntity(params.lodUrl, scale * styleScale)];
+                                case 1:
+                                    modelPrim_1 = _a.sent();
+                                    modelPrim_1.readyPromise.then(function (loaded) {
+                                        var kill = function () {
+                                            if (params.viewer && !params.viewer.isDestroyed() && params.viewer.scene.primitives.contains(modelPrim_1)) {
+                                                params.viewer.scene.primitives.remove(modelPrim_1);
+                                            }
+                                            if (!modelPrim_1.isDestroyed()) {
+                                                modelPrim_1.destroy();
+                                            }
+                                        };
+                                        if (!cEntity || !(loaded === null || loaded === void 0 ? void 0 : loaded.boundingSphere)) {
+                                            kill();
+                                            res(null);
+                                            return;
+                                        }
+                                        var radius = loaded.boundingSphere.radius;
+                                        var centerOffset = loaded.boundingSphere.center;
+                                        if (centerOffset) {
+                                            // Add the center offset to the radius because I am not good at math.
+                                            var magnitude = Cesium.Cartesian3.magnitude(centerOffset);
+                                            radius += magnitude;
+                                            // Extra padding if the model is super not centered.
+                                            // I saw some strange boundaries for some bad models.
+                                            if (magnitude > 100) {
+                                                radius += 100;
+                                            }
+                                        }
+                                        kill();
+                                        res(radius);
+                                    }).catch(function (e) {
+                                        console.error(e);
+                                        res(null);
+                                    });
+                                    params.viewer.scene.primitives.add(modelPrim_1);
+                                    return [3 /*break*/, 3];
+                                case 2:
+                                    e_6 = _a.sent();
+                                    console.error(e_6);
                                     res(null);
-                                    return;
-                                }
-                                var radius = loaded.boundingSphere.radius;
-                                var centerOffset = loaded.boundingSphere.center;
-                                if (centerOffset) {
-                                    // Add the center offset to the radius because I am not good at math.
-                                    var magnitude = Cesium.Cartesian3.magnitude(centerOffset);
-                                    radius += magnitude;
-                                    // Extra padding if the model is super not centered.
-                                    // I saw some strange boundaries for some bad models.
-                                    if (magnitude > 100) {
-                                        radius += 100;
-                                    }
-                                }
-                                kill();
-                                res(radius);
-                            }).catch(function (e) {
-                                console.error(e);
-                                res(null);
-                            });
-                            params.viewer.scene.primitives.add(modelPrim_1);
-                        }
-                        catch (e) {
-                            console.error(e);
-                            res(null);
-                        }
-                    });
+                                    return [3 /*break*/, 3];
+                                case 3: return [2 /*return*/];
+                            }
+                        });
+                    }); });
                     _fileRadiusCache.Set(fileRadiusKey, heightProm);
                 }
                 heightProm.then(function (radius) {
@@ -5636,13 +5666,12 @@
             for (var i = 0; i < entities.length; i++) {
                 _loop_1(i);
             }
-            return;
-        }
-        if (!isAlive$1(viewer, visual)) {
-            return;
         }
         if (visual instanceof Cesium.Primitive) ;
         else if (visual instanceof Cesium.Cesium3DTileFeature) {
+            if (!isAlive$1(viewer, visual)) {
+                return;
+            }
             var orgColor = visual[ORG_COLOR_KEY];
             if (orgColor == null) {
                 orgColor = visual.color;
@@ -5698,13 +5727,12 @@
             for (var i = 0; i < entities.length; i++) {
                 _loop_2(i);
             }
-            return;
-        }
-        if (!isAlive$1(viewer, visual)) {
-            return;
         }
         if (visual instanceof Cesium.Primitive) ;
         else if (visual instanceof Cesium.Cesium3DTileFeature) {
+            if (!isAlive$1(viewer, visual)) {
+                return;
+            }
             var orgColor = visual[ORG_COLOR_KEY];
             if (orgColor != null) {
                 visual.color = orgColor;
@@ -5792,11 +5820,12 @@
                 this.cameraCullerDispose = null;
             };
             Register.prototype.ForceUpdate = function (params) {
+                var _a;
                 var entityIds = params.entityIds;
                 for (var i = 0; i < entityIds.length; i++) {
                     var entityId = entityIds[i];
                     updateEntity(this.viewer, entityId, this);
-                    this.OnUpdate.Trigger({
+                    (_a = this.onUpdate) === null || _a === void 0 ? void 0 : _a.Trigger({
                         type: EVisualUpdateType.Update,
                         entityId: entityId
                     });
@@ -8635,6 +8664,28 @@
         });
     }
     (function (TilesetRenderEngine) {
+        /**
+         * Returns when a tileset is ready to be used.
+         * This should be waited for after adding at tileset to the scene and BEFORE any settings are applied to it.
+         * @param cTileset
+         * @returns
+         */
+        function OnTilesetReady(cTileset) {
+            return __awaiter(this, void 0, void 0, function () {
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            if (!cTileset["readyPromise"]) return [3 /*break*/, 2];
+                            return [4 /*yield*/, cTileset["readyPromise"]];
+                        case 1:
+                            _a.sent();
+                            _a.label = 2;
+                        case 2: return [2 /*return*/];
+                    }
+                });
+            });
+        }
+        TilesetRenderEngine.OnTilesetReady = OnTilesetReady;
         function ApplyPosition(params) {
             var _a;
             var cTileset = params.cTileset;
@@ -8806,7 +8857,7 @@
                         case 2:
                             cTileset_1 = _a.sent();
                             params.viewer.scene.primitives.add(cTileset_1);
-                            cTileset_1.readyPromise.then(function () {
+                            OnTilesetReady(cTileset_1).then(function () {
                                 var _a, _b, _c, _d;
                                 try {
                                     if (!isAlive$2(params.viewer, cTileset_1)) {
@@ -8856,7 +8907,7 @@
                         case 6:
                             cTileset_2 = _a.sent();
                             params.viewer.scene.primitives.add(cTileset_2);
-                            cTileset_2.readyPromise.then(function () {
+                            OnTilesetReady(cTileset_2).then(function () {
                                 var _a;
                                 try {
                                     if (!isAlive$2(params.viewer, cTileset_2)) {
@@ -8937,7 +8988,7 @@
                         case 4:
                             cTileset = _a.sent();
                             viewer.scene.primitives.add(cTileset);
-                            cTileset.readyPromise.then(function () {
+                            OnTilesetReady(cTileset).then(function () {
                                 var _a;
                                 try {
                                     if (!isAlive$2(viewer, cTileset)) {
@@ -9426,7 +9477,9 @@
                 var minMemory = 80;
                 var totalPerTileset = Math.max(this.watched.length ? maxMemory / this.watched.length : maxMemory, minMemory);
                 this.watched.forEach(function (x) {
-                    x.maximumMemoryUsage = totalPerTileset;
+                    // Newer Cesium killed this property.
+                    // TODO: Check if it's needed then.
+                    x["maximumMemoryUsage"] = totalPerTileset;
                 });
             };
             MemoryWatcher.prototype.destroy = function () {
@@ -9569,7 +9622,7 @@
                                     return [2 /*return*/];
                                 }
                                 this.viewer.scene.requestRender();
-                                cTileset.readyPromise.then(function () {
+                                exports.TilesetRenderEngine.OnTilesetReady(this.cTileset).then(function () {
                                     try {
                                         if (_this.disposed || cTileset.isDestroyed()) {
                                             return;
@@ -10473,6 +10526,7 @@
                 if (this.disposed) {
                     return;
                 }
+                this.disposed = true;
                 clearInterval(this.queueCheckInterval);
                 if (this.cTileset) {
                     var viewer = this.viewer;
@@ -10481,6 +10535,9 @@
                         this.viewer.scene.primitives.remove(this.cTileset);
                         this.viewer.scene.requestRender();
                     }
+                    else if (this.cTileset && !this.cTileset.isDestroyed()) {
+                        this.cTileset.destroy();
+                    }
                     this.cTileset = null;
                 }
                 this.visualsManager.RemoveRegos({
@@ -10494,33 +10551,69 @@
                 var menuItem = this.item;
                 this.sourceId = (_a = menuItem.BruceEntity) === null || _a === void 0 ? void 0 : _a.SourceId;
                 this.entityTypeId = (_b = menuItem.BruceEntity) === null || _b === void 0 ? void 0 : _b["EntityType.ID"];
-                this.cTileset = Cesium.createOsmBuildings();
-                this.cTileset.show = true;
-                this.viewer.scene.requestRender();
-                if (this.sourceId) {
-                    if (menuItem.ghostLoading == true) {
-                        this.cTileset.style = new Cesium.Cesium3DTileStyle({
-                            color: "rgba(255, 255, 250, 0.98)"
-                        });
-                    }
-                    this.viewer.scene.primitives.add(this.cTileset);
-                    this.cTileset.tileLoad.addEventListener(function (tile) {
-                        try {
-                            _this.mapCTile(tile);
-                        }
-                        catch (e) {
-                            console.error(e);
+                (function () { return __awaiter(_this, void 0, void 0, function () {
+                    var CESIUM, cTileset;
+                    var _this = this;
+                    return __generator(this, function (_a) {
+                        switch (_a.label) {
+                            case 0:
+                                CESIUM = Cesium;
+                                if (!CESIUM["createOsmBuildingsAsync"]) return [3 /*break*/, 2];
+                                return [4 /*yield*/, CESIUM.createOsmBuildingsAsync({})];
+                            case 1:
+                                cTileset = _a.sent();
+                                return [3 /*break*/, 3];
+                            case 2:
+                                if (CESIUM["createOsmBuildings"]) {
+                                    cTileset = CESIUM.createOsmBuildings();
+                                }
+                                else {
+                                    console.warn("'tileset-osm-render-manager.ts' could not locate a create function for OSM buildings.");
+                                    return [2 /*return*/];
+                                }
+                                _a.label = 3;
+                            case 3:
+                                if (this.disposed) {
+                                    if (this.cTileset && !this.cTileset.isDestroyed()) {
+                                        this.cTileset.destroy();
+                                        this.cTileset = null;
+                                    }
+                                    return [2 /*return*/];
+                                }
+                                this.cTileset = cTileset;
+                                if (this.sourceId) {
+                                    if (menuItem.ghostLoading == true) {
+                                        this.cTileset.style = new Cesium.Cesium3DTileStyle({
+                                            color: "rgba(255, 255, 250, 0.98)"
+                                        });
+                                    }
+                                    this.viewer.scene.primitives.add(this.cTileset);
+                                    this.cTileset.tileLoad.addEventListener(function (tile) {
+                                        if (_this.disposed) {
+                                            return;
+                                        }
+                                        try {
+                                            _this.mapCTile(tile);
+                                        }
+                                        catch (e) {
+                                            console.error(e);
+                                        }
+                                    });
+                                    this.queueCheckInterval = setInterval(function () {
+                                        if (_this.featureQueue.length > 0) {
+                                            _this.processQueue();
+                                        }
+                                    }, 5000);
+                                }
+                                else {
+                                    this.viewer.scene.primitives.add(this.cTileset);
+                                }
+                                this.cTileset.show = true;
+                                this.viewer.scene.requestRender();
+                                return [2 /*return*/];
                         }
                     });
-                    this.queueCheckInterval = setInterval(function () {
-                        if (_this.featureQueue.length > 0) {
-                            _this.processQueue();
-                        }
-                    }, 5000);
-                }
-                else {
-                    this.viewer.scene.primitives.add(this.cTileset);
-                }
+                }); })();
             };
             Manager.prototype.mapCTile = function (tile) {
                 return __awaiter(this, void 0, void 0, function () {
@@ -10857,7 +10950,7 @@
                                     return [2 /*return*/];
                                 }
                                 this.viewer.scene.requestRender();
-                                cTileset.readyPromise.then(function () {
+                                exports.TilesetRenderEngine.OnTilesetReady(this.cTileset).then(function () {
                                     try {
                                         if (_this.disposed || _this.viewer.isDestroyed()) {
                                             return;
@@ -10882,7 +10975,7 @@
                                 if (isNaN(attenuationMax)) {
                                     attenuationMax = 20;
                                 }
-                                this.cTileset.readyPromise.then(function () {
+                                exports.TilesetRenderEngine.OnTilesetReady(this.cTileset).then(function () {
                                     exports.TilesetRenderEngine.ApplySettings({
                                         cTileset: _this.cTileset,
                                         settings: {
@@ -11064,7 +11157,7 @@
                                     return [2 /*return*/];
                                 }
                                 this.viewer.scene.requestRender();
-                                cTileset.readyPromise.then(function () {
+                                exports.TilesetRenderEngine.OnTilesetReady(this.cTileset).then(function () {
                                     try {
                                         if (_this.disposed || _this.viewer.isDestroyed()) {
                                             return;
@@ -11441,7 +11534,7 @@
                                     return [2 /*return*/];
                                 }
                                 this.viewer.scene.requestRender();
-                                this.cTileset.readyPromise.then(function () {
+                                exports.TilesetRenderEngine.OnTilesetReady(this.cTileset).then(function () {
                                     try {
                                         if (_this.item.ApplyStyles ||
                                             _this.item.Type == bruceModels.MenuItem.EType.IonTileset) {
@@ -11455,18 +11548,18 @@
                                         console.error(e);
                                     }
                                 });
-                                this.cTileset.tileLoad.addEventListener(function (tile) {
-                                    try {
-                                        _this.mapCTile(tile);
-                                    }
-                                    catch (e) {
-                                        console.error(e);
-                                    }
-                                });
                                 return [2 /*return*/];
                         }
                     });
                 }); })();
+                this.cTileset.tileLoad.addEventListener(function (tile) {
+                    try {
+                        _this.mapCTile(tile);
+                    }
+                    catch (e) {
+                        console.error(e);
+                    }
+                });
             };
             Manager.prototype.onCTilesetLoad = function () {
                 if (this.item.FlyTo) {
@@ -12044,6 +12137,7 @@
                 if (this.disposed) {
                     return;
                 }
+                this.disposed = true;
                 this.doDispose();
             };
             Manager.prototype.doDispose = function () {
@@ -13108,6 +13202,8 @@
                 this._terrainListenRemoval();
                 this._terrainListenRemoval = null;
             }
+            clearTimeout(this.checkTimeout);
+            this.checkTimeout = null;
             _super.prototype.Dispose.call(this);
         };
         WidgetBranding.prototype._generateStyles = function () {
@@ -13154,12 +13250,16 @@
                                 return [2 /*return*/, false];
                             }
                             provider = viewer.scene.terrainProvider;
-                            return [4 /*yield*/, provider.readyPromise];
-                        case 1:
-                            _c.sent();
-                            if (provider != viewer.scene.terrainProvider) {
+                            // Newer Cesium versions have a ready property
+                            if (provider["ready"] == false) {
                                 return [2 /*return*/];
                             }
+                            if (!provider["readyPromise"]) return [3 /*break*/, 2];
+                            return [4 /*yield*/, provider["readyPromise"]];
+                        case 1:
+                            _c.sent();
+                            _c.label = 2;
+                        case 2:
                             credits = provider === null || provider === void 0 ? void 0 : provider._tileCredits;
                             return [2 /*return*/, credits && credits.length > 0 && credits[0]._html && ((_b = credits[0]._html) === null || _b === void 0 ? void 0 : _b.includes("ion-credit.png"))];
                     }
@@ -13167,21 +13267,23 @@
             });
         };
         WidgetBranding.prototype._updateIon = function () {
+            var _a, _b;
             return __awaiter(this, void 0, void 0, function () {
-                var shouldShow, e_1;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
+                var shouldShow, e_1, provider;
+                var _this = this;
+                return __generator(this, function (_c) {
+                    switch (_c.label) {
                         case 0:
                             if (this.updatingIon) {
                                 return [2 /*return*/];
                             }
                             this.updatingIon = true;
-                            _a.label = 1;
+                            _c.label = 1;
                         case 1:
-                            _a.trys.push([1, 3, , 4]);
+                            _c.trys.push([1, 3, , 4]);
                             return [4 /*yield*/, this._shouldShowIonLogo()];
                         case 2:
-                            shouldShow = _a.sent();
+                            shouldShow = _c.sent();
                             if (shouldShow && !this.ion.parentElement) {
                                 this._element.insertBefore(this.ion, this._element.firstChild);
                             }
@@ -13190,11 +13292,22 @@
                             }
                             return [3 /*break*/, 4];
                         case 3:
-                            e_1 = _a.sent();
+                            e_1 = _c.sent();
                             console.error(e_1);
                             return [3 /*break*/, 4];
                         case 4:
                             this.updatingIon = false;
+                            provider = !((_a = this._viewer) === null || _a === void 0 ? void 0 : _a.scene) || ((_b = this._viewer) === null || _b === void 0 ? void 0 : _b.isDestroyed()) ? null : this._viewer.scene.terrainProvider;
+                            if (provider) {
+                                // Newer Cesium versions have a ready property
+                                // If it's not ready, we'll re-check in a moment.
+                                if (provider["ready"] == false) {
+                                    clearTimeout(this.checkTimeout);
+                                    this.checkTimeout = setTimeout(function () {
+                                        _this._updateIon();
+                                    }, 1000);
+                                }
+                            }
                             return [2 /*return*/];
                     }
                 });
@@ -15857,7 +15970,7 @@
                     }
                     this._lastSelectedId = firstId;
                     try {
-                        url = "http://localhost:3000/embed";
+                        url = "https://embed.nextspace-dev.net/embed";
                         urlParams = new URLSearchParams();
                         urlParams.append("id", "info-view");
                         urlParams.append("entityId", firstId);
@@ -16652,7 +16765,7 @@
                             case bruceModels.ProjectViewTile.EDefaultTerrain.FlatTerrain: return [3 /*break*/, 5];
                             case bruceModels.ProjectViewTile.EDefaultTerrain.LINZ: return [3 /*break*/, 6];
                         }
-                        return [3 /*break*/, 7];
+                        return [3 /*break*/, 10];
                     case 1:
                         if (!CESIUM.createWorldTerrainAsync) return [3 /*break*/, 3];
                         return [4 /*yield*/, CESIUM.createWorldTerrainAsync({
@@ -16663,24 +16776,37 @@
                         provider = _b.sent();
                         return [3 /*break*/, 4];
                     case 3:
-                        provider = Cesium.createWorldTerrain({
-                            requestVertexNormals: true,
-                            requestWaterMask: false
-                        });
+                        if (CESIUM.createWorldTerrain) {
+                            provider = CESIUM.createWorldTerrain({
+                                requestVertexNormals: true,
+                                requestWaterMask: false
+                            });
+                        }
                         _b.label = 4;
-                    case 4: return [3 /*break*/, 7];
+                    case 4: return [3 /*break*/, 10];
                     case 5:
                         provider = new Cesium.EllipsoidTerrainProvider();
-                        return [3 /*break*/, 7];
+                        return [3 /*break*/, 10];
                     case 6:
-                        provider = new Cesium.CesiumTerrainProvider({
+                        if (!CESIUM.CesiumTerrainProvider.hasOwnProperty("fromUrl")) return [3 /*break*/, 8];
+                        return [4 /*yield*/, CESIUM.CesiumTerrainProvider.fromUrl("https://s3-ap-southeast-2.amazonaws.com/digitalnewzealand/PROD/Tilesets/nz-dem", {
+                                requestVertexNormals: true,
+                                requestWaterMask: false,
+                                requestMetadata: false
+                            })];
+                    case 7:
+                        provider = _b.sent();
+                        return [3 /*break*/, 9];
+                    case 8:
+                        provider = new CESIUM.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];
+                        _b.label = 9;
+                    case 9: return [3 /*break*/, 10];
+                    case 10: return [2 /*return*/, provider];
                 }
             });
         });
@@ -16802,132 +16928,202 @@
      */
     function renderDefaultMapTile(apiGetter, id) {
         return __awaiter(this, void 0, void 0, function () {
-            var provider, _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
-            var _p, _q, _r, _s, _t, _u;
-            return __generator(this, function (_v) {
-                switch (_v.label) {
+            var CESIUM, provider, _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
+            var _y, _z, _0, _1, _2, _3, _4, _5, _6;
+            return __generator(this, function (_7) {
+                switch (_7.label) {
                     case 0:
+                        CESIUM = Cesium;
                         _a = id;
                         switch (_a) {
                             case bruceModels.ProjectViewTile.EDefaultImagery.BingMapsAerial: return [3 /*break*/, 1];
-                            case bruceModels.ProjectViewTile.EDefaultImagery.BingMapsAerialWithLabels: return [3 /*break*/, 3];
-                            case bruceModels.ProjectViewTile.EDefaultImagery.BingMapsRoads: return [3 /*break*/, 5];
-                            case bruceModels.ProjectViewTile.EDefaultImagery.MapboxSatellite: return [3 /*break*/, 7];
-                            case bruceModels.ProjectViewTile.EDefaultImagery.MapBoxStreets: return [3 /*break*/, 9];
-                            case bruceModels.ProjectViewTile.EDefaultImagery.MapBoxStreetsClassic: return [3 /*break*/, 11];
-                            case bruceModels.ProjectViewTile.EDefaultImagery.EsriWorldImagery: return [3 /*break*/, 13];
-                            case bruceModels.ProjectViewTile.EDefaultImagery.EsriWorldStreetMap: return [3 /*break*/, 14];
-                            case bruceModels.ProjectViewTile.EDefaultImagery.EsriNationalGeographic: return [3 /*break*/, 15];
-                            case bruceModels.ProjectViewTile.EDefaultImagery.OpenStreetMap: return [3 /*break*/, 16];
-                            case bruceModels.ProjectViewTile.EDefaultImagery.LINZ: return [3 /*break*/, 17];
-                            case bruceModels.ProjectViewTile.EDefaultImagery.StamenWaterColor: return [3 /*break*/, 18];
-                            case bruceModels.ProjectViewTile.EDefaultImagery.StamenToner: return [3 /*break*/, 19];
-                            case bruceModels.ProjectViewTile.EDefaultImagery.Grid: return [3 /*break*/, 20];
+                            case bruceModels.ProjectViewTile.EDefaultImagery.BingMapsAerialWithLabels: return [3 /*break*/, 7];
+                            case bruceModels.ProjectViewTile.EDefaultImagery.BingMapsRoads: return [3 /*break*/, 13];
+                            case bruceModels.ProjectViewTile.EDefaultImagery.MapboxSatellite: return [3 /*break*/, 19];
+                            case bruceModels.ProjectViewTile.EDefaultImagery.MapBoxStreets: return [3 /*break*/, 21];
+                            case bruceModels.ProjectViewTile.EDefaultImagery.MapBoxStreetsClassic: return [3 /*break*/, 23];
+                            case bruceModels.ProjectViewTile.EDefaultImagery.EsriWorldImagery: return [3 /*break*/, 25];
+                            case bruceModels.ProjectViewTile.EDefaultImagery.EsriWorldStreetMap: return [3 /*break*/, 29];
+                            case bruceModels.ProjectViewTile.EDefaultImagery.EsriNationalGeographic: return [3 /*break*/, 33];
+                            case bruceModels.ProjectViewTile.EDefaultImagery.OpenStreetMap: return [3 /*break*/, 37];
+                            case bruceModels.ProjectViewTile.EDefaultImagery.LINZ: return [3 /*break*/, 38];
+                            case bruceModels.ProjectViewTile.EDefaultImagery.StamenWaterColor: return [3 /*break*/, 39];
+                            case bruceModels.ProjectViewTile.EDefaultImagery.StamenToner: return [3 /*break*/, 40];
+                            case bruceModels.ProjectViewTile.EDefaultImagery.Grid: return [3 /*break*/, 41];
                         }
-                        return [3 /*break*/, 21];
+                        return [3 /*break*/, 42];
                     case 1:
-                        _c = (_b = Cesium.BingMapsImageryProvider).bind;
-                        _p = {
-                            url: "https://dev.virtualearth.net",
+                        if (!Cesium.BingMapsImageryProvider.hasOwnProperty("fromUrl")) return [3 /*break*/, 4];
+                        _c = (_b = CESIUM.BingMapsImageryProvider).fromUrl;
+                        _d = ["https://dev.virtualearth.net"];
+                        _y = {
                             mapStyle: Cesium.BingMapsStyle.AERIAL
                         };
                         return [4 /*yield*/, findKey(apiGetter, bruceModels.ProgramKey.EProgramId.BingMaps, DEFAULT_BING_KEY)];
-                    case 2:
-                        provider = new (_c.apply(_b, [void 0, (_p.key = _v.sent(),
-                                _p)]))();
-                        return [3 /*break*/, 21];
+                    case 2: return [4 /*yield*/, _c.apply(_b, _d.concat([(_y.key = _7.sent(),
+                                _y)]))];
                     case 3:
-                        _e = (_d = Cesium.BingMapsImageryProvider).bind;
-                        _q = {
+                        provider = _7.sent();
+                        return [3 /*break*/, 6];
+                    case 4:
+                        _f = (_e = CESIUM.BingMapsImageryProvider).bind;
+                        _z = {
                             url: "https://dev.virtualearth.net",
-                            mapStyle: Cesium.BingMapsStyle.AERIAL_WITH_LABELS
+                            mapStyle: Cesium.BingMapsStyle.AERIAL
                         };
                         return [4 /*yield*/, findKey(apiGetter, bruceModels.ProgramKey.EProgramId.BingMaps, DEFAULT_BING_KEY)];
-                    case 4:
-                        provider = new (_e.apply(_d, [void 0, (_q.key = _v.sent(),
-                                _q)]))();
-                        return [3 /*break*/, 21];
                     case 5:
-                        _g = (_f = Cesium.BingMapsImageryProvider).bind;
-                        _r = {
+                        provider = new (_f.apply(_e, [void 0, (_z.key = _7.sent(),
+                                _z)]))();
+                        _7.label = 6;
+                    case 6: return [3 /*break*/, 42];
+                    case 7:
+                        if (!Cesium.BingMapsImageryProvider.hasOwnProperty("fromUrl")) return [3 /*break*/, 10];
+                        _h = (_g = CESIUM.BingMapsImageryProvider).fromUrl;
+                        _j = ["https://dev.virtualearth.net"];
+                        _0 = {
+                            mapStyle: Cesium.BingMapsStyle.AERIAL_WITH_LABELS
+                        };
+                        return [4 /*yield*/, findKey(apiGetter, bruceModels.ProgramKey.EProgramId.BingMaps, DEFAULT_BING_KEY)];
+                    case 8: return [4 /*yield*/, _h.apply(_g, _j.concat([(_0.key = _7.sent(),
+                                _0)]))];
+                    case 9:
+                        provider = _7.sent();
+                        return [3 /*break*/, 12];
+                    case 10:
+                        _l = (_k = CESIUM.BingMapsImageryProvider).bind;
+                        _1 = {
+                            url: "https://dev.virtualearth.net",
+                            mapStyle: Cesium.BingMapsStyle.AERIAL_WITH_LABELS
+                        };
+                        return [4 /*yield*/, findKey(apiGetter, bruceModels.ProgramKey.EProgramId.BingMaps, DEFAULT_BING_KEY)];
+                    case 11:
+                        provider = new (_l.apply(_k, [void 0, (_1.key = _7.sent(),
+                                _1)]))();
+                        _7.label = 12;
+                    case 12: return [3 /*break*/, 42];
+                    case 13:
+                        if (!Cesium.BingMapsImageryProvider.hasOwnProperty("fromUrl")) return [3 /*break*/, 16];
+                        _o = (_m = CESIUM.BingMapsImageryProvider).fromUrl;
+                        _p = ["https://dev.virtualearth.net"];
+                        _2 = {
+                            mapStyle: Cesium.BingMapsStyle.ROAD_ON_DEMAND
+                        };
+                        return [4 /*yield*/, findKey(apiGetter, bruceModels.ProgramKey.EProgramId.BingMaps, DEFAULT_BING_KEY)];
+                    case 14: return [4 /*yield*/, _o.apply(_m, _p.concat([(_2.key = _7.sent(),
+                                _2)]))];
+                    case 15:
+                        provider = _7.sent();
+                        return [3 /*break*/, 18];
+                    case 16:
+                        _r = (_q = CESIUM.BingMapsImageryProvider).bind;
+                        _3 = {
                             url: "https://dev.virtualearth.net",
                             mapStyle: Cesium.BingMapsStyle.ROAD_ON_DEMAND
                         };
                         return [4 /*yield*/, findKey(apiGetter, bruceModels.ProgramKey.EProgramId.BingMaps, DEFAULT_BING_KEY)];
-                    case 6:
-                        provider = new (_g.apply(_f, [void 0, (_r.key = _v.sent(),
-                                _r)]))();
-                        return [3 /*break*/, 21];
-                    case 7:
-                        _j = (_h = Cesium.MapboxImageryProvider).bind;
-                        _s = {
+                    case 17:
+                        provider = new (_r.apply(_q, [void 0, (_3.key = _7.sent(),
+                                _3)]))();
+                        _7.label = 18;
+                    case 18: return [3 /*break*/, 42];
+                    case 19:
+                        _t = (_s = Cesium.MapboxImageryProvider).bind;
+                        _4 = {
                             mapId: "mapbox.satellite"
                         };
                         return [4 /*yield*/, findKey(apiGetter, bruceModels.ProgramKey.EProgramId.Mapbox, DEFAULT_MAPBOX_KEY)];
-                    case 8:
-                        provider = new (_j.apply(_h, [void 0, (_s.accessToken = _v.sent(),
-                                _s)]))();
-                        return [3 /*break*/, 21];
-                    case 9:
-                        _l = (_k = Cesium.MapboxStyleImageryProvider).bind;
-                        _t = {
+                    case 20:
+                        provider = new (_t.apply(_s, [void 0, (_4.accessToken = _7.sent(),
+                                _4)]))();
+                        return [3 /*break*/, 42];
+                    case 21:
+                        _v = (_u = Cesium.MapboxStyleImageryProvider).bind;
+                        _5 = {
                             styleId: "satellite-streets-v11"
                         };
                         return [4 /*yield*/, findKey(apiGetter, bruceModels.ProgramKey.EProgramId.Mapbox, DEFAULT_MAPBOX_KEY)];
-                    case 10:
-                        provider = new (_l.apply(_k, [void 0, (_t.accessToken = _v.sent(),
-                                _t)]))();
-                        return [3 /*break*/, 21];
-                    case 11:
-                        _o = (_m = Cesium.MapboxStyleImageryProvider).bind;
-                        _u = {
+                    case 22:
+                        provider = new (_v.apply(_u, [void 0, (_5.accessToken = _7.sent(),
+                                _5)]))();
+                        return [3 /*break*/, 42];
+                    case 23:
+                        _x = (_w = Cesium.MapboxStyleImageryProvider).bind;
+                        _6 = {
                             styleId: "streets-v11"
                         };
                         return [4 /*yield*/, findKey(apiGetter, bruceModels.ProgramKey.EProgramId.Mapbox, DEFAULT_MAPBOX_KEY)];
-                    case 12:
-                        provider = new (_o.apply(_m, [void 0, (_u.accessToken = _v.sent(),
-                                _u)]))();
-                        return [3 /*break*/, 21];
-                    case 13:
-                        provider = new Cesium.ArcGisMapServerImageryProvider({
+                    case 24:
+                        provider = new (_x.apply(_w, [void 0, (_6.accessToken = _7.sent(),
+                                _6)]))();
+                        return [3 /*break*/, 42];
+                    case 25:
+                        if (!Cesium.ArcGisMapServerImageryProvider.hasOwnProperty("fromUrl")) return [3 /*break*/, 27];
+                        return [4 /*yield*/, CESIUM.ArcGisMapServerImageryProvider.fromUrl("https://services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer", {
+                                enablePickFeatures: false
+                            })];
+                    case 26:
+                        provider = _7.sent();
+                        return [3 /*break*/, 28];
+                    case 27:
+                        provider = new CESIUM.ArcGisMapServerImageryProvider({
                             url: "https://services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer",
                             enablePickFeatures: false
                         });
-                        return [3 /*break*/, 21];
-                    case 14:
-                        provider = new Cesium.ArcGisMapServerImageryProvider({
+                        _7.label = 28;
+                    case 28: return [3 /*break*/, 42];
+                    case 29:
+                        if (!Cesium.ArcGisMapServerImageryProvider.hasOwnProperty("fromUrl")) return [3 /*break*/, 31];
+                        return [4 /*yield*/, CESIUM.ArcGisMapServerImageryProvider.fromUrl("https://services.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/MapServer", {
+                                enablePickFeatures: false
+                            })];
+                    case 30:
+                        provider = _7.sent();
+                        return [3 /*break*/, 32];
+                    case 31:
+                        provider = new CESIUM.ArcGisMapServerImageryProvider({
                             url: "https://services.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/MapServer",
                             enablePickFeatures: false
                         });
-                        return [3 /*break*/, 21];
-                    case 15:
-                        provider = new Cesium.ArcGisMapServerImageryProvider({
+                        _7.label = 32;
+                    case 32: return [3 /*break*/, 42];
+                    case 33:
+                        if (!CESIUM.ArcGisMapServerImageryProvider.hasOwnProperty("fromUrl")) return [3 /*break*/, 35];
+                        return [4 /*yield*/, CESIUM.ArcGisMapServerImageryProvider.fromUrl("https://services.arcgisonline.com/ArcGIS/rest/services/NatGeo_World_Map/MapServer/", {
+                                enablePickFeatures: false
+                            })];
+                    case 34:
+                        provider = _7.sent();
+                        return [3 /*break*/, 36];
+                    case 35:
+                        provider = new CESIUM.ArcGisMapServerImageryProvider({
                             url: "https://services.arcgisonline.com/ArcGIS/rest/services/NatGeo_World_Map/MapServer/",
                             enablePickFeatures: false
                         });
-                        return [3 /*break*/, 21];
-                    case 16:
+                        _7.label = 36;
+                    case 36: return [3 /*break*/, 42];
+                    case 37:
                         provider = new Cesium.OpenStreetMapImageryProvider({
                             url: "https://a.tile.openstreetmap.org/"
                         });
-                        return [3 /*break*/, 21];
-                    case 17:
+                        return [3 /*break*/, 42];
+                    case 38:
                         provider = new Cesium.OpenStreetMapImageryProvider({
                             url: "https://s3-ap-southeast-2.amazonaws.com/digitalnewzealand/PROD/Tilesets/nz-img",
                             fileExtension: "jpg"
                         });
-                        return [3 /*break*/, 21];
-                    case 18:
+                        return [3 /*break*/, 42];
+                    case 39:
                         provider = new Cesium.OpenStreetMapImageryProvider({
                             url: "https://stamen-tiles.a.ssl.fastly.net/watercolor/"
                         });
-                        return [3 /*break*/, 21];
-                    case 19:
+                        return [3 /*break*/, 42];
+                    case 40:
                         provider = new Cesium.OpenStreetMapImageryProvider({
                             url: "https://stamen-tiles.a.ssl.fastly.net/toner/"
                         });
-                        return [3 /*break*/, 21];
-                    case 20:
+                        return [3 /*break*/, 42];
+                    case 41:
                         provider = new Cesium.GridImageryProvider({
                             tilingScheme: new Cesium.GeographicTilingScheme(),
                             cells: 0,
@@ -16939,8 +17135,8 @@
                             tileHeight: 256,
                             canvasSize: 256
                         });
-                        return [3 /*break*/, 21];
-                    case 21: return [2 /*return*/, provider];
+                        return [3 /*break*/, 42];
+                    case 42: return [2 /*return*/, provider];
                 }
             });
         });
@@ -17036,19 +17232,20 @@
             (function (LegacyNavigator) {
                 function Render(params) {
                     return __awaiter(this, void 0, void 0, function () {
-                        var enabled, tile, bId, layer, defaultId, provider, provider, min, max, _a, mapboxKey, _b;
+                        var CESIUM, enabled, tile, bId, layer, defaultId, provider, provider, min, max, _a, mapboxKey, _b;
                         return __generator(this, function (_c) {
                             switch (_c.label) {
                                 case 0:
                                     if (!params.apiGetter) {
                                         params.apiGetter = bruceModels.ENVIRONMENT.Api().GetBruceGetter();
                                     }
+                                    CESIUM = Cesium;
                                     enabled = gatherEnabledImageries(params.viewer);
                                     tile = params.data;
                                     bId = createLegacyImageryId(tile);
                                     layer = enabled.find(function (x) { return x._bId == bId; });
                                     if (!layer) return [3 /*break*/, 1];
-                                    return [3 /*break*/, 13];
+                                    return [3 /*break*/, 16];
                                 case 1:
                                     if (!isLegacyImageryDefault(tile.Name)) return [3 /*break*/, 3];
                                     defaultId = legacyMapIdToDefaultId(tile.Name);
@@ -17058,9 +17255,9 @@
                                     if (provider) {
                                         layer = createImageryLayer(provider);
                                     }
-                                    return [3 /*break*/, 13];
+                                    return [3 /*break*/, 16];
                                 case 3:
-                                    if (!tile.SourceUrl) return [3 /*break*/, 13];
+                                    if (!tile.SourceUrl) return [3 /*break*/, 16];
                                     provider = null;
                                     min = tile.Minimum;
                                     max = tile.Maximum;
@@ -17075,17 +17272,17 @@
                                         case "BruceImagery": return [3 /*break*/, 4];
                                         case "ArcGisImagery": return [3 /*break*/, 5];
                                         case "TileMapImagery": return [3 /*break*/, 6];
-                                        case "OpenStreetMapImagery": return [3 /*break*/, 7];
-                                        case "MapBoxImagery": return [3 /*break*/, 8];
+                                        case "OpenStreetMapImagery": return [3 /*break*/, 10];
+                                        case "MapBoxImagery": return [3 /*break*/, 11];
                                     }
-                                    return [3 /*break*/, 12];
+                                    return [3 /*break*/, 15];
                                 case 4:
                                     provider = new Cesium.UrlTemplateImageryProvider({
                                         url: tile.SourceUrl,
                                         tileHeight: 256,
                                         tileWidth: 256
                                     });
-                                    return [3 /*break*/, 12];
+                                    return [3 /*break*/, 15];
                                 case 5:
                                     provider = new Cesium.OpenStreetMapImageryProvider({
                                         url: tile.SourceUrl,
@@ -17093,32 +17290,43 @@
                                         minimumLevel: min,
                                         maximumLevel: max
                                     });
-                                    return [3 /*break*/, 12];
+                                    return [3 /*break*/, 15];
                                 case 6:
-                                    provider = new Cesium.TileMapServiceImageryProvider({
+                                    if (!Cesium.TileMapServiceImageryProvider.hasOwnProperty("fromUrl")) return [3 /*break*/, 8];
+                                    return [4 /*yield*/, CESIUM.TileMapServiceImageryProvider.fromUrl(tile.SourceUrl, {
+                                            minimumLevel: min,
+                                            maximumLevel: max,
+                                            fileExtension: prepareFileExt(tile.FileExtension)
+                                        })];
+                                case 7:
+                                    provider = _c.sent();
+                                    return [3 /*break*/, 9];
+                                case 8:
+                                    provider = new CESIUM.TileMapServiceImageryProvider({
                                         url: tile.SourceUrl,
                                         fileExtension: prepareFileExt(tile.FileExtension),
                                         minimumLevel: min,
                                         maximumLevel: max
                                     });
-                                    return [3 /*break*/, 12];
-                                case 7:
+                                    _c.label = 9;
+                                case 9: return [3 /*break*/, 15];
+                                case 10:
                                     provider = new Cesium.OpenStreetMapImageryProvider({
                                         url: tile.SourceUrl,
                                         fileExtension: prepareFileExt(tile.FileExtension),
                                         minimumLevel: min,
                                         maximumLevel: max
                                     });
-                                    return [3 /*break*/, 12];
-                                case 8:
-                                    if (!tile.ProgramKey) return [3 /*break*/, 9];
+                                    return [3 /*break*/, 15];
+                                case 11:
+                                    if (!tile.ProgramKey) return [3 /*break*/, 12];
                                     _b = tile.ProgramKey;
-                                    return [3 /*break*/, 11];
-                                case 9: return [4 /*yield*/, findKey(params.apiGetter, bruceModels.ProgramKey.EProgramId.Mapbox, null)];
-                                case 10:
+                                    return [3 /*break*/, 14];
+                                case 12: return [4 /*yield*/, findKey(params.apiGetter, bruceModels.ProgramKey.EProgramId.Mapbox, null)];
+                                case 13:
                                     _b = _c.sent();
-                                    _c.label = 11;
-                                case 11:
+                                    _c.label = 14;
+                                case 14:
                                     mapboxKey = _b;
                                     provider = new Cesium.UrlTemplateImageryProvider({
                                         url: "https://api.mapbox.com/styles/v1/"
@@ -17126,13 +17334,13 @@
                                             "/tiles/256/{z}/{x}/{y}?access_token="
                                             + mapboxKey
                                     });
-                                    return [3 /*break*/, 12];
-                                case 12:
+                                    return [3 /*break*/, 15];
+                                case 15:
                                     if (provider) {
                                         layer = createImageryLayer(provider);
                                     }
-                                    _c.label = 13;
-                                case 13:
+                                    _c.label = 16;
+                                case 16:
                                     if (layer) {
                                         layer._bId = bId;
                                         layer._bName = tile.Name;
@@ -17299,7 +17507,7 @@
             (function (Navigator) {
                 function GetOrCreateLayer(params) {
                     return __awaiter(this, void 0, void 0, function () {
-                        var viewer, apiGetter, meta, enabled, i, layer, layerMeta, defaultImg, provider, api, tileset, boundaries, settings, minLat, maxLat, minLon, maxLon, minLevel, maxLevel, hasLevels, settings_1, _a, cesiumIonKey, _b, mapboxKey, _c, layer;
+                        var viewer, apiGetter, meta, CESIUM, enabled, i, layer, layerMeta, defaultImg, provider, api, tileset, boundaries, settings, minLat, maxLat, minLon, maxLon, minLevel, maxLevel, hasLevels, url, settings_1, _a, cesiumIonKey, _b, mapboxKey, _c, layer;
                         return __generator(this, function (_d) {
                             switch (_d.label) {
                                 case 0:
@@ -17307,6 +17515,7 @@
                                     if (!apiGetter) {
                                         apiGetter = bruceModels.ENVIRONMENT.Api().GetBruceGetter();
                                     }
+                                    CESIUM = Cesium;
                                     enabled = gatherEnabledImageries(viewer);
                                     for (i = 0; i < enabled.length; i++) {
                                         layer = enabled[i];
@@ -17321,7 +17530,7 @@
                                     return [4 /*yield*/, renderDefaultMapTile(apiGetter, defaultImg.id)];
                                 case 1:
                                     provider = _d.sent();
-                                    return [3 /*break*/, 19];
+                                    return [3 /*break*/, 28];
                                 case 2:
                                     api = apiGetter.getApi(meta.accountId);
                                     // Ensure regional url is loaded.
@@ -17351,8 +17560,27 @@
                                     minLevel = settings === null || settings === void 0 ? void 0 : settings.levelMin;
                                     maxLevel = settings === null || settings === void 0 ? void 0 : settings.levelMax;
                                     hasLevels = !isNaN(minLevel) && !isNaN(maxLevel);
-                                    if (!(tileset.type === bruceModels.Tileset.EType.GeoMap)) return [3 /*break*/, 5];
-                                    provider = new Cesium.TileMapServiceImageryProvider({
+                                    if (!(tileset.type === bruceModels.Tileset.EType.GeoMap)) return [3 /*break*/, 8];
+                                    if (!Cesium.TileMapServiceImageryProvider.hasOwnProperty("fromUrl")) return [3 /*break*/, 6];
+                                    url = bruceModels.Tileset.GetPublicFileUrl({
+                                        api: api,
+                                        tilesetId: meta.tilesetId,
+                                        file: "",
+                                        viaCdn: true,
+                                        viaCdnCacheToken: tileset.generateVersion
+                                    });
+                                    return [4 /*yield*/, CESIUM.TileMapServiceImageryProvider.fromUrl(url, {
+                                            fileExtension: "png",
+                                            // Tested to not cause increased lag.
+                                            rectangle: boundaries,
+                                            maximumLevel: hasLevels ? maxLevel : undefined,
+                                            minimumLevel: hasLevels ? minLevel : undefined,
+                                        })];
+                                case 5:
+                                    provider = _d.sent();
+                                    return [3 /*break*/, 7];
+                                case 6:
+                                    provider = new CESIUM.TileMapServiceImageryProvider({
                                         url: bruceModels.Tileset.GetPublicFileUrl({
                                             api: api,
                                             tilesetId: meta.tilesetId,
@@ -17366,43 +17594,53 @@
                                         maximumLevel: hasLevels ? maxLevel : undefined,
                                         minimumLevel: hasLevels ? minLevel : undefined,
                                     });
-                                    return [3 /*break*/, 19];
-                                case 5:
-                                    if (!(tileset.type === bruceModels.Tileset.EType.ExternalGeoMap)) return [3 /*break*/, 18];
+                                    _d.label = 7;
+                                case 7: return [3 /*break*/, 28];
+                                case 8:
+                                    if (!(tileset.type === bruceModels.Tileset.EType.ExternalGeoMap)) return [3 /*break*/, 27];
                                     settings_1 = tileset.settings;
                                     _a = settings_1.mapType;
                                     switch (_a) {
-                                        case bruceModels.Tileset.Settings.EExternalMapType.CesiumIon: return [3 /*break*/, 6];
-                                        case bruceModels.Tileset.Settings.EExternalMapType.MapBoxImagery: return [3 /*break*/, 10];
-                                        case bruceModels.Tileset.Settings.EExternalMapType.OpenStreetMapImagery: return [3 /*break*/, 14];
-                                        case bruceModels.Tileset.Settings.EExternalMapType.TileMapImagery: return [3 /*break*/, 15];
-                                        case bruceModels.Tileset.Settings.EExternalMapType.CustomTemplate: return [3 /*break*/, 16];
+                                        case bruceModels.Tileset.Settings.EExternalMapType.CesiumIon: return [3 /*break*/, 9];
+                                        case bruceModels.Tileset.Settings.EExternalMapType.MapBoxImagery: return [3 /*break*/, 16];
+                                        case bruceModels.Tileset.Settings.EExternalMapType.OpenStreetMapImagery: return [3 /*break*/, 20];
+                                        case bruceModels.Tileset.Settings.EExternalMapType.TileMapImagery: return [3 /*break*/, 21];
+                                        case bruceModels.Tileset.Settings.EExternalMapType.CustomTemplate: return [3 /*break*/, 25];
                                     }
-                                    return [3 /*break*/, 17];
-                                case 6:
-                                    if (!settings_1.key) return [3 /*break*/, 7];
+                                    return [3 /*break*/, 26];
+                                case 9:
+                                    if (!settings_1.key) return [3 /*break*/, 10];
                                     _b = settings_1.key;
-                                    return [3 /*break*/, 9];
-                                case 7: return [4 /*yield*/, findKey(apiGetter, bruceModels.ProgramKey.EProgramId.CesiumIon, null)];
-                                case 8:
+                                    return [3 /*break*/, 12];
+                                case 10: return [4 /*yield*/, findKey(apiGetter, bruceModels.ProgramKey.EProgramId.CesiumIon, null)];
+                                case 11:
                                     _b = _d.sent();
-                                    _d.label = 9;
-                                case 9:
+                                    _d.label = 12;
+                                case 12:
                                     cesiumIonKey = _b;
-                                    provider = new Cesium.IonImageryProvider({
+                                    if (!Cesium.IonImageryProvider.hasOwnProperty("fromAssetId")) return [3 /*break*/, 14];
+                                    return [4 /*yield*/, CESIUM.IonImageryProvider.fromAssetId(Number(settings_1.externalId), {
+                                            accessToken: cesiumIonKey
+                                        })];
+                                case 13:
+                                    provider = _d.sent();
+                                    return [3 /*break*/, 15];
+                                case 14:
+                                    provider = new CESIUM.IonImageryProvider({
                                         assetId: Number(settings_1.externalId),
                                         accessToken: cesiumIonKey
                                     });
-                                    return [3 /*break*/, 17];
-                                case 10:
-                                    if (!settings_1.key) return [3 /*break*/, 11];
+                                    _d.label = 15;
+                                case 15: return [3 /*break*/, 26];
+                                case 16:
+                                    if (!settings_1.key) return [3 /*break*/, 17];
                                     _c = settings_1.key;
-                                    return [3 /*break*/, 13];
-                                case 11: return [4 /*yield*/, findKey(apiGetter, bruceModels.ProgramKey.EProgramId.Mapbox, null)];
-                                case 12:
+                                    return [3 /*break*/, 19];
+                                case 17: return [4 /*yield*/, findKey(apiGetter, bruceModels.ProgramKey.EProgramId.Mapbox, null)];
+                                case 18:
                                     _c = _d.sent();
-                                    _d.label = 13;
-                                case 13:
+                                    _d.label = 19;
+                                case 19:
                                     mapboxKey = _c;
                                     provider = new Cesium.UrlTemplateImageryProvider({
                                         url: "https://api.mapbox.com/styles/v1/"
@@ -17410,8 +17648,8 @@
                                             "/tiles/256/{z}/{x}/{y}?access_token="
                                             + mapboxKey
                                     });
-                                    return [3 /*break*/, 17];
-                                case 14:
+                                    return [3 /*break*/, 26];
+                                case 20:
                                     provider = new Cesium.OpenStreetMapImageryProvider({
                                         url: settings_1.url,
                                         fileExtension: prepareFileExt(settings_1.fileExtension),
@@ -17420,9 +17658,21 @@
                                         // maximumLevel: hasLevels ? maxLevel : undefined,
                                         // minimumLevel: hasLevels ? minLevel : undefined,
                                     });
-                                    return [3 /*break*/, 17];
-                                case 15:
-                                    provider = new Cesium.TileMapServiceImageryProvider({
+                                    return [3 /*break*/, 26];
+                                case 21:
+                                    if (!Cesium.TileMapServiceImageryProvider.hasOwnProperty("fromUrl")) return [3 /*break*/, 23];
+                                    return [4 /*yield*/, CESIUM.TileMapServiceImageryProvider.fromUrl(settings_1.url, {
+                                            fileExtension: prepareFileExt(settings_1.fileExtension),
+                                            // Unused until tested properly. In the past these settings caused large lag.
+                                            // rectangle: boundaries,
+                                            // maximumLevel: hasLevels ? maxLevel : undefined,
+                                            // minimumLevel: hasLevels ? minLevel : undefined,
+                                        })];
+                                case 22:
+                                    provider = _d.sent();
+                                    return [3 /*break*/, 24];
+                                case 23:
+                                    provider = new CESIUM.TileMapServiceImageryProvider({
                                         url: settings_1.url,
                                         fileExtension: prepareFileExt(settings_1.fileExtension),
                                         // Unused until tested properly. In the past these settings caused large lag.
@@ -17430,14 +17680,15 @@
                                         // maximumLevel: hasLevels ? maxLevel : undefined,
                                         // minimumLevel: hasLevels ? minLevel : undefined,
                                     });
-                                    return [3 /*break*/, 17];
-                                case 16:
+                                    _d.label = 24;
+                                case 24: return [3 /*break*/, 26];
+                                case 25:
                                     provider = new Cesium.UrlTemplateImageryProvider({
                                         url: settings_1.url
                                     });
-                                    return [3 /*break*/, 17];
-                                case 17: return [3 /*break*/, 19];
-                                case 18:
+                                    return [3 /*break*/, 26];
+                                case 26: return [3 /*break*/, 28];
+                                case 27:
                                     if (tileset.type === bruceModels.Tileset.EType.EntitiesMap) {
                                         provider = new Cesium.UrlTemplateImageryProvider({
                                             url: bruceModels.Tileset.GetPublicFileUrl({
@@ -17455,8 +17706,8 @@
                                             // maximumLevel: hasLevels ? maxLevel : undefined,
                                         });
                                     }
-                                    _d.label = 19;
-                                case 19:
+                                    _d.label = 28;
+                                case 28:
                                     if (provider) {
                                         layer = viewer.imageryLayers.addImageryProvider(provider);
                                         layer._bMeta = meta;
@@ -17577,7 +17828,7 @@
                 function Render(params) {
                     var _a;
                     return __awaiter(this, void 0, void 0, function () {
-                        var bId, curProvider, provider, id;
+                        var bId, curProvider, CESIUM, provider, id;
                         return __generator(this, function (_b) {
                             switch (_b.label) {
                                 case 0:
@@ -17586,23 +17837,32 @@
                                     if (curProvider._bId && curProvider._bId === bId) {
                                         return [2 /*return*/];
                                     }
+                                    CESIUM = Cesium;
                                     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];
+                                    return [3 /*break*/, 5];
                                 case 2:
-                                    if (params.data.SourceUrl) {
-                                        provider = new Cesium.CesiumTerrainProvider({
-                                            url: params.data.SourceUrl,
+                                    if (!params.data.SourceUrl) return [3 /*break*/, 5];
+                                    if (!Cesium.CesiumTerrainProvider.hasOwnProperty("fromUrl")) return [3 /*break*/, 4];
+                                    return [4 /*yield*/, CESIUM.CesiumTerrainProvider.fromUrl(params.data.SourceUrl, {
                                             requestWaterMask: params.data.RequestWaterMask,
                                             requestVertexNormals: true
-                                        });
-                                    }
-                                    _b.label = 3;
+                                        })];
                                 case 3:
+                                    provider = (_b.sent());
+                                    return [3 /*break*/, 5];
+                                case 4:
+                                    provider = new CESIUM.CesiumTerrainProvider({
+                                        url: params.data.SourceUrl,
+                                        requestWaterMask: params.data.RequestWaterMask,
+                                        requestVertexNormals: true
+                                    });
+                                    _b.label = 5;
+                                case 5:
                                     if (provider) {
                                         provider._bId = bId;
                                         provider._bName = (_a = params.data) === null || _a === void 0 ? void 0 : _a.Name;
@@ -17703,7 +17963,7 @@
                 function Render(params) {
                     var _a;
                     return __awaiter(this, void 0, void 0, function () {
-                        var iteration, enabledMeta, provider_1, leave, defaultTerr, provider, api, tileset, url, vertexes, settings;
+                        var iteration, CESIUM, enabledMeta, provider_1, leave, defaultTerr, provider, api, tileset, url, vertexes, settings;
                         return __generator(this, function (_b) {
                             switch (_b.label) {
                                 case 0:
@@ -17711,6 +17971,7 @@
                                         params.apiGetter = bruceModels.ENVIRONMENT.Api().GetBruceGetter();
                                     }
                                     iteration = newIteration(params.viewer, "terrain");
+                                    CESIUM = Cesium;
                                     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) {
@@ -17740,7 +18001,7 @@
                                     return [4 /*yield*/, renderDefaultTerrTile(defaultTerr.id)];
                                 case 1:
                                     provider = (_b.sent());
-                                    return [3 /*break*/, 5];
+                                    return [3 /*break*/, 7];
                                 case 2:
                                     api = params.apiGetter.getApi(params.tile.accountId);
                                     // Ensure regional url is loaded.
@@ -17783,14 +18044,21 @@
                                     else {
                                         console.error("Invalid tileset type.", tileset);
                                     }
-                                    if (url) {
-                                        provider = new Cesium.CesiumTerrainProvider({
-                                            url: url,
+                                    if (!url) return [3 /*break*/, 7];
+                                    if (!CESIUM.CesiumTerrainProvider.hasOwnProperty("fromUrl")) return [3 /*break*/, 6];
+                                    return [4 /*yield*/, CESIUM.CesiumTerrainProvider.fromUrl(url, {
                                             requestVertexNormals: vertexes
-                                        });
-                                    }
-                                    _b.label = 5;
+                                        })];
                                 case 5:
+                                    provider = (_b.sent());
+                                    return [3 /*break*/, 7];
+                                case 6:
+                                    provider = new CESIUM.CesiumTerrainProvider({
+                                        url: url,
+                                        requestVertexNormals: vertexes
+                                    });
+                                    _b.label = 7;
+                                case 7:
                                     if (provider) {
                                         provider._bMeta = {
                                             accountId: params.tile.accountId,
@@ -18890,7 +19158,7 @@
         CesiumViewMonitor.Monitor = Monitor;
     })(exports.CesiumViewMonitor || (exports.CesiumViewMonitor = {}));
 
-    var VERSION$1 = "3.1.8";
+    var VERSION$1 = "3.2.0";
 
     exports.VERSION = VERSION$1;
     exports.CesiumParabola = CesiumParabola;