bruce-cesium 6.7.7 → 6.7.9

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 : [],
@@ -30557,25 +30569,27 @@
         var _a;
         const prepareLatitude = (propName, value) => {
             value = +value;
-            // Check to see if the lat is in valid degrees, if not, try convert from radians.
+            // Check to see if the lat is in valid degrees, if not, convert from radians.
             if (value < -90 || value > 90) {
-                value = Cesium.Math.toDegrees(value);
+                return Cesium.Math.toDegrees(value);
             }
             // If the value is really small we'll assume it's in radians.
             // "cesium#blah" properties are always in degrees. No need to check.
-            if (value < 0.9 && !propName.startsWith("cesium#")) {
+            // (Only reached when the value wasn't already converted above, to avoid double-converting.)
+            if (value < 0.9 && value > -0.9 && !propName.startsWith("cesium#")) {
                 value = Cesium.Math.toDegrees(value);
             }
             return value;
         };
         const prepareLongitude = (propName, value) => {
             value = +value;
-            // Check to see if the lon is in valid degrees, if not, try convert from radians.
+            // Check to see if the lon is in valid degrees, if not, convert from radians.
             if (value < -180 || value > 180) {
-                value = Cesium.Math.toDegrees(value);
+                return Cesium.Math.toDegrees(value);
             }
             // If the value is really small we'll assume it's in radians.
             // "cesium#blah" properties are always in degrees. No need to check.
+            // (Only reached when the value wasn't already converted above, to avoid double-converting.)
             if (value < 0.9 && value > -0.9 && !propName.startsWith("cesium#")) {
                 value = Cesium.Math.toDegrees(value);
             }
@@ -31256,6 +31270,84 @@
             catch (e) {
                 console.error(e);
             }
+            // Some records may still not be expanded.
+            // We have to detect whatever is an Assembly Entity and expand it.
+            try {
+                const needsExpansion = recordSamples.filter(x => {
+                    const assemblyPos = BModels.Entity.GetValue({
+                        entity: x.entity,
+                        path: ["Bruce", "AssemblyPosition"]
+                    });
+                    if (!assemblyPos) {
+                        return false;
+                    }
+                    const rootPos = BModels.Entity.GetValue({
+                        entity: x.entity,
+                        path: ["Bruce", "AssemblyRootPosition"]
+                    });
+                    return !rootPos;
+                });
+                if (needsExpansion.length) {
+                    const EXPAND_BATCH_SIZE = 30;
+                    const EXPAND_MAX_IDS = 200;
+                    // Figure out if any are in the scene.
+                    // Helps us sort leaf-nodes away from category nodes thta don't have geometry.
+                    const isInScene = (sample) => {
+                        var _a;
+                        return !!(visualRegister && visualRegister.GetRego({
+                            entityId: (_a = sample.entityId) !== null && _a !== void 0 ? _a : sample.entity.Bruce.ID,
+                            menuItemId: sample.menuItemId
+                        }));
+                    };
+                    // Trim to max 200 with a preference to those in the scene.
+                    const sceneSamples = needsExpansion.filter(isInScene);
+                    const offSceneSamples = sceneSamples.length ? needsExpansion.filter(x => !isInScene(x)) : [];
+                    if (offSceneSamples.length) {
+                        const offSceneIds = new Set(offSceneSamples.map(x => x.entity.Bruce.ID));
+                        recordSamples = recordSamples.filter(x => !offSceneIds.has(x.entity.Bruce.ID));
+                    }
+                    const effectiveSamples = sceneSamples.length ? sceneSamples : needsExpansion;
+                    const uniqueIds = Array.from(new Set(effectiveSamples.map(x => x.entity.Bruce.ID)));
+                    const expandIds = uniqueIds.slice(0, EXPAND_MAX_IDS);
+                    // Anything we didn't expand will taint the overall result so we have to filter them out.
+                    const droppedIds = new Set(uniqueIds.slice(EXPAND_MAX_IDS));
+                    if (droppedIds.size) {
+                        recordSamples = recordSamples.filter(x => !droppedIds.has(x.entity.Bruce.ID));
+                    }
+                    const expandedMap = new Map();
+                    const batches = [];
+                    for (let i = 0; i < expandIds.length; i += EXPAND_BATCH_SIZE) {
+                        batches.push(expandIds.slice(i, i + EXPAND_BATCH_SIZE));
+                    }
+                    const batchResults = await Promise.all(batches.map(batchIds => BModels.Entity.GetListByIds({
+                        entityIds: batchIds,
+                        historicPoint: latestDate,
+                        expandLocation: true,
+                        expandSources: true,
+                        migrated: true,
+                        maxSearchTimeSec: 60 * 2,
+                        api
+                    }).catch(e => {
+                        console.error(e);
+                        return { entities: [] };
+                    })));
+                    for (const { entities } of batchResults) {
+                        for (let i = 0; i < entities.length; i++) {
+                            expandedMap.set(entities[i].Bruce.ID, entities[i]);
+                        }
+                    }
+                    for (let i = 0; i < effectiveSamples.length; i++) {
+                        const sample = effectiveSamples[i];
+                        const expanded = expandedMap.get(sample.entity.Bruce.ID);
+                        if (expanded) {
+                            sample.entity = expanded;
+                        }
+                    }
+                }
+            }
+            catch (e) {
+                console.error(e);
+            }
             for (let i = 0; i < recordSamples.length; i++) {
                 const sample = recordSamples[i];
                 const samplePosses = await getRecordEntityPositions(sample);
@@ -36382,7 +36474,7 @@
         StyleUtils.ApplyTypeStyle = ApplyTypeStyle;
     })(exports.StyleUtils || (exports.StyleUtils = {}));
 
-    const VERSION = "6.7.7";
+    const VERSION = "6.7.9";
     /**
      * 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.