bruce-cesium 6.7.0 → 6.7.2

package/dist/bruce-cesium.umd.js

@@ -16067,18 +16067,15 @@
                         // Already exists, no need to re-initialize.
                         return;
                     }
-                    const ionCheckApi = this.getters.GetBruceApi({});
-                    await ionCheckApi.Loading;
-                    const { programKeys: ionCheckKeys } = await BModels.ProgramKey.GetList({ api: ionCheckApi });
-                    const ionKey = ionCheckKeys.find(k => k.ProgramId === BModels.ProgramKey.EProgramId.CesiumIon);
-                    // Use if marked as available.
                     let validToken;
-                    if (ionCheckApi.IsVersionAtLeast(BModels.BruceApi.VERSION_WITH_PROXIES)) {
-                        validToken = (ionKey === null || ionKey === void 0 ? void 0 : ionKey.Available) === true;
+                    if (Cesium.Ion.defaultServer) {
+                        // Proxy server was set after verifying Ion availability upstream
+                        // (including template account fallback) — trust that check.
+                        validToken = true;
                     }
-                    // Legacy route, to be killed off.
                     else {
-                        validToken = (ionKey === null || ionKey === void 0 ? void 0 : ionKey.Key) ? await exports.ViewerUtils.AssertIonToken(ionKey.Key) : false;
+                        // No proxy; validate the legacy access token directly.
+                        validToken = await exports.ViewerUtils.AssertIonToken(Cesium.Ion.defaultAccessToken);
                     }
                     if (!validToken) {
                         console.warn("'tileset-osm-render-manager.ts' could not locate a valid Cesium Ion token.");
@@ -17355,7 +17352,7 @@
                         tileset.loadUrl = loadUrlOverride;
                     }
                     // LCC Tileset to load through XGrids libs if they're available.
-                    if (tileset.type === BModels.Tileset.EType.LegacyStatic && tileset.rootFileName && (tileset.rootFileName.toLowerCase()).endsWith(".lcc")) {
+                    if ((tileset === null || tileset === void 0 ? void 0 : tileset.type) === BModels.Tileset.EType.LegacyStatic && tileset.rootFileName && (tileset.rootFileName.toLowerCase()).endsWith(".lcc")) {
                         this.renderType = ERenderType.XGridsLCC;
                         this.renderTypeChanged.Trigger(this.renderType);
                         const api = this.getters.GetBruceApi({
@@ -23009,17 +23006,13 @@
                         // 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)) {
-                            const ionCheckApi = apiGetter.getApi(apiGetter.accountId);
-                            await ionCheckApi.Loading;
-                            const { programKeys: ionCheckKeys } = await BModels.ProgramKey.GetList({ api: ionCheckApi });
-                            const ionKey = ionCheckKeys.find(k => k.ProgramId === BModels.ProgramKey.EProgramId.CesiumIon);
-                            // Use if marked as available.
-                            if (ionCheckApi.IsVersionAtLeast(BModels.BruceApi.VERSION_WITH_PROXIES)) {
-                                shouldCreate = (ionKey === null || ionKey === void 0 ? void 0 : ionKey.Available) === true;
+                            // Proxy server was set after verifying Ion availability upstream.
+                            if (Cesium.Ion.defaultServer) {
+                                shouldCreate = true;
                             }
                             // Legacy route, to be killed off.
                             else {
-                                shouldCreate = (ionKey === null || ionKey === void 0 ? void 0 : ionKey.Key) ? await exports.ViewerUtils.AssertIonToken(ionKey.Key) : false;
+                                shouldCreate = await exports.ViewerUtils.AssertIonToken(Cesium.Ion.defaultAccessToken);
                             }
                         }
                         if (shouldCreate) {
@@ -23463,17 +23456,13 @@
                         // Cesium token is required for Cesium World Terrain.
                         let shouldCreate = true;
                         if (defaultTerr.id == BModels.ProjectViewTile.EDefaultTerrain.CesiumWorldTerrain) {
-                            const ionCheckApi = params.apiGetter.getApi(params.apiGetter.accountId);
-                            await ionCheckApi.Loading;
-                            const { programKeys: ionCheckKeys } = await BModels.ProgramKey.GetList({ api: ionCheckApi });
-                            const ionKey = ionCheckKeys.find(k => k.ProgramId === BModels.ProgramKey.EProgramId.CesiumIon);
-                            // Use if marked as available.
-                            if (ionCheckApi.IsVersionAtLeast(BModels.BruceApi.VERSION_WITH_PROXIES)) {
-                                shouldCreate = (ionKey === null || ionKey === void 0 ? void 0 : ionKey.Available) === true;
+                            // Proxy server was set after verifying Ion availability upstream
+                            if (Cesium.Ion.defaultServer) {
+                                shouldCreate = true;
                             }
                             // Legacy route, to be killed off.
                             else {
-                                shouldCreate = (ionKey === null || ionKey === void 0 ? void 0 : ionKey.Key) ? await exports.ViewerUtils.AssertIonToken(ionKey.Key) : false;
+                                shouldCreate = await exports.ViewerUtils.AssertIonToken(Cesium.Ion.defaultAccessToken);
                             }
                         }
                         if (shouldCreate) {
@@ -36229,7 +36218,7 @@
         }
     }
 
-    const VERSION = "6.7.0";
+    const VERSION = "6.7.2";
     /**
      * Updates the environment instance used by bruce-cesium to one specified.
      * This can be used to ensure that the instance a parent is referencing is shared between bruce-cesium, bruce-models, and the parent app.