bruce-cesium 6.7.6 → 6.7.8

package/dist/bruce-cesium.es5.js

@@ -1,5 +1,5 @@
 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, 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, IonResource, EllipsoidTerrainProvider, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, 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 { Cartes, Entity as Entity$1, ENVIRONMENT, Calculator, ClientFile, EntityLod, EntityTag, EntityType, LRUCache, ObjectUtils, Style, Api, Bounds, Geometry, Carto, MenuItem, ProjectView, ProjectViewBookmark, Tileset, ZoomControl, BruceEvent, EntityCoords, DataLab, DelayQueue, EntityHistoricData, AccountConcept, RecordChangeFeed, BruceApi, EntityRelation, ProgramKey, EntitySource, ProjectViewLegacyTile, ProjectViewTile, Camera, EntityAttachment, EntityAttachmentType, EntityAttribute, MathUtils, Session, EntityRelationType } from 'bruce-models';
 
 /**
@@ -13981,11 +13981,16 @@ var TilesetCadRenderManager;
                         cacheToken: tileset.generateVersion,
                         viaCdn: Boolean(this.item.cdnEnabled == null ? true : this.item.cdnEnabled)
                     });
-                    api.get(modelTreeUrl).then((blob) => {
+                    api.get(modelTreeUrl).then(async (result) => {
                         if (this.disposed) {
                             return;
                         }
-                        this.modelTree = blob || null;
+                        // S3 signed URLs may return application/octet-stream instead of application/json,
+                        // causing the API to return a Blob rather than a parsed object.
+                        if (result instanceof Blob) {
+                            result = JSON.parse(await result.text());
+                        }
+                        this.modelTree = result || null;
                         this.modelTreeUpdate.Trigger(this.modelTree);
                     }).catch((err) => {
                         this.modelTreeError = err.message || "Unknown error";
@@ -13993,12 +13998,15 @@ var TilesetCadRenderManager;
                 }
                 // In v1 the model-tree is inside the tileset.json.
                 else {
-                    api.get(tileset.loadUrl).then((blob) => {
+                    api.get(tileset.loadUrl).then(async (result) => {
                         var _a;
                         if (this.disposed) {
                             return;
                         }
-                        this.modelTree = ((_a = blob === null || blob === void 0 ? void 0 : blob.extensions) === null || _a === void 0 ? void 0 : _a.modelTree) || null;
+                        if (result instanceof Blob) {
+                            result = JSON.parse(await result.text());
+                        }
+                        this.modelTree = ((_a = result === null || result === void 0 ? void 0 : result.extensions) === null || _a === void 0 ? void 0 : _a.modelTree) || null;
                         this.modelTreeUpdate.Trigger(this.modelTree);
                     }).catch((err) => {
                         this.modelTreeError = err.message || "Unknown error";
@@ -15827,10 +15835,14 @@ var EntityFilterGetter;
                             }
                             // API gave us a URL to use.
                             else if (curCell.FetchURL) {
-                                const tmpResponse = await this.api.get(curCell.FetchURL, {
+                                let tmpResponse = await this.api.get(curCell.FetchURL, {
                                     abortSignal: abortController.signal,
                                     noCache: true
                                 });
+                                // S3 signed URLs may return application/octet-stream, causing a Blob result.
+                                if (tmpResponse instanceof Blob) {
+                                    tmpResponse = JSON.parse(await tmpResponse.text());
+                                }
                                 // Same mapping as bruce-models doing Entity.GetList.
                                 response = {
                                     entities: tmpResponse.Items ? tmpResponse.Items : [],
@@ -19134,7 +19146,7 @@ var RelationsRenderManager;
 })(RelationsRenderManager || (RelationsRenderManager = {}));
 
 var TilesetGooglePhotosRenderManager;
-(function (TilesetGooglePhotosRenderManager) {
+(function (TilesetGooglePhotosRenderManager$$1) {
     class Manager {
         get Disposed() {
             return this.disposed;
@@ -19176,7 +19188,7 @@ var TilesetGooglePhotosRenderManager;
                 this.item = params.item;
             }
             (async () => {
-                var _a;
+                var _a, _b, _c;
                 // If the tileset already exists then we just need to update the style.
                 if (this.cTileset) {
                     const colorCss = this.item.colorMask;
@@ -19203,16 +19215,44 @@ var TilesetGooglePhotosRenderManager;
                         console.warn("Cesium version does not support 'createGooglePhotorealistic3DTileset' so Google Photos tileset will not be rendered.");
                         return;
                     }
+                    // Proxy path: key injected server-side.
                     if (api.IsVersionAtLeast(BruceApi.VERSION_WITH_PROXIES)) {
-                        // Proxy path: key injected server-side.
-                        const proxyRootUrl = api.GetBaseUrl() + "proxy/google-tiles/v1/3dtiles/root.json";
+                        // If we have a Google token we'll proxy through that.
+                        // Otherwise use Cesium Ion to load as a resource.
+                        const { programKeys } = await ProgramKey.GetList({
+                            api: this.getters.GetBruceApi()
+                        });
+                        const hasGoogleToken = Boolean((_a = programKeys.find(x => x.ProgramId === ProgramKey.EProgramId.GooglePhotogrammetry)) === null || _a === void 0 ? void 0 : _a.Available);
+                        // Must have own iot token, this ensures we don't use our template one for loading customer photogrammetry.
+                        const hasIonToken = Boolean((_b = programKeys.find(x => x.ProgramId === ProgramKey.EProgramId.CesiumIon)) === null || _b === void 0 ? void 0 : _b.Available);
                         if (this.disposed) {
                             this.doDispose();
                             return;
                         }
-                        this.cTileset = await CESIUM.Cesium3DTileset.fromUrl(proxyRootUrl, {
-                            showCreditsOnScreen: true
-                        });
+                        // WARNING: we are routing through ion first right now as it is faster.
+                        // Should be a user-decision and we should improve our google proxying.
+                        if (hasIonToken && Ion.defaultServer) {
+                            const loadUrl = await IonResource.fromAssetId(2275207, undefined);
+                            if (this.disposed) {
+                                this.doDispose();
+                                return;
+                            }
+                            this.cTileset = await createTileset(loadUrl, {}, true);
+                        }
+                        else if (hasGoogleToken) {
+                            const proxyRootUrl = api.GetBaseUrl() + "proxy/google-tiles/v1/3dtiles/root.json";
+                            if (this.disposed) {
+                                this.doDispose();
+                                return;
+                            }
+                            this.cTileset = await CESIUM.Cesium3DTileset.fromUrl(proxyRootUrl, {
+                                showCreditsOnScreen: true
+                            });
+                        }
+                        else {
+                            console.warn("No Google or Cesium Ion token available, so Google Photos tileset will not be rendered.");
+                            return;
+                        }
                     }
                     // Legacy path: fetch real Google key and use createGooglePhotorealistic3DTileset().
                     // Kill of whenever all API instances are migrated.
@@ -19240,7 +19280,7 @@ var TilesetGooglePhotosRenderManager;
                             this.doDispose();
                             return;
                         }
-                        this.cTileset = await ((_a = CESIUM.createGooglePhotorealistic3DTileset) === null || _a === void 0 ? void 0 : _a.call(CESIUM));
+                        this.cTileset = await ((_c = CESIUM.createGooglePhotorealistic3DTileset) === null || _c === void 0 ? void 0 : _c.call(CESIUM));
                     }
                     if (this.disposed) {
                         this.doDispose();
@@ -19268,7 +19308,7 @@ var TilesetGooglePhotosRenderManager;
         async ReRender(params) {
         }
     }
-    TilesetGooglePhotosRenderManager.Manager = Manager;
+    TilesetGooglePhotosRenderManager$$1.Manager = Manager;
 })(TilesetGooglePhotosRenderManager || (TilesetGooglePhotosRenderManager = {}));
 
 /**
@@ -36476,7 +36516,7 @@ var StyleUtils;
     StyleUtils.ApplyTypeStyle = ApplyTypeStyle;
 })(StyleUtils || (StyleUtils = {}));
 
-const VERSION = "6.7.6";
+const VERSION = "6.7.8";
 /**
  * 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.
@@ -36493,5 +36533,5 @@ const getENVIRONMENT = () => {
     return ENVIRONMENT;
 };
 
-export { VERSION, setENVIRONMENT, getENVIRONMENT, CesiumAnimatedInOut, CesiumAnimatedProperty, isOutlineChanged$1 as isOutlineChanged, StyleEffective, EntityRenderEngine, EntityRenderEngineModel3d, EntityRenderEnginePoint, EntityRenderEnginePolygon, EntityRenderEnginePolyline, MenuItemCreator, MenuItemManager, CesiumParabola, EntityLabel, LiveCursor, SharedGetters, DataSourceStaticKmlManager, DataLabRenderManager, EntitiesIdsRenderManager, EntitiesLoadedRenderManager, EntitiesRenderManager, EntityRenderManager, AssemblyRenderManager, GoogleSearchRenderManager, RelationsRenderManager, RenderManager, TilesetArbRenderManager, TilesetCadRenderManager, TilesetEntitiesRenderManager, TilesetGooglePhotosRenderManager, TilesetOsmRenderManager, TilesetPointcloudRenderManager, TileRenderEngine, TilesetRenderEngine, ViewRenderEngine, VisualsRegister, XGridsRenderEngine, CesiumEntityStyler, DrawingUtils, EntityUtils, MeasureUtils, StyleUtils, CESIUM_INSPECTOR_KEY, CESIUM_TIMELINE_KEY, CESIUM_TIMELINE_LIVE_KEY, CESIUM_TIMELINE_LIVE_PADDING_KEY, CESIUM_TIMELINE_INTERVAL_KEY, CESIUM_MODEL_SPACE_KEY, DEFAULT_LIVE_PADDING_SECONDS, ViewUtils, CesiumViewMonitor, ViewGroundArea, ViewerEventTracker, ViewerUtils, Draw3dPolygon, Draw3dPolyline, MeasureCreator, Walkthrough, WidgetControlViewBar, WidgetControlViewBarSearch, WidgetLeftPanelTab, WidgetLeftPanelTabBookmarks, Widget, VIEWER_BOOKMARKS_WIDGET_KEY, WidgetBookmarks, WidgetBranding, WidgetCursorBar, WidgetEmbeddedInfoView, WidgetInfoView, VIEWER_LEFT_PANEL_WIDGET_KEY, VIEWER_LEFT_PANEL_CSS_VAR_LEFT, WidgetLeftPanel, WidgetNavCompass$$1 as WidgetNavCompass, VIEWER_VIEW_BAR_WIDGET_KEY, WidgetViewBar };
+export { VERSION, setENVIRONMENT, getENVIRONMENT, CesiumAnimatedInOut, CesiumAnimatedProperty, isOutlineChanged$1 as isOutlineChanged, StyleEffective, EntityRenderEngine, EntityRenderEngineModel3d, EntityRenderEnginePoint, EntityRenderEnginePolygon, EntityRenderEnginePolyline, MenuItemCreator, MenuItemManager, CesiumParabola, EntityLabel, LiveCursor, SharedGetters, DataSourceStaticKmlManager, DataLabRenderManager, EntitiesIdsRenderManager, EntitiesLoadedRenderManager, EntitiesRenderManager, EntityRenderManager, AssemblyRenderManager, GoogleSearchRenderManager, RelationsRenderManager, RenderManager, TilesetArbRenderManager, TilesetCadRenderManager, TilesetEntitiesRenderManager, TilesetGooglePhotosRenderManager, TilesetOsmRenderManager, TilesetPointcloudRenderManager, TileRenderEngine, createTileset, TilesetRenderEngine, ViewRenderEngine, VisualsRegister, XGridsRenderEngine, CesiumEntityStyler, DrawingUtils, EntityUtils, MeasureUtils, StyleUtils, CESIUM_INSPECTOR_KEY, CESIUM_TIMELINE_KEY, CESIUM_TIMELINE_LIVE_KEY, CESIUM_TIMELINE_LIVE_PADDING_KEY, CESIUM_TIMELINE_INTERVAL_KEY, CESIUM_MODEL_SPACE_KEY, DEFAULT_LIVE_PADDING_SECONDS, ViewUtils, CesiumViewMonitor, ViewGroundArea, ViewerEventTracker, ViewerUtils, Draw3dPolygon, Draw3dPolyline, MeasureCreator, Walkthrough, WidgetControlViewBar, WidgetControlViewBarSearch, WidgetLeftPanelTab, WidgetLeftPanelTabBookmarks, Widget, VIEWER_BOOKMARKS_WIDGET_KEY, WidgetBookmarks, WidgetBranding, WidgetCursorBar, WidgetEmbeddedInfoView, WidgetInfoView, VIEWER_LEFT_PANEL_WIDGET_KEY, VIEWER_LEFT_PANEL_CSS_VAR_LEFT, WidgetLeftPanel, WidgetNavCompass$$1 as WidgetNavCompass, VIEWER_VIEW_BAR_WIDGET_KEY, WidgetViewBar };
 //# sourceMappingURL=bruce-cesium.es5.js.map