bruce-cesium 6.7.0 → 6.7.1

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
-import { Cartes, Entity as Entity$1, Geometry, ProjectViewTile, ENVIRONMENT, EntityRelationType, EntityType, Calculator, Style, DelayQueue, LRUCache, BruceEvent, ObjectUtils, AccountConcept, EntityHistoricData, EntityLod, RecordChangeFeed, ZoomControl, EntityTag, Tileset, EntityCoords, Api, DataLab, BruceApi, EntitySource, ProgramKey, ClientFile, MenuItem, EntityRelation, Bounds, Carto, ProjectView, ProjectViewBookmark, Camera, ProjectViewLegacyTile, EntityAttachment, EntityAttachmentType, EntityAttribute, MathUtils, Session } from 'bruce-models';
+import { Cartes, Entity as Entity$1, Geometry, ProjectViewTile, ENVIRONMENT, EntityRelationType, EntityType, Calculator, Style, DelayQueue, LRUCache, BruceEvent, ObjectUtils, AccountConcept, EntityHistoricData, EntityLod, RecordChangeFeed, ZoomControl, EntityTag, Tileset, EntityCoords, Api, DataLab, EntitySource, ClientFile, MenuItem, EntityRelation, BruceApi, ProgramKey, Bounds, Carto, ProjectView, ProjectViewBookmark, ProjectViewLegacyTile, Camera, Session, EntityAttachment, EntityAttachmentType, EntityAttribute, MathUtils } from 'bruce-models';
 import * as Cesium from 'cesium';
-import { Cartographic, ColorMaterialProperty, Color, Math as Math$1, Cartesian3, JulianDate, Quaternion, Transforms, HeadingPitchRoll, Matrix4, Entity, ConstantProperty, CallbackProperty, Primitive, Cesium3DTileFeature, DistanceDisplayCondition, HeightReference, ColorBlendMode, ShadowMode, ClassificationType, Model, HorizontalOrigin, VerticalOrigin, ConstantPositionProperty, PolygonHierarchy, PolylineGraphics, ArcType, CornerType, Cartesian2, SceneTransforms, NearFarScalar, Matrix3, Rectangle, KmlDataSource, GeoJsonDataSource, SceneMode, Cesium3DTileStyle, HeadingPitchRange, Cesium3DTileColorBlendMode, Cesium3DTileset, IonResource, OrthographicFrustum, Ion, EasingFunction, EllipsoidTerrainProvider, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, BoundingSphere, GeometryInstance, PolygonPipeline, CesiumInspector, ClockRange, ScreenSpaceEventHandler, ScreenSpaceEventType, Intersect, CzmlDataSource, Fullscreen } from 'cesium';
+import { Cartographic, ColorMaterialProperty, Entity, Color, ConstantProperty, CallbackProperty, Primitive, Cesium3DTileFeature, DistanceDisplayCondition, Math as Math$1, Cartesian3, JulianDate, Quaternion, Transforms, HeadingPitchRoll, Matrix4, HeightReference, HorizontalOrigin, VerticalOrigin, ClassificationType, ConstantPositionProperty, PolygonHierarchy, ShadowMode, PolylineGraphics, ArcType, CornerType, ColorBlendMode, Model, Cartesian2, SceneTransforms, NearFarScalar, Matrix3, Rectangle, KmlDataSource, GeoJsonDataSource, SceneMode, HeadingPitchRange, Cesium3DTileStyle, Cesium3DTileColorBlendMode, Ion, Cesium3DTileset, IonResource, EllipsoidTerrainProvider, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, OrthographicFrustum, EasingFunction, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, BoundingSphere, GeometryInstance, PolygonPipeline, CesiumInspector, ClockRange, ScreenSpaceEventHandler, ScreenSpaceEventType, Intersect, CzmlDataSource, Fullscreen } from 'cesium';
 
 /**
  * Ensures a number is returned from a given value.
@@ -16113,18 +16113,15 @@ var TilesetOsmRenderManager;
                     // Already exists, no need to re-initialize.
                     return;
                 }
-                const ionCheckApi = this.getters.GetBruceApi({});
-                await ionCheckApi.Loading;
-                const { programKeys: ionCheckKeys } = await ProgramKey.GetList({ api: ionCheckApi });
-                const ionKey = ionCheckKeys.find(k => k.ProgramId === ProgramKey.EProgramId.CesiumIon);
-                // Use if marked as available.
                 let validToken;
-                if (ionCheckApi.IsVersionAtLeast(BruceApi.VERSION_WITH_PROXIES)) {
-                    validToken = (ionKey === null || ionKey === void 0 ? void 0 : ionKey.Available) === true;
+                if (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 ViewerUtils.AssertIonToken(ionKey.Key) : false;
+                    // No proxy; validate the legacy access token directly.
+                    validToken = await ViewerUtils.AssertIonToken(Ion.defaultAccessToken);
                 }
                 if (!validToken) {
                     console.warn("'tileset-osm-render-manager.ts' could not locate a valid Cesium Ion token.");
@@ -23092,17 +23089,13 @@ var TileRenderEngine;
                     // 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 ProgramKey.GetList({ api: ionCheckApi });
-                        const ionKey = ionCheckKeys.find(k => k.ProgramId === ProgramKey.EProgramId.CesiumIon);
-                        // Use if marked as available.
-                        if (ionCheckApi.IsVersionAtLeast(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 (Ion.defaultServer) {
+                            shouldCreate = true;
                         }
                         // Legacy route, to be killed off.
                         else {
-                            shouldCreate = (ionKey === null || ionKey === void 0 ? void 0 : ionKey.Key) ? await ViewerUtils.AssertIonToken(ionKey.Key) : false;
+                            shouldCreate = await ViewerUtils.AssertIonToken(Ion.defaultAccessToken);
                         }
                     }
                     if (shouldCreate) {
@@ -23546,17 +23539,13 @@ var TileRenderEngine;
                     // Cesium token is required for Cesium World Terrain.
                     let shouldCreate = true;
                     if (defaultTerr.id == ProjectViewTile.EDefaultTerrain.CesiumWorldTerrain) {
-                        const ionCheckApi = params.apiGetter.getApi(params.apiGetter.accountId);
-                        await ionCheckApi.Loading;
-                        const { programKeys: ionCheckKeys } = await ProgramKey.GetList({ api: ionCheckApi });
-                        const ionKey = ionCheckKeys.find(k => k.ProgramId === ProgramKey.EProgramId.CesiumIon);
-                        // Use if marked as available.
-                        if (ionCheckApi.IsVersionAtLeast(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 (Ion.defaultServer) {
+                            shouldCreate = true;
                         }
                         // Legacy route, to be killed off.
                         else {
-                            shouldCreate = (ionKey === null || ionKey === void 0 ? void 0 : ionKey.Key) ? await ViewerUtils.AssertIonToken(ionKey.Key) : false;
+                            shouldCreate = await ViewerUtils.AssertIonToken(Ion.defaultAccessToken);
                         }
                     }
                     if (shouldCreate) {
@@ -36340,7 +36329,7 @@ class WidgetViewBar extends Widget.AWidget {
     }
 }
 
-const VERSION = "6.7.0";
+const VERSION = "6.7.1";
 /**
  * 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.