bruce-cesium 5.1.1 → 5.1.2

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
 import { BruceEvent, Cartes, Entity as Entity$1, Carto, Geometry, MathUtils, LRUCache, Api, Calculator, ClientFile, EntityTag, EntityType, ObjectUtils, Style, ProjectViewTile, DelayQueue, EntityLod, Bounds, ZoomControl, EntityRelationType, ENVIRONMENT, EntityHistoricData, Tileset, EntityCoords, DataLab, EntitySource, MenuItem, EntityRelation, ProgramKey, ProjectView, ProjectViewBookmark, Camera, ProjectViewLegacyTile, EntityAttachment, EntityAttachmentType, EntityAttribute, AbstractApi, Session } from 'bruce-models';
 import * as Cesium from 'cesium';
-import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, Entity, DistanceDisplayCondition, ClassificationType, ArcType, CornerType, ShadowMode, ConstantProperty, ConstantPositionProperty, HorizontalOrigin, VerticalOrigin, PolygonHierarchy, PolylineGraphics, ColorMaterialProperty, ColorBlendMode, HeadingPitchRoll, Transforms, Model, SceneMode, Primitive, Cesium3DTileFeature, GeoJsonDataSource, Cesium3DTileColorBlendMode, HeadingPitchRange, Cesium3DTileStyle, Ion, KmlDataSource, SceneTransforms, OrthographicFrustum, EasingFunction, NearFarScalar, EllipsoidTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, Cesium3DTileset, Matrix4, Matrix3, IonResource, CesiumInspector, defined, ClockRange, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, BoundingSphere, GeometryInstance, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, Quaternion, ScreenSpaceEventHandler, ScreenSpaceEventType, CzmlDataSource, Intersect, Fullscreen } from 'cesium';
+import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, Entity, DistanceDisplayCondition, HorizontalOrigin, VerticalOrigin, ConstantProperty, ClassificationType, ConstantPositionProperty, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, ColorMaterialProperty, ColorBlendMode, HeadingPitchRoll, Transforms, Model, Primitive, Cesium3DTileFeature, SceneMode, GeoJsonDataSource, Cesium3DTileColorBlendMode, HeadingPitchRange, Cesium3DTileStyle, Ion, KmlDataSource, SceneTransforms, OrthographicFrustum, EasingFunction, NearFarScalar, EllipsoidTerrainProvider, CesiumInspector, defined, ClockRange, Cesium3DTileset, Matrix4, Matrix3, IonResource, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, BoundingSphere, GeometryInstance, Quaternion, ScreenSpaceEventHandler, ScreenSpaceEventType, CzmlDataSource, Intersect, Fullscreen } from 'cesium';
 
 const TIME_LAG = 300;
 const POSITION_CHECK_TIMER = 950;
@@ -21911,8 +21911,6 @@ function assertIteration(viewer, iteration) {
     const suffix = iteration.includes("imagery") ? "imagery" : "terrain";
     return viewer[ITERATION_KEY + suffix] === iteration;
 }
-const DEFAULT_BING_KEY = "AqL0uYT5T84jiJeX55_b9zJeeP3MX2p1WLOHH4ljIEPZ7ZL2M81bYLzyYeSwuzzl";
-const DEFAULT_MAPBOX_KEY = "pk.eyJ1IjoiYWxleHRodW5kZXIiLCJhIjoiY2psbHJxbnN5MTBvbzNxczZwMHNpeTI0MCJ9.fdoj2QW_7n8RV4e0NCFgZA";
 const DEFAULT_STAMEN_KEY = "a652e5f2-8d9e-4706-a9d9-d5daa7d4c89e";
 const DEFAULT_THUNDERFOREST_KEY = "c3c1b64fbb5240be8e0d284a01e33107";
 const re = /[\0-\x1F\x7F-\x9F\xAD\u0378\u0379\u037F-\u0383\u038B\u038D\u03A2\u0528-\u0530\u0557\u0558\u0560\u0588\u058B-\u058E\u0590\u05C8-\u05CF\u05EB-\u05EF\u05F5-\u0605\u061C\u061D\u06DD\u070E\u070F\u074B\u074C\u07B2-\u07BF\u07FB-\u07FF\u082E\u082F\u083F\u085C\u085D\u085F-\u089F\u08A1\u08AD-\u08E3\u08FF\u0978\u0980\u0984\u098D\u098E\u0991\u0992\u09A9\u09B1\u09B3-\u09B5\u09BA\u09BB\u09C5\u09C6\u09C9\u09CA\u09CF-\u09D6\u09D8-\u09DB\u09DE\u09E4\u09E5\u09FC-\u0A00\u0A04\u0A0B-\u0A0E\u0A11\u0A12\u0A29\u0A31\u0A34\u0A37\u0A3A\u0A3B\u0A3D\u0A43-\u0A46\u0A49\u0A4A\u0A4E-\u0A50\u0A52-\u0A58\u0A5D\u0A5F-\u0A65\u0A76-\u0A80\u0A84\u0A8E\u0A92\u0AA9\u0AB1\u0AB4\u0ABA\u0ABB\u0AC6\u0ACA\u0ACE\u0ACF\u0AD1-\u0ADF\u0AE4\u0AE5\u0AF2-\u0B00\u0B04\u0B0D\u0B0E\u0B11\u0B12\u0B29\u0B31\u0B34\u0B3A\u0B3B\u0B45\u0B46\u0B49\u0B4A\u0B4E-\u0B55\u0B58-\u0B5B\u0B5E\u0B64\u0B65\u0B78-\u0B81\u0B84\u0B8B-\u0B8D\u0B91\u0B96-\u0B98\u0B9B\u0B9D\u0BA0-\u0BA2\u0BA5-\u0BA7\u0BAB-\u0BAD\u0BBA-\u0BBD\u0BC3-\u0BC5\u0BC9\u0BCE\u0BCF\u0BD1-\u0BD6\u0BD8-\u0BE5\u0BFB-\u0C00\u0C04\u0C0D\u0C11\u0C29\u0C34\u0C3A-\u0C3C\u0C45\u0C49\u0C4E-\u0C54\u0C57\u0C5A-\u0C5F\u0C64\u0C65\u0C70-\u0C77\u0C80\u0C81\u0C84\u0C8D\u0C91\u0CA9\u0CB4\u0CBA\u0CBB\u0CC5\u0CC9\u0CCE-\u0CD4\u0CD7-\u0CDD\u0CDF\u0CE4\u0CE5\u0CF0\u0CF3-\u0D01\u0D04\u0D0D\u0D11\u0D3B\u0D3C\u0D45\u0D49\u0D4F-\u0D56\u0D58-\u0D5F\u0D64\u0D65\u0D76-\u0D78\u0D80\u0D81\u0D84\u0D97-\u0D99\u0DB2\u0DBC\u0DBE\u0DBF\u0DC7-\u0DC9\u0DCB-\u0DCE\u0DD5\u0DD7\u0DE0-\u0DF1\u0DF5-\u0E00\u0E3B-\u0E3E\u0E5C-\u0E80\u0E83\u0E85\u0E86\u0E89\u0E8B\u0E8C\u0E8E-\u0E93\u0E98\u0EA0\u0EA4\u0EA6\u0EA8\u0EA9\u0EAC\u0EBA\u0EBE\u0EBF\u0EC5\u0EC7\u0ECE\u0ECF\u0EDA\u0EDB\u0EE0-\u0EFF\u0F48\u0F6D-\u0F70\u0F98\u0FBD\u0FCD\u0FDB-\u0FFF\u10C6\u10C8-\u10CC\u10CE\u10CF\u1249\u124E\u124F\u1257\u1259\u125E\u125F\u1289\u128E\u128F\u12B1\u12B6\u12B7\u12BF\u12C1\u12C6\u12C7\u12D7\u1311\u1316\u1317\u135B\u135C\u137D-\u137F\u139A-\u139F\u13F5-\u13FF\u169D-\u169F\u16F1-\u16FF\u170D\u1715-\u171F\u1737-\u173F\u1754-\u175F\u176D\u1771\u1774-\u177F\u17DE\u17DF\u17EA-\u17EF\u17FA-\u17FF\u180F\u181A-\u181F\u1878-\u187F\u18AB-\u18AF\u18F6-\u18FF\u191D-\u191F\u192C-\u192F\u193C-\u193F\u1941-\u1943\u196E\u196F\u1975-\u197F\u19AC-\u19AF\u19CA-\u19CF\u19DB-\u19DD\u1A1C\u1A1D\u1A5F\u1A7D\u1A7E\u1A8A-\u1A8F\u1A9A-\u1A9F\u1AAE-\u1AFF\u1B4C-\u1B4F\u1B7D-\u1B7F\u1BF4-\u1BFB\u1C38-\u1C3A\u1C4A-\u1C4C\u1C80-\u1CBF\u1CC8-\u1CCF\u1CF7-\u1CFF\u1DE7-\u1DFB\u1F16\u1F17\u1F1E\u1F1F\u1F46\u1F47\u1F4E\u1F4F\u1F58\u1F5A\u1F5C\u1F5E\u1F7E\u1F7F\u1FB5\u1FC5\u1FD4\u1FD5\u1FDC\u1FF0\u1FF1\u1FF5\u1FFF\u200B-\u200F\u202A-\u202E\u2060-\u206F\u2072\u2073\u208F\u209D-\u209F\u20BB-\u20CF\u20F1-\u20FF\u218A-\u218F\u23F4-\u23FF\u2427-\u243F\u244B-\u245F\u2700\u2B4D-\u2B4F\u2B5A-\u2BFF\u2C2F\u2C5F\u2CF4-\u2CF8\u2D26\u2D28-\u2D2C\u2D2E\u2D2F\u2D68-\u2D6E\u2D71-\u2D7E\u2D97-\u2D9F\u2DA7\u2DAF\u2DB7\u2DBF\u2DC7\u2DCF\u2DD7\u2DDF\u2E3C-\u2E7F\u2E9A\u2EF4-\u2EFF\u2FD6-\u2FEF\u2FFC-\u2FFF\u3040\u3097\u3098\u3100-\u3104\u312E-\u3130\u318F\u31BB-\u31BF\u31E4-\u31EF\u321F\u32FF\u4DB6-\u4DBF\u9FCD-\u9FFF\uA48D-\uA48F\uA4C7-\uA4CF\uA62C-\uA63F\uA698-\uA69E\uA6F8-\uA6FF\uA78F\uA794-\uA79F\uA7AB-\uA7F7\uA82C-\uA82F\uA83A-\uA83F\uA878-\uA87F\uA8C5-\uA8CD\uA8DA-\uA8DF\uA8FC-\uA8FF\uA954-\uA95E\uA97D-\uA97F\uA9CE\uA9DA-\uA9DD\uA9E0-\uA9FF\uAA37-\uAA3F\uAA4E\uAA4F\uAA5A\uAA5B\uAA7C-\uAA7F\uAAC3-\uAADA\uAAF7-\uAB00\uAB07\uAB08\uAB0F\uAB10\uAB17-\uAB1F\uAB27\uAB2F-\uABBF\uABEE\uABEF\uABFA-\uABFF\uD7A4-\uD7AF\uD7C7-\uD7CA\uD7FC-\uF8FF\uFA6E\uFA6F\uFADA-\uFAFF\uFB07-\uFB12\uFB18-\uFB1C\uFB37\uFB3D\uFB3F\uFB42\uFB45\uFBC2-\uFBD2\uFD40-\uFD4F\uFD90\uFD91\uFDC8-\uFDEF\uFDFE\uFDFF\uFE1A-\uFE1F\uFE27-\uFE2F\uFE53\uFE67\uFE6C-\uFE6F\uFE75\uFEFD-\uFF00\uFFBF-\uFFC1\uFFC8\uFFC9\uFFD0\uFFD1\uFFD8\uFFD9\uFFDD-\uFFDF\uFFE7\uFFEF-\uFFFB\uFFFE\uFFFF]/g;
@@ -22056,11 +22054,11 @@ function gatherEnabledImageries(viewer) {
     }
     return layers;
 }
-async function findKey(apiGetter, keyId, defaultKey) {
+async function findKey(apiGetter, accountId, keyId) {
     let key = null;
     try {
         const { programKey: pKey } = await ProgramKey.Get({
-            api: apiGetter.getApi(),
+            api: apiGetter.getApi(accountId),
             programId: keyId
         });
         key = pKey === null || pKey === void 0 ? void 0 : pKey.Key;
@@ -22076,8 +22074,28 @@ async function findKey(apiGetter, keyId, defaultKey) {
             console.error(e);
         }
     }
-    return key && key.length ? key : defaultKey;
+    if (key && key.length) {
+        return key;
+    }
+    // Default to template one if the account doesn't have a key.
+    else if (Api.TEMPLATE_ACCOUNT_ID != accountId) {
+        return findKey(apiGetter, Api.TEMPLATE_ACCOUNT_ID, keyId);
+    }
+    // No nice UI yet for setting it so we'll have a hard-coded one for the time being.
+    else if (keyId == ProgramKey.EProgramId.Thunderforest) {
+        return DEFAULT_THUNDERFOREST_KEY;
+    }
+    // Same story for stamen.
+    else if (keyId == ProgramKey.EProgramId.StadiaMaps) {
+        return DEFAULT_STAMEN_KEY;
+    }
+    return null;
 }
+// Constants for the ion assets.
+// Older CesiumJS doesn't have these so we have to define them here.
+const CESIUM_ION_WORLD_IMAGERY_STYLE_AERIAL = 2;
+const CESIUM_ION_WORLD_IMAGERY_STYLE_AERIAL_WITH_LABELS = 3;
+const CESIUM_ION_WORLD_IMAGERY_STYLE_ROAD = 4;
 /**
  * Constructs an imagery provider for a default imagery type.
  * Warning: This does not add it to the viewer.
@@ -22086,73 +22104,114 @@ async function findKey(apiGetter, keyId, defaultKey) {
  * @returns
  */
 async function renderDefaultMapTile(apiGetter, id) {
+    var _a, _b, _c;
     const CESIUM = Cesium;
     let provider;
     switch (id) {
         case ProjectViewTile.EDefaultImagery.BingMapsAerial:
             // Handling difference between old and new cesium versions.
-            if (BingMapsImageryProvider.hasOwnProperty("fromUrl")) {
+            if ((_a = IonImageryProvider) === null || _a === void 0 ? void 0 : _a["fromAssetId"]) {
+                provider = CESIUM.IonImageryProvider.fromAssetId(CESIUM_ION_WORLD_IMAGERY_STYLE_AERIAL);
+                break;
+            }
+            else if (createWorldImagery) {
+                // No style is needed for this one.
+                provider = CESIUM.createWorldImagery();
+                break;
+            }
+            else if (createWorldImageryAsync) {
+                provider = await CESIUM.createWorldImageryAsync();
+                break;
+            }
+            else if (BingMapsImageryProvider.hasOwnProperty("fromUrl")) {
                 provider = await CESIUM.BingMapsImageryProvider.fromUrl("https://dev.virtualearth.net", {
                     mapStyle: BingMapsStyle.AERIAL,
-                    key: await findKey(apiGetter, ProgramKey.EProgramId.BingMaps, DEFAULT_BING_KEY)
+                    key: await findKey(apiGetter, apiGetter.accountId, ProgramKey.EProgramId.BingMaps)
                 });
+                break;
             }
             else {
                 provider = new CESIUM.BingMapsImageryProvider({
                     url: "https://dev.virtualearth.net",
                     mapStyle: BingMapsStyle.AERIAL,
-                    key: await findKey(apiGetter, ProgramKey.EProgramId.BingMaps, DEFAULT_BING_KEY)
+                    key: await findKey(apiGetter, apiGetter.accountId, ProgramKey.EProgramId.BingMaps)
                 });
+                break;
             }
             break;
         case ProjectViewTile.EDefaultImagery.BingMapsAerialWithLabels:
             // Handling difference between old and new cesium versions.
-            if (BingMapsImageryProvider.hasOwnProperty("fromUrl")) {
+            if ((_b = IonImageryProvider) === null || _b === void 0 ? void 0 : _b["fromAssetId"]) {
+                provider = CESIUM.IonImageryProvider.fromAssetId(CESIUM_ION_WORLD_IMAGERY_STYLE_AERIAL_WITH_LABELS);
+                break;
+            }
+            else if (createWorldImagery) {
+                provider = CESIUM.createWorldImagery({
+                    style: CESIUM_ION_WORLD_IMAGERY_STYLE_AERIAL_WITH_LABELS
+                });
+                break;
+            }
+            else if (BingMapsImageryProvider.hasOwnProperty("fromUrl")) {
                 provider = await CESIUM.BingMapsImageryProvider.fromUrl("https://dev.virtualearth.net", {
                     mapStyle: BingMapsStyle.AERIAL_WITH_LABELS,
-                    key: await findKey(apiGetter, ProgramKey.EProgramId.BingMaps, DEFAULT_BING_KEY)
+                    key: await findKey(apiGetter, apiGetter.accountId, ProgramKey.EProgramId.BingMaps)
                 });
+                break;
             }
             else {
                 provider = new CESIUM.BingMapsImageryProvider({
                     url: "https://dev.virtualearth.net",
                     mapStyle: BingMapsStyle.AERIAL_WITH_LABELS,
-                    key: await findKey(apiGetter, ProgramKey.EProgramId.BingMaps, DEFAULT_BING_KEY)
+                    key: await findKey(apiGetter, apiGetter.accountId, ProgramKey.EProgramId.BingMaps)
                 });
+                break;
             }
             break;
         case ProjectViewTile.EDefaultImagery.BingMapsRoads:
             // Handling difference between old and new cesium versions.
-            if (BingMapsImageryProvider.hasOwnProperty("fromUrl")) {
+            if ((_c = IonImageryProvider) === null || _c === void 0 ? void 0 : _c["fromAssetId"]) {
+                provider = CESIUM.IonImageryProvider.fromAssetId(CESIUM_ION_WORLD_IMAGERY_STYLE_ROAD);
+                break;
+            }
+            else if (createWorldImagery) {
+                provider = CESIUM.createWorldImagery({
+                    style: CESIUM_ION_WORLD_IMAGERY_STYLE_ROAD
+                });
+                break;
+            }
+            // Handling difference between old and new cesium versions.
+            else if (BingMapsImageryProvider.hasOwnProperty("fromUrl")) {
                 provider = await CESIUM.BingMapsImageryProvider.fromUrl("https://dev.virtualearth.net", {
                     mapStyle: BingMapsStyle.ROAD_ON_DEMAND,
-                    key: await findKey(apiGetter, ProgramKey.EProgramId.BingMaps, DEFAULT_BING_KEY)
+                    key: await findKey(apiGetter, apiGetter.accountId, ProgramKey.EProgramId.BingMaps)
                 });
+                break;
             }
             else {
                 provider = new CESIUM.BingMapsImageryProvider({
                     url: "https://dev.virtualearth.net",
                     mapStyle: BingMapsStyle.ROAD_ON_DEMAND,
-                    key: await findKey(apiGetter, ProgramKey.EProgramId.BingMaps, DEFAULT_BING_KEY)
+                    key: await findKey(apiGetter, apiGetter.accountId, ProgramKey.EProgramId.BingMaps)
                 });
+                break;
             }
             break;
         case ProjectViewTile.EDefaultImagery.MapboxSatellite:
             provider = new MapboxImageryProvider({
                 mapId: "mapbox.satellite",
-                accessToken: await findKey(apiGetter, ProgramKey.EProgramId.Mapbox, DEFAULT_MAPBOX_KEY)
+                accessToken: await findKey(apiGetter, apiGetter.accountId, ProgramKey.EProgramId.Mapbox)
             });
             break;
         case ProjectViewTile.EDefaultImagery.MapBoxStreets:
             provider = new MapboxStyleImageryProvider({
                 styleId: "satellite-streets-v11",
-                accessToken: await findKey(apiGetter, ProgramKey.EProgramId.Mapbox, DEFAULT_MAPBOX_KEY)
+                accessToken: await findKey(apiGetter, apiGetter.accountId, ProgramKey.EProgramId.Mapbox)
             });
             break;
         case ProjectViewTile.EDefaultImagery.MapBoxStreetsClassic:
             provider = new MapboxStyleImageryProvider({
                 styleId: "streets-v11",
-                accessToken: await findKey(apiGetter, ProgramKey.EProgramId.Mapbox, DEFAULT_MAPBOX_KEY)
+                accessToken: await findKey(apiGetter, apiGetter.accountId, ProgramKey.EProgramId.Mapbox)
             });
             break;
         case ProjectViewTile.EDefaultImagery.EsriWorldImagery:
@@ -22210,35 +22269,35 @@ async function renderDefaultMapTile(apiGetter, id) {
             break;
         case ProjectViewTile.EDefaultImagery.StamenWaterColor:
             provider = provider = new UrlTemplateImageryProvider({
-                url: `https://tiles.stadiamaps.com/tiles/stamen_watercolor/{z}/{x}/{y}.jpg?api_key=${await findKey(apiGetter, ProgramKey.EProgramId.StadiaMaps, DEFAULT_STAMEN_KEY)}`,
+                url: `https://tiles.stadiamaps.com/tiles/stamen_watercolor/{z}/{x}/{y}.jpg?api_key=${await findKey(apiGetter, apiGetter.accountId, ProgramKey.EProgramId.StadiaMaps)}`,
                 credit: '© Stadia Maps, © OpenMapTiles © OpenStreetMap contributors',
                 maximumLevel: 16
             });
             break;
         case ProjectViewTile.EDefaultImagery.StamenToner:
             provider = new UrlTemplateImageryProvider({
-                url: `https://tiles.stadiamaps.com/tiles/stamen_toner/{z}/{x}/{y}.png?api_key=${await findKey(apiGetter, ProgramKey.EProgramId.StadiaMaps, DEFAULT_STAMEN_KEY)}`,
+                url: `https://tiles.stadiamaps.com/tiles/stamen_toner/{z}/{x}/{y}.png?api_key=${await findKey(apiGetter, apiGetter.accountId, ProgramKey.EProgramId.StadiaMaps)}`,
                 credit: '© Stadia Maps, © OpenMapTiles © OpenStreetMap contributors',
                 maximumLevel: 18
             });
             break;
         case ProjectViewTile.EDefaultImagery.ThunderforestCycle:
             provider = new UrlTemplateImageryProvider({
-                url: `https://tile.thunderforest.com/cycle/{z}/{x}/{y}.png?apikey=${await findKey(apiGetter, ProgramKey.EProgramId.Thunderforest, DEFAULT_THUNDERFOREST_KEY)}`,
+                url: `https://tile.thunderforest.com/cycle/{z}/{x}/{y}.png?apikey=${await findKey(apiGetter, apiGetter.accountId, ProgramKey.EProgramId.Thunderforest)}`,
                 credit: '© Thunderforest, © OpenStreetMap contributors',
                 maximumLevel: 22
             });
             break;
         case ProjectViewTile.EDefaultImagery.ThunderforestTransport:
             provider = new UrlTemplateImageryProvider({
-                url: `https://tile.thunderforest.com/transport/{z}/{x}/{y}.png?apikey=${await findKey(apiGetter, ProgramKey.EProgramId.Thunderforest, DEFAULT_THUNDERFOREST_KEY)}`,
+                url: `https://tile.thunderforest.com/transport/{z}/{x}/{y}.png?apikey=${await findKey(apiGetter, apiGetter.accountId, ProgramKey.EProgramId.Thunderforest)}`,
                 credit: '© Thunderforest, © OpenStreetMap contributors',
                 maximumLevel: 22
             });
             break;
         case ProjectViewTile.EDefaultImagery.ThunderforestLandscape:
             provider = new UrlTemplateImageryProvider({
-                url: `https://tile.thunderforest.com/landscape/{z}/{x}/{y}.png?apikey=${await findKey(apiGetter, ProgramKey.EProgramId.Thunderforest, DEFAULT_THUNDERFOREST_KEY)}`,
+                url: `https://tile.thunderforest.com/landscape/{z}/{x}/{y}.png?apikey=${await findKey(apiGetter, apiGetter.accountId, ProgramKey.EProgramId.Thunderforest)}`,
                 credit: '© Thunderforest, © OpenStreetMap contributors',
                 maximumLevel: 22
             });
@@ -22257,6 +22316,10 @@ async function renderDefaultMapTile(apiGetter, id) {
             });
             break;
     }
+    // If the provider is a promise then we'll wait for it.
+    if (provider instanceof Promise) {
+        provider = await provider;
+    }
     return provider;
 }
 /**
@@ -22418,7 +22481,7 @@ var TileRenderEngine;
                             });
                             break;
                         case "MapBoxImagery":
-                            var mapboxKey = tile.ProgramKey ? tile.ProgramKey : await findKey(params.apiGetter, ProgramKey.EProgramId.Mapbox, null);
+                            var mapboxKey = tile.ProgramKey ? tile.ProgramKey : await findKey(params.apiGetter, params.apiGetter.accountId, ProgramKey.EProgramId.Mapbox);
                             provider = new UrlTemplateImageryProvider({
                                 url: "https://api.mapbox.com/styles/v1/"
                                     + tile.MapBoxUsername + "/" + tile.MapBoxID +
@@ -22587,7 +22650,6 @@ var TileRenderEngine;
                         ProjectViewTile.EDefaultImagery.BingMapsAerialWithLabels,
                         ProjectViewTile.EDefaultImagery.BingMapsRoads
                     ];
-                    const BING_MAPS_OPTIONS = [].concat(NEEDS_CESIUM_TOKEN);
                     // If we need a cesium token, and we don't have one, then we can't render this.
                     let shouldCreate = true;
                     if (NEEDS_CESIUM_TOKEN.includes(defaultImg.id)) {
@@ -22595,43 +22657,24 @@ var TileRenderEngine;
                     }
                     if (shouldCreate) {
                         try {
-                            if (BING_MAPS_OPTIONS.includes(defaultImg.id)) {
-                                throw new Error("Bing Maps is dead. Crashing now to avoid waiting 30 seconds for it to timeout.");
-                            }
                             provider = await renderDefaultMapTile(apiGetter, defaultImg.id);
                         }
                         catch (e) {
                             console.error(e);
-                            // Dead. As of 30-july-2024 bing died so we will fall back to a nice default.
-                            // Trying to use mapbox satellite as a fallback because it looks similar.
-                            if (defaultImg.id === ProjectViewTile.EDefaultImagery.BingMapsAerial) {
-                                provider = await renderDefaultMapTile(apiGetter, ProjectViewTile.EDefaultImagery.MapboxSatellite);
-                                ViewerUtils.GetEventTracker(params.viewer).Warn(ViewerEventTracker.EDomain.TileImagery, "Bing Maps Aerial failed to load. Falling back to Mapbox Satellite.", {
-                                    tilesetId: ProjectViewTile.EDefaultImagery.BingMapsAerial,
-                                    exception: e
-                                });
-                            }
-                            // Trying to use mapbox streets as a fallback because it looks similar.
-                            else if (defaultImg.id === ProjectViewTile.EDefaultImagery.BingMapsAerialWithLabels) {
-                                provider = await renderDefaultMapTile(apiGetter, ProjectViewTile.EDefaultImagery.MapBoxStreets);
-                                ViewerUtils.GetEventTracker(params.viewer).Warn(ViewerEventTracker.EDomain.TileImagery, "Bing Maps Aerial with Labels failed to load. Falling back to Mapbox Streets.", {
-                                    tilesetId: ProjectViewTile.EDefaultImagery.BingMapsAerialWithLabels,
-                                    exception: e
-                                });
-                            }
-                            // Trying to use openstreetmap as a fallback because it looks similar.
-                            else if (defaultImg.id === ProjectViewTile.EDefaultImagery.BingMapsRoads) {
-                                provider = await renderDefaultMapTile(apiGetter, ProjectViewTile.EDefaultImagery.OpenStreetMap);
-                                ViewerUtils.GetEventTracker(params.viewer).Warn(ViewerEventTracker.EDomain.TileImagery, "Bing Maps Roads failed to load. Falling back to OpenStreetMap.", {
-                                    tilesetId: ProjectViewTile.EDefaultImagery.BingMapsRoads,
-                                    exception: e
-                                });
-                            }
-                            else {
-                                throw e;
-                            }
+                            ViewerUtils.GetEventTracker(params.viewer).Warn(ViewerEventTracker.EDomain.TileImagery, "Imagery failed to load.", {
+                                tilesetId: meta.tilesetId,
+                                accountId: meta.accountId,
+                                exception: e
+                            });
                         }
                     }
+                    else {
+                        ViewerUtils.GetEventTracker(params.viewer).Warn(ViewerEventTracker.EDomain.TileImagery, "Imagery failed to load because it requires a valid Cesium Ion Token to be set.", {
+                            tilesetId: meta.tilesetId,
+                            accountId: meta.accountId,
+                            e: new Error("No Cesium Ion Token set.")
+                        });
+                    }
                 }
                 else {
                     const api = apiGetter.getApi(meta.accountId);
@@ -22693,7 +22736,7 @@ var TileRenderEngine;
                         const settings = tileset.settings;
                         switch (settings.mapType) {
                             case Tileset.Settings.EExternalMapType.CesiumIon:
-                                var cesiumIonKey = settings.key ? settings.key : await findKey(apiGetter, ProgramKey.EProgramId.CesiumIon, null);
+                                var cesiumIonKey = settings.key ? settings.key : await findKey(apiGetter, apiGetter.accountId, ProgramKey.EProgramId.CesiumIon);
                                 if (IonImageryProvider.hasOwnProperty("fromAssetId")) {
                                     provider = await CESIUM.IonImageryProvider.fromAssetId(Number(settings.externalId), {
                                         accessToken: cesiumIonKey
@@ -22707,7 +22750,7 @@ var TileRenderEngine;
                                 }
                                 break;
                             case Tileset.Settings.EExternalMapType.MapBoxImagery:
-                                var mapboxKey = settings.key ? settings.key : await findKey(apiGetter, ProgramKey.EProgramId.Mapbox, null);
+                                var mapboxKey = settings.key ? settings.key : await findKey(apiGetter, apiGetter.accountId, ProgramKey.EProgramId.Mapbox);
                                 provider = new UrlTemplateImageryProvider({
                                     url: "https://api.mapbox.com/styles/v1/"
                                         + settings.account + "/" + settings.styleId +
@@ -29736,7 +29779,7 @@ class WidgetViewBar extends Widget.AWidget {
     }
 }
 
-const VERSION = "5.1.1";
+const VERSION = "5.1.2";
 
 export { VERSION, CesiumViewMonitor, ViewerUtils, ViewerEventTracker, MenuItemManager, isHistoricMetadataChanged, EntityRenderEngine, EntityRenderEnginePoint, EntityRenderEnginePolyline, EntityRenderEnginePolygon, EntityRenderEngineModel3d, MenuItemCreator, VisualsRegister, RenderManager, EntitiesIdsRenderManager, DataLabRenderManager, EntitiesLoadedRenderManager, EntitiesRenderManager, EntityRenderManager, TilesetCadRenderManager, TilesetArbRenderManager, TilesetEntitiesRenderManager, TilesetOsmRenderManager, TilesetPointcloudRenderManager, TilesetGooglePhotosRenderManager, DataSourceStaticKmlManager, GoogleSearchRenderManager, RelationsRenderManager, SharedGetters, CesiumParabola, EntityLabel, ViewRenderEngine, TileRenderEngine, TilesetRenderEngine, CESIUM_INSPECTOR_KEY, CESIUM_TIMELINE_KEY, ViewUtils, DrawingUtils, MeasureUtils, EntityUtils, CesiumEntityStyler, CesiumAnimatedProperty, CesiumAnimatedInOut, Draw3dPolygon, Draw3dPolyline, MeasureCreator, Walkthrough, Widget, VIEWER_BOOKMARKS_WIDGET_KEY, WidgetBookmarks, WidgetBranding, WidgetCursorBar, WidgetEmbeddedInfoView, WidgetInfoView, WidgetNavCompass$$1 as WidgetNavCompass, VIEWER_VIEW_BAR_WIDGET_KEY, WidgetViewBar, WidgetControlViewBar, WidgetControlViewBarSearch, VIEWER_LEFT_PANEL_WIDGET_KEY, VIEWER_LEFT_PANEL_CSS_VAR_LEFT, WidgetLeftPanel, WidgetLeftPanelTab, WidgetLeftPanelTabBookmarks };
 //# sourceMappingURL=bruce-cesium.es5.js.map