bruce-cesium 3.1.8 → 3.2.0

package/dist/lib/rendering/tile-render-engine.js

@@ -100,7 +100,7 @@ function renderDefaultTerrTile(id) {
                         case bruce_models_1.ProjectViewTile.EDefaultTerrain.FlatTerrain: return [3 /*break*/, 5];
                         case bruce_models_1.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({
@@ -111,24 +111,37 @@ function renderDefaultTerrTile(id) {
                     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];
             }
         });
     });
@@ -250,132 +263,202 @@ function findKey(apiGetter, keyId, defaultKey) {
  */
 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 bruce_models_1.ProjectViewTile.EDefaultImagery.BingMapsAerial: return [3 /*break*/, 1];
-                        case bruce_models_1.ProjectViewTile.EDefaultImagery.BingMapsAerialWithLabels: return [3 /*break*/, 3];
-                        case bruce_models_1.ProjectViewTile.EDefaultImagery.BingMapsRoads: return [3 /*break*/, 5];
-                        case bruce_models_1.ProjectViewTile.EDefaultImagery.MapboxSatellite: return [3 /*break*/, 7];
-                        case bruce_models_1.ProjectViewTile.EDefaultImagery.MapBoxStreets: return [3 /*break*/, 9];
-                        case bruce_models_1.ProjectViewTile.EDefaultImagery.MapBoxStreetsClassic: return [3 /*break*/, 11];
-                        case bruce_models_1.ProjectViewTile.EDefaultImagery.EsriWorldImagery: return [3 /*break*/, 13];
-                        case bruce_models_1.ProjectViewTile.EDefaultImagery.EsriWorldStreetMap: return [3 /*break*/, 14];
-                        case bruce_models_1.ProjectViewTile.EDefaultImagery.EsriNationalGeographic: return [3 /*break*/, 15];
-                        case bruce_models_1.ProjectViewTile.EDefaultImagery.OpenStreetMap: return [3 /*break*/, 16];
-                        case bruce_models_1.ProjectViewTile.EDefaultImagery.LINZ: return [3 /*break*/, 17];
-                        case bruce_models_1.ProjectViewTile.EDefaultImagery.StamenWaterColor: return [3 /*break*/, 18];
-                        case bruce_models_1.ProjectViewTile.EDefaultImagery.StamenToner: return [3 /*break*/, 19];
-                        case bruce_models_1.ProjectViewTile.EDefaultImagery.Grid: return [3 /*break*/, 20];
+                        case bruce_models_1.ProjectViewTile.EDefaultImagery.BingMapsAerialWithLabels: return [3 /*break*/, 7];
+                        case bruce_models_1.ProjectViewTile.EDefaultImagery.BingMapsRoads: return [3 /*break*/, 13];
+                        case bruce_models_1.ProjectViewTile.EDefaultImagery.MapboxSatellite: return [3 /*break*/, 19];
+                        case bruce_models_1.ProjectViewTile.EDefaultImagery.MapBoxStreets: return [3 /*break*/, 21];
+                        case bruce_models_1.ProjectViewTile.EDefaultImagery.MapBoxStreetsClassic: return [3 /*break*/, 23];
+                        case bruce_models_1.ProjectViewTile.EDefaultImagery.EsriWorldImagery: return [3 /*break*/, 25];
+                        case bruce_models_1.ProjectViewTile.EDefaultImagery.EsriWorldStreetMap: return [3 /*break*/, 29];
+                        case bruce_models_1.ProjectViewTile.EDefaultImagery.EsriNationalGeographic: return [3 /*break*/, 33];
+                        case bruce_models_1.ProjectViewTile.EDefaultImagery.OpenStreetMap: return [3 /*break*/, 37];
+                        case bruce_models_1.ProjectViewTile.EDefaultImagery.LINZ: return [3 /*break*/, 38];
+                        case bruce_models_1.ProjectViewTile.EDefaultImagery.StamenWaterColor: return [3 /*break*/, 39];
+                        case bruce_models_1.ProjectViewTile.EDefaultImagery.StamenToner: return [3 /*break*/, 40];
+                        case bruce_models_1.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, bruce_models_1.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, bruce_models_1.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, bruce_models_1.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, bruce_models_1.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, bruce_models_1.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 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, bruce_models_1.ProgramKey.EProgramId.BingMaps, DEFAULT_BING_KEY)];
+                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, bruce_models_1.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, bruce_models_1.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, bruce_models_1.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,
@@ -387,8 +470,8 @@ function renderDefaultMapTile(apiGetter, id) {
                         tileHeight: 256,
                         canvasSize: 256
                     });
-                    return [3 /*break*/, 21];
-                case 21: return [2 /*return*/, provider];
+                    return [3 /*break*/, 42];
+                case 42: return [2 /*return*/, provider];
             }
         });
     });
@@ -485,19 +568,20 @@ var TileRenderEngine;
         (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 = bruce_models_1.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);
@@ -507,9 +591,9 @@ var TileRenderEngine;
                                 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;
@@ -524,17 +608,17 @@ var TileRenderEngine;
                                     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,
@@ -542,32 +626,43 @@ var TileRenderEngine;
                                     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, bruce_models_1.ProgramKey.EProgramId.Mapbox, null)];
-                            case 10:
+                                return [3 /*break*/, 14];
+                            case 12: return [4 /*yield*/, findKey(params.apiGetter, bruce_models_1.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/"
@@ -575,13 +670,13 @@ var TileRenderEngine;
                                         "/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;
@@ -748,7 +843,7 @@ var TileRenderEngine;
         (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:
@@ -756,6 +851,7 @@ var TileRenderEngine;
                                 if (!apiGetter) {
                                     apiGetter = bruce_models_1.ENVIRONMENT.Api().GetBruceGetter();
                                 }
+                                CESIUM = Cesium;
                                 enabled = gatherEnabledImageries(viewer);
                                 for (i = 0; i < enabled.length; i++) {
                                     layer = enabled[i];
@@ -770,7 +866,7 @@ var TileRenderEngine;
                                 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.
@@ -800,8 +896,27 @@ var TileRenderEngine;
                                 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 === bruce_models_1.Tileset.EType.GeoMap)) return [3 /*break*/, 5];
-                                provider = new Cesium.TileMapServiceImageryProvider({
+                                if (!(tileset.type === bruce_models_1.Tileset.EType.GeoMap)) return [3 /*break*/, 8];
+                                if (!Cesium.TileMapServiceImageryProvider.hasOwnProperty("fromUrl")) return [3 /*break*/, 6];
+                                url = bruce_models_1.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: bruce_models_1.Tileset.GetPublicFileUrl({
                                         api: api,
                                         tilesetId: meta.tilesetId,
@@ -815,43 +930,53 @@ var TileRenderEngine;
                                     maximumLevel: hasLevels ? maxLevel : undefined,
                                     minimumLevel: hasLevels ? minLevel : undefined,
                                 });
-                                return [3 /*break*/, 19];
-                            case 5:
-                                if (!(tileset.type === bruce_models_1.Tileset.EType.ExternalGeoMap)) return [3 /*break*/, 18];
+                                _d.label = 7;
+                            case 7: return [3 /*break*/, 28];
+                            case 8:
+                                if (!(tileset.type === bruce_models_1.Tileset.EType.ExternalGeoMap)) return [3 /*break*/, 27];
                                 settings_1 = tileset.settings;
                                 _a = settings_1.mapType;
                                 switch (_a) {
-                                    case bruce_models_1.Tileset.Settings.EExternalMapType.CesiumIon: return [3 /*break*/, 6];
-                                    case bruce_models_1.Tileset.Settings.EExternalMapType.MapBoxImagery: return [3 /*break*/, 10];
-                                    case bruce_models_1.Tileset.Settings.EExternalMapType.OpenStreetMapImagery: return [3 /*break*/, 14];
-                                    case bruce_models_1.Tileset.Settings.EExternalMapType.TileMapImagery: return [3 /*break*/, 15];
-                                    case bruce_models_1.Tileset.Settings.EExternalMapType.CustomTemplate: return [3 /*break*/, 16];
+                                    case bruce_models_1.Tileset.Settings.EExternalMapType.CesiumIon: return [3 /*break*/, 9];
+                                    case bruce_models_1.Tileset.Settings.EExternalMapType.MapBoxImagery: return [3 /*break*/, 16];
+                                    case bruce_models_1.Tileset.Settings.EExternalMapType.OpenStreetMapImagery: return [3 /*break*/, 20];
+                                    case bruce_models_1.Tileset.Settings.EExternalMapType.TileMapImagery: return [3 /*break*/, 21];
+                                    case bruce_models_1.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, bruce_models_1.ProgramKey.EProgramId.CesiumIon, null)];
-                            case 8:
+                                return [3 /*break*/, 12];
+                            case 10: return [4 /*yield*/, findKey(apiGetter, bruce_models_1.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, bruce_models_1.ProgramKey.EProgramId.Mapbox, null)];
-                            case 12:
+                                return [3 /*break*/, 19];
+                            case 17: return [4 /*yield*/, findKey(apiGetter, bruce_models_1.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/"
@@ -859,8 +984,8 @@ var TileRenderEngine;
                                         "/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),
@@ -869,9 +994,21 @@ var TileRenderEngine;
                                     // 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.
@@ -879,14 +1016,15 @@ var TileRenderEngine;
                                     // 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 === bruce_models_1.Tileset.EType.EntitiesMap) {
                                     provider = new Cesium.UrlTemplateImageryProvider({
                                         url: bruce_models_1.Tileset.GetPublicFileUrl({
@@ -904,8 +1042,8 @@ var TileRenderEngine;
                                         // maximumLevel: hasLevels ? maxLevel : undefined,
                                     });
                                 }
-                                _d.label = 19;
-                            case 19:
+                                _d.label = 28;
+                            case 28:
                                 if (provider) {
                                     layer = viewer.imageryLayers.addImageryProvider(provider);
                                     layer._bMeta = meta;
@@ -1026,7 +1164,7 @@ var TileRenderEngine;
             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:
@@ -1035,23 +1173,32 @@ var TileRenderEngine;
                                 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;
@@ -1152,7 +1299,7 @@ var TileRenderEngine;
             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:
@@ -1160,6 +1307,7 @@ var TileRenderEngine;
                                     params.apiGetter = bruce_models_1.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) {
@@ -1189,7 +1337,7 @@ var TileRenderEngine;
                                 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.
@@ -1232,14 +1380,21 @@ var TileRenderEngine;
                                 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,