bruce-cesium 5.9.2 → 5.9.4

package/dist/bruce-cesium.umd.js

@@ -16695,32 +16695,33 @@
             const api = params.apiGetter.getApi(params.accountId);
             // Ensure regional url is loaded.
             await api.Loading;
-            let loadUrl = params.tileset.loadUrl;
-            // CDN enabled and tileset url template is available.
-            if (params.viaCdn && api.GetCdnBaseUrl()) {
-                /*
-                    loadUrl = api.TilesetCdnUrl.replace("<TILESETID>", params.tileset.id).replace("<FILEPATH>", "files/tileset.json");
-                    // First url param reserved for accountId. This is set within the API instance.
-                    loadUrl += "&generation=" + params.tileset.generateVersion;
-                */
-                loadUrl = BModels.Tileset.GetFileUrl({
-                    file: "tileset.json",
-                    tilesetId: params.tileset.id,
-                    viaCdn: true,
-                    legacy: false,
-                    cacheToken: params.tileset.generateVersion,
-                    api: api
-                });
+            let loadUrl = params.loadUrl;
+            if (!loadUrl) {
+                loadUrl = params.tileset.loadUrl;
+                // CDN enabled and tileset url template is available.
+                if (params.viaCdn && api.GetCdnBaseUrl()) {
+                    loadUrl = BModels.Tileset.GetFileUrl({
+                        file: "tileset.json",
+                        tilesetId: params.tileset.id,
+                        viaCdn: true,
+                        legacy: false,
+                        cacheToken: params.tileset.generateVersion,
+                        api: api
+                    });
+                }
             }
             if (params.tileset.type == BModels.Tileset.EType.Cad) {
-                const cTileset = await createTileset(loadUrl ? loadUrl : BModels.Tileset.GetFileUrl({
-                    api,
-                    tilesetId: params.tileset.id,
-                    file: "tileset.json",
-                    cacheToken: params.tileset.generateVersion,
-                    legacy: false,
-                    viaCdn: false
-                }) + "?generation=" + params.tileset.generateVersion, null, params.noMemoryLimit);
+                if (!loadUrl) {
+                    BModels.Tileset.GetFileUrl({
+                        api,
+                        tilesetId: params.tileset.id,
+                        file: "tileset.json",
+                        cacheToken: params.tileset.generateVersion,
+                        legacy: false,
+                        viaCdn: false
+                    }) + "?generation=" + params.tileset.generateVersion;
+                }
+                const cTileset = await createTileset(loadUrl, null, params.noMemoryLimit);
                 params.viewer.scene.primitives.add(cTileset);
                 OnTilesetReady(cTileset).then(() => {
                     var _a, _b, _c, _d;
@@ -16756,26 +16757,32 @@
                 return cTileset;
             }
             else if (params.tileset.type === BModels.Tileset.EType.EntitiesSet) {
-                const cTileset = await createTileset(loadUrl ? loadUrl : BModels.Tileset.GetFileUrl({
-                    api,
-                    tilesetId: params.tileset.id,
-                    file: "tileset.json",
-                    cacheToken: params.tileset.generateVersion,
-                    legacy: false,
-                    viaCdn: false
-                }) + "?generation=" + params.tileset.generateVersion, null, params.noMemoryLimit);
+                if (!loadUrl) {
+                    loadUrl = BModels.Tileset.GetFileUrl({
+                        api,
+                        tilesetId: params.tileset.id,
+                        file: "tileset.json",
+                        cacheToken: params.tileset.generateVersion,
+                        legacy: false,
+                        viaCdn: false
+                    }) + "?generation=" + params.tileset.generateVersion;
+                }
+                const cTileset = await createTileset(loadUrl, null, params.noMemoryLimit);
                 params.viewer.scene.primitives.add(cTileset);
                 return cTileset;
             }
             else if (params.tileset.type == BModels.Tileset.EType.PointCloud) {
-                const cTileset = await createTileset(loadUrl ? loadUrl : BModels.Tileset.GetFileUrl({
-                    api,
-                    tilesetId: params.tileset.id,
-                    file: "tileset.json",
-                    cacheToken: params.tileset.generateVersion,
-                    legacy: false,
-                    viaCdn: false
-                }) + "?generation=" + params.tileset.generateVersion, null, params.noMemoryLimit);
+                if (!loadUrl) {
+                    loadUrl = BModels.Tileset.GetFileUrl({
+                        api,
+                        tilesetId: params.tileset.id,
+                        file: "tileset.json",
+                        cacheToken: params.tileset.generateVersion,
+                        legacy: false,
+                        viaCdn: false
+                    }) + "?generation=" + params.tileset.generateVersion;
+                }
+                const cTileset = await createTileset(loadUrl, null, params.noMemoryLimit);
                 params.viewer.scene.primitives.add(cTileset);
                 OnTilesetReady(cTileset).then(() => {
                     var _a;
@@ -18066,11 +18073,18 @@
             get Styler() {
                 return this.styler;
             }
+            get ModelTree() {
+                return this.modelTree;
+            }
+            get ModelTreeUpdate() {
+                return this.modelTreeUpdate;
+            }
             constructor(params) {
                 this.disposed = false;
                 this.modelSpace = false;
                 this.cTileset = null;
                 this.styler = new exports.TilesetRenderEngine.Styler();
+                this.modelTreeUpdate = new BModels.BruceEvent();
                 // Quick look-up of the model tree nodes by entity/geomId.
                 // Saves us from recursing the model tree for every feature.
                 this.treeNodeByGeomId = null;
@@ -18110,8 +18124,11 @@
                 if (this.renderPriority == null) {
                     this.renderPriority = 0;
                 }
+                const viaCdn = Boolean(this.item.cdnEnabled == null ? true : this.item.cdnEnabled);
+                // URL to load for loading the Tileset.
+                // We calculate it here instead of relying on the render engine as we need to extract the model-tree from it.
+                let loadUrl = null;
                 (async () => {
-                    var _a;
                     const api = this.getters.GetBruceApi({
                         accountId: accountId
                     });
@@ -18120,7 +18137,7 @@
                     // Single shared getter to avoid multiple assemblies fighting to render.
                     // This lets one complete, then the next start.
                     await exports.SharedGetters.Queue.Run("Rendering assembly.", async () => {
-                        var _a;
+                        var _a, _b, _c;
                         if (this.disposed) {
                             return;
                         }
@@ -18155,11 +18172,62 @@
                         if (!tileset || this.disposed) {
                             return;
                         }
+                        loadUrl = tileset.loadUrl;
+                        // CDN enabled and available.
+                        if (viaCdn && api.GetCdnBaseUrl()) {
+                            loadUrl = BModels.Tileset.GetFileUrl({
+                                file: "tileset.json",
+                                tilesetId: tileset.id,
+                                viaCdn: true,
+                                legacy: false,
+                                cacheToken: tileset.generateVersion,
+                                api: api
+                            });
+                        }
+                        // Backup. Should not be needed.
+                        if (!loadUrl) {
+                            loadUrl = BModels.Tileset.GetFileUrl({
+                                api,
+                                tilesetId: tileset.id,
+                                file: "tileset.json",
+                                cacheToken: tileset.generateVersion,
+                                legacy: false,
+                                viaCdn: false
+                            });
+                        }
+                        // ModelTree is needed to map incoming graphics to Entities.
+                        // So we load it first, then start rendering.
+                        try {
+                            // In >v1 the model-tree sits in its own file.
+                            if (((_a = tileset.settings) === null || _a === void 0 ? void 0 : _a["tilesetVersion"]) > 1) {
+                                const modelTreeUrl = BModels.Tileset.GetFileUrl({
+                                    api: api,
+                                    file: "model_tree.json",
+                                    tilesetId: tileset.id,
+                                    cacheToken: tileset.generateVersion,
+                                    viaCdn: Boolean(this.item.cdnEnabled == null ? true : this.item.cdnEnabled)
+                                });
+                                this.modelTree = await api.get(modelTreeUrl);
+                                this.modelTreeUpdate.Trigger(this.modelTree);
+                            }
+                            // In v1 the model-tree is inside the tileset.json.
+                            else {
+                                const tilesetJson = await api.get(tileset.loadUrl);
+                                this.modelTree = ((_b = tilesetJson === null || tilesetJson === void 0 ? void 0 : tilesetJson.extensions) === null || _b === void 0 ? void 0 : _b.modelTree) || null;
+                                this.modelTreeUpdate.Trigger(this.modelTree);
+                            }
+                        }
+                        catch (e) {
+                            console.error(e);
+                        }
+                        if (this.disposed) {
+                            return;
+                        }
                         const settings = tileset.settings;
                         const rootId = settings.rootEntityId;
                         this.rootId = rootId;
                         // If historic, we'll see if the root Entity has a historic position to use.
-                        if (((_a = this.item.BruceEntity) === null || _a === void 0 ? void 0 : _a.historic) && rootId) {
+                        if (((_c = this.item.BruceEntity) === null || _c === void 0 ? void 0 : _c.historic) && rootId) {
                             try {
                                 const { entity: root } = await BModels.Entity.Get({
                                     entityId: rootId,
@@ -18189,34 +18257,15 @@
                     if (!tileset || this.disposed) {
                         return;
                     }
-                    // Get the model tree if it's in a separate file.
-                    // There is a setting that is more explicit but it's lying on the file name so can't trust it yet.
-                    if (((_a = tileset.settings) === null || _a === void 0 ? void 0 : _a["tilesetVersion"]) > 1) {
-                        try {
-                            const modelTreeUrl = BModels.Tileset.GetFileUrl({
-                                api: api,
-                                file: "model_tree.json",
-                                tilesetId: tileset.id,
-                                cacheToken: tileset.generateVersion,
-                                viaCdn: Boolean(this.item.cdnEnabled == null ? true : this.item.cdnEnabled)
-                            });
-                            this.modelTree = await api.get(modelTreeUrl);
-                        }
-                        catch (e) {
-                            console.error(e);
-                        }
-                    }
-                    if (this.disposed) {
-                        return;
-                    }
                     // Render outside the shared process because we can't control file requests from Cesium.
                     const cTileset = this.cTileset = await exports.TilesetRenderEngine.Render({
+                        loadUrl: loadUrl,
                         apiGetter: this.getters.GetBruceGetter(),
                         tileset: tileset,
                         viewer: this.viewer,
                         coords: coords,
                         accountId: accountId,
-                        viaCdn: Boolean(this.item.cdnEnabled == null ? true : this.item.cdnEnabled),
+                        viaCdn: viaCdn,
                         noMemoryLimit: this.item["noMaximumMemory"],
                         modelSpace: this.modelSpace
                     });
@@ -18466,17 +18515,11 @@
                 }
             }
             getMetaByGeomId(geomId, tileset) {
-                var _a;
                 if (this.treeNodeByGeomId == null) {
-                    let modelTree = (_a = tileset === null || tileset === void 0 ? void 0 : tileset.extensions) === null || _a === void 0 ? void 0 : _a.modelTree;
-                    // Wasn't inside tileset.json and instead in a separate file.
-                    if (!modelTree) {
-                        modelTree = this.modelTree;
-                    }
-                    if (!modelTree) {
+                    if (!this.modelTree) {
                         return null;
                     }
-                    this.buildModelTreeNodes(modelTree);
+                    this.buildModelTreeNodes(this.modelTree);
                 }
                 return this.treeNodeByGeomId[geomId] || null;
             }
@@ -18510,7 +18553,7 @@
                         if (!firstFoundCollapsedBranch && node.collapsed) {
                             newFirstFoundCollapsedBranch = cache;
                         }
-                        // Push children to stack in reverse order to maintain correct traversal
+                        // Push children to stack in reverse order to maintain correct traversal.
                         if (node.children) {
                             for (let i = node.children.length - 1; i >= 0; i--) {
                                 stack.push({
@@ -18524,18 +18567,12 @@
                 }
             }
             getEntityTypeByPath(path) {
-                var _a, _b;
                 const entityId = path[path.length - 1];
                 if (this.treeNodeByEntityId == null) {
-                    let modelTree = (_b = (_a = this.cTileset) === null || _a === void 0 ? void 0 : _a.extensions) === null || _b === void 0 ? void 0 : _b.modelTree;
-                    // Wasn't inside tileset.json and instead in a separate file.
-                    if (!modelTree) {
-                        modelTree = this.modelTree;
-                    }
-                    if (!modelTree) {
+                    if (!this.modelTree) {
                         return null;
                     }
-                    this.buildModelTreeNodes(modelTree);
+                    this.buildModelTreeNodes(this.modelTree);
                 }
                 const node = this.treeNodeByEntityId[entityId] || null;
                 return node ? node.typeId : null;
@@ -18546,16 +18583,11 @@
              * @returns The parent node or null if no parent exists
              */
             getParentNode(entityId) {
-                var _a, _b;
                 if (this.treeNodeByEntityId == null) {
-                    let modelTree = (_b = (_a = this.cTileset) === null || _a === void 0 ? void 0 : _a.extensions) === null || _b === void 0 ? void 0 : _b.modelTree;
-                    if (!modelTree) {
-                        modelTree = this.modelTree;
-                    }
-                    if (!modelTree) {
+                    if (!this.modelTree) {
                         return null;
                     }
-                    this.buildModelTreeNodes(modelTree);
+                    this.buildModelTreeNodes(this.modelTree);
                 }
                 const node = this.treeNodeByEntityId[entityId];
                 if (node === null || node === void 0 ? void 0 : node.parentId) {
@@ -18569,16 +18601,11 @@
              * @returns Array of child nodes
              */
             getChildNodes(entityId) {
-                var _a, _b;
                 if (this.treeNodeByEntityId == null) {
-                    let modelTree = (_b = (_a = this.cTileset) === null || _a === void 0 ? void 0 : _a.extensions) === null || _b === void 0 ? void 0 : _b.modelTree;
-                    if (!modelTree) {
-                        modelTree = this.modelTree;
-                    }
-                    if (!modelTree) {
+                    if (!this.modelTree) {
                         return [];
                     }
-                    this.buildModelTreeNodes(modelTree);
+                    this.buildModelTreeNodes(this.modelTree);
                 }
                 const children = [];
                 for (const nodeId in this.treeNodeByEntityId) {
@@ -18595,16 +18622,11 @@
              * @returns Array of descendant nodes
              */
             getDescendantNodes(entityId) {
-                var _a, _b;
                 if (this.treeNodeByEntityId == null) {
-                    let modelTree = (_b = (_a = this.cTileset) === null || _a === void 0 ? void 0 : _a.extensions) === null || _b === void 0 ? void 0 : _b.modelTree;
-                    if (!modelTree) {
-                        modelTree = this.modelTree;
-                    }
-                    if (!modelTree) {
+                    if (!this.modelTree) {
                         return [];
                     }
-                    this.buildModelTreeNodes(modelTree);
+                    this.buildModelTreeNodes(this.modelTree);
                 }
                 const descendants = [];
                 const stack = [entityId];
@@ -18628,16 +18650,11 @@
              * @returns The root node or null if no tree exists
              */
             getRootNode() {
-                var _a, _b;
                 if (this.treeNodeByEntityId == null) {
-                    let modelTree = (_b = (_a = this.cTileset) === null || _a === void 0 ? void 0 : _a.extensions) === null || _b === void 0 ? void 0 : _b.modelTree;
-                    if (!modelTree) {
-                        modelTree = this.modelTree;
-                    }
-                    if (!modelTree) {
+                    if (!this.modelTree) {
                         return null;
                     }
-                    this.buildModelTreeNodes(modelTree);
+                    this.buildModelTreeNodes(this.modelTree);
                 }
                 // Find the node with no parent (root node)
                 for (const nodeId in this.treeNodeByEntityId) {
@@ -18654,16 +18671,11 @@
              * @returns Array of node IDs representing the path from root to the entity
              */
             getNodePath(entityId) {
-                var _a, _b;
                 if (this.treeNodeByEntityId == null) {
-                    let modelTree = (_b = (_a = this.cTileset) === null || _a === void 0 ? void 0 : _a.extensions) === null || _b === void 0 ? void 0 : _b.modelTree;
-                    if (!modelTree) {
-                        modelTree = this.modelTree;
-                    }
-                    if (!modelTree) {
+                    if (!this.modelTree) {
                         return [];
                     }
-                    this.buildModelTreeNodes(modelTree);
+                    this.buildModelTreeNodes(this.modelTree);
                 }
                 const path = [];
                 let currentId = entityId;
@@ -18683,16 +18695,11 @@
              * @returns Map of entityId to path array
              */
             getNodePathsBatch(entityIds) {
-                var _a, _b;
                 if (this.treeNodeByEntityId == null) {
-                    let modelTree = (_b = (_a = this.cTileset) === null || _a === void 0 ? void 0 : _a.extensions) === null || _b === void 0 ? void 0 : _b.modelTree;
-                    if (!modelTree) {
-                        modelTree = this.modelTree;
-                    }
-                    if (!modelTree) {
+                    if (!this.modelTree) {
                         return new Map();
                     }
-                    this.buildModelTreeNodes(modelTree);
+                    this.buildModelTreeNodes(this.modelTree);
                 }
                 const paths = new Map();
                 for (const entityId of entityIds) {
@@ -18716,16 +18723,11 @@
              * @returns Map of entityId to parent node
              */
             getParentNodesBatch(entityIds) {
-                var _a, _b;
                 if (this.treeNodeByEntityId == null) {
-                    let modelTree = (_b = (_a = this.cTileset) === null || _a === void 0 ? void 0 : _a.extensions) === null || _b === void 0 ? void 0 : _b.modelTree;
-                    if (!modelTree) {
-                        modelTree = this.modelTree;
-                    }
-                    if (!modelTree) {
+                    if (!this.modelTree) {
                         return new Map();
                     }
-                    this.buildModelTreeNodes(modelTree);
+                    this.buildModelTreeNodes(this.modelTree);
                 }
                 const parents = new Map();
                 for (const entityId of entityIds) {
@@ -18745,16 +18747,11 @@
              * @returns Map of entityId to array of child nodes
              */
             getChildNodesBatch(entityIds) {
-                var _a, _b;
                 if (this.treeNodeByEntityId == null) {
-                    let modelTree = (_b = (_a = this.cTileset) === null || _a === void 0 ? void 0 : _a.extensions) === null || _b === void 0 ? void 0 : _b.modelTree;
-                    if (!modelTree) {
-                        modelTree = this.modelTree;
-                    }
-                    if (!modelTree) {
+                    if (!this.modelTree) {
                         return new Map();
                     }
-                    this.buildModelTreeNodes(modelTree);
+                    this.buildModelTreeNodes(this.modelTree);
                 }
                 const children = new Map();
                 // Initialize all entityIds with empty arrays
@@ -22326,6 +22323,12 @@
             get Disposed() {
                 return this.disposed;
             }
+            get Hierarchy() {
+                return this.hierarchy;
+            }
+            get HierarchyUpdate() {
+                return this.hierarchyUpdate;
+            }
             get ModelSpace() {
                 return this.modelSpace;
             }
@@ -22333,6 +22336,7 @@
                 this.disposed = false;
                 // Cache of the hierarchy so that our scene-tree can reference it.
                 this.hierarchy = null;
+                this.hierarchyUpdate = new BModels.BruceEvent();
                 // Quick look-up of the hierarchy nodes by entity ID.
                 this.hierarchyNodeByEntityId = null;
                 this.modelSpace = false;
@@ -22362,6 +22366,7 @@
                             if (this.disposed) {
                                 return;
                             }
+                            this.hierarchyUpdate.Trigger(hierarchy);
                             // Build hierarchy node cache for quick lookups
                             this.buildHierarchyNodes(hierarchy);
                             const traverseHierarchy = (node, leavesOnly) => {
@@ -31471,6 +31476,7 @@
                 width: 100%;
                 background-color: rgba(33, 39, 42, 0.8);
                 margin-bottom: 20px;
+                margin-top: 20px;
                 
                 background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' width='10' height='10' viewBox='0 0 10 10'><path fill='%23343a3f' d='M0 0h5v5H0zm5 5h5v5H5z'/></svg>");
                 background-size: 20px 20px;
@@ -33023,7 +33029,7 @@
         }
     }
 
-    const VERSION = "5.9.2";
+    const VERSION = "5.9.4";
 
     exports.VERSION = VERSION;
     exports.isOutlineChanged = isOutlineChanged;