bruce-cesium 6.7.6 → 6.7.8

package/dist/bruce-cesium.umd.js

@@ -13935,11 +13935,16 @@
                             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";
@@ -13947,12 +13952,15 @@
                     }
                     // 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";
@@ -15780,10 +15788,14 @@
                                 }
                                 // 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 : [],
@@ -19115,7 +19127,7 @@
                     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;
@@ -19142,16 +19154,44 @@
                             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(BModels.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 BModels.ProgramKey.GetList({
+                                api: this.getters.GetBruceApi()
+                            });
+                            const hasGoogleToken = Boolean((_a = programKeys.find(x => x.ProgramId === BModels.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 === BModels.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 && Cesium.Ion.defaultServer) {
+                                const loadUrl = await Cesium.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.
@@ -19179,7 +19219,7 @@
                                 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();
@@ -36354,7 +36394,7 @@
         StyleUtils.ApplyTypeStyle = ApplyTypeStyle;
     })(exports.StyleUtils || (exports.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.
@@ -36376,6 +36416,7 @@
     exports.getENVIRONMENT = getENVIRONMENT;
     exports.isOutlineChanged = isOutlineChanged$1;
     exports.CesiumParabola = CesiumParabola;
+    exports.createTileset = createTileset;
     exports.CESIUM_INSPECTOR_KEY = CESIUM_INSPECTOR_KEY;
     exports.CESIUM_TIMELINE_KEY = CESIUM_TIMELINE_KEY;
     exports.CESIUM_TIMELINE_LIVE_KEY = CESIUM_TIMELINE_LIVE_KEY;