bruce-cesium 6.6.9 → 6.7.0

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, EntitySource, ClientFile, MenuItem, EntityRelation, BruceApi, ProgramKey, Bounds, Carto, ProjectView, ProjectViewBookmark, ProjectViewLegacyTile, Camera, 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, BruceApi, EntitySource, ProgramKey, ClientFile, MenuItem, EntityRelation, Bounds, Carto, ProjectView, ProjectViewBookmark, Camera, ProjectViewLegacyTile, EntityAttachment, EntityAttachmentType, EntityAttribute, MathUtils, Session } from 'bruce-models';
 import * as Cesium from 'cesium';
-import { Cartographic, ColorMaterialProperty, Entity, Color, ConstantProperty, CallbackProperty, Primitive, Cesium3DTileFeature, Math as Math$1, Cartesian3, JulianDate, Quaternion, Transforms, HeadingPitchRoll, Matrix4, DistanceDisplayCondition, HeightReference, ColorBlendMode, ShadowMode, ClassificationType, Model, HorizontalOrigin, VerticalOrigin, ConstantPositionProperty, PolygonHierarchy, PolylineGraphics, ArcType, CornerType, Cartesian2, SceneTransforms, NearFarScalar, Matrix3, Rectangle, KmlDataSource, GeoJsonDataSource, SceneMode, Cesium3DTileStyle, HeadingPitchRange, Cesium3DTileColorBlendMode, Ion, EllipsoidTerrainProvider, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, IonResource, Cesium3DTileset, OrthographicFrustum, EasingFunction, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, BoundingSphere, GeometryInstance, PolygonPipeline, CesiumInspector, ClockRange, ScreenSpaceEventHandler, ScreenSpaceEventType, Intersect, CzmlDataSource, Fullscreen } 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';
 
 /**
  * Ensures a number is returned from a given value.
@@ -16113,7 +16113,19 @@ var TilesetOsmRenderManager;
                     // Already exists, no need to re-initialize.
                     return;
                 }
-                const validToken = await ViewerUtils.AssertIonToken(Ion.defaultAccessToken);
+                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;
+                }
+                // Legacy route, to be killed off.
+                else {
+                    validToken = (ionKey === null || ionKey === void 0 ? void 0 : ionKey.Key) ? await ViewerUtils.AssertIonToken(ionKey.Key) : false;
+                }
                 if (!validToken) {
                     console.warn("'tileset-osm-render-manager.ts' could not locate a valid Cesium Ion token.");
                     return;
@@ -23080,7 +23092,18 @@ 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)) {
-                        shouldCreate = await ViewerUtils.AssertIonToken(Ion.defaultAccessToken);
+                        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;
+                        }
+                        // Legacy route, to be killed off.
+                        else {
+                            shouldCreate = (ionKey === null || ionKey === void 0 ? void 0 : ionKey.Key) ? await ViewerUtils.AssertIonToken(ionKey.Key) : false;
+                        }
                     }
                     if (shouldCreate) {
                         try {
@@ -23523,7 +23546,18 @@ var TileRenderEngine;
                     // Cesium token is required for Cesium World Terrain.
                     let shouldCreate = true;
                     if (defaultTerr.id == ProjectViewTile.EDefaultTerrain.CesiumWorldTerrain) {
-                        shouldCreate = await ViewerUtils.AssertIonToken(Ion.defaultAccessToken);
+                        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;
+                        }
+                        // Legacy route, to be killed off.
+                        else {
+                            shouldCreate = (ionKey === null || ionKey === void 0 ? void 0 : ionKey.Key) ? await ViewerUtils.AssertIonToken(ionKey.Key) : false;
+                        }
                     }
                     if (shouldCreate) {
                         provider = await renderDefaultTerrTile(defaultTerr.id);
@@ -23855,31 +23889,27 @@ async function renderNavigator(iteration, params, bookmark, view, getters) {
         try {
             const bruceApi = getters.GetBruceApi();
             await bruceApi.Loading;
-            // Proxy path: token injected server-side.
+            // Get token record to check availability.
+            const { programKeys } = await ProgramKey.GetList({ api: bruceApi });
+            const ionKey = programKeys.find(k => k.ProgramId === ProgramKey.EProgramId.CesiumIon);
             if (bruceApi.IsVersionAtLeast(BruceApi.VERSION_WITH_PROXIES)) {
-                Ion.defaultServer = bruceApi.GetBaseUrl() + "proxy/cesium-ion/";
-                Ion.defaultAccessToken = "proxy";
-                cTokenSet = true;
+                // Marked as available.
+                if (ionKey === null || ionKey === void 0 ? void 0 : ionKey.Available) {
+                    Ion.defaultServer = bruceApi.GetBaseUrl() + "proxy/cesium-ion/";
+                    Ion.defaultAccessToken = "proxy";
+                    cTokenSet = true;
+                }
             }
-            // Legacy path: fetch real Ion token from DB.
-            // Kill off once API instances are migrated.
             else {
-                try {
-                    const { programKey } = await ProgramKey.Get({
-                        programId: ProgramKey.EProgramId.CesiumIon,
-                        api: bruceApi
-                    });
-                    if (programKey === null || programKey === void 0 ? void 0 : programKey.Key) {
-                        const valid = await ViewerUtils.AssertIonToken(programKey.Key);
-                        if (valid) {
-                            Ion.defaultAccessToken = programKey.Key;
-                            cTokenSet = true;
-                        }
+                // Legacy path: fetch real Ion token from DB.
+                // Kill off once API instances are migrated.
+                if (ionKey === null || ionKey === void 0 ? void 0 : ionKey.Key) {
+                    const valid = await ViewerUtils.AssertIonToken(ionKey.Key);
+                    if (valid) {
+                        Ion.defaultAccessToken = ionKey.Key;
+                        cTokenSet = true;
                     }
                 }
-                catch (e) {
-                    console.error(e);
-                }
             }
         }
         catch (e) {
@@ -29700,16 +29730,12 @@ var ViewerUtils;
     ViewerUtils$$1.CreateWidgets = CreateWidgets;
     /**
      * Returns if the given token is valid or not.
-     * This will perform a test request to Cesium API.
+     * Returns true if the supplied Cesium Ion access token is valid by probing the Ion endpoint.
+     * @warning don't use when going through the proxy API route.
      * @param token
      * @returns
      */
     async function AssertIonToken(token) {
-        // If routed through a proxy then we don't need auth on client side for it.
-        const defaultServer = Ion.defaultServer;
-        if (defaultServer && typeof defaultServer === "string" && !defaultServer.includes("cesium.com")) {
-            return true;
-        }
         if (!token) {
             return false;
         }
@@ -36314,7 +36340,7 @@ class WidgetViewBar extends Widget.AWidget {
     }
 }
 
-const VERSION = "6.6.9";
+const VERSION = "6.7.0";
 /**
  * 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.