bruce-cesium 5.9.2 → 5.9.3

package/dist/bruce-cesium.es5.js

@@ -16749,32 +16749,33 @@ var TilesetRenderEngine;
         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 = 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 = Tileset.GetFileUrl({
+                    file: "tileset.json",
+                    tilesetId: params.tileset.id,
+                    viaCdn: true,
+                    legacy: false,
+                    cacheToken: params.tileset.generateVersion,
+                    api: api
+                });
+            }
         }
         if (params.tileset.type == Tileset.EType.Cad) {
-            const cTileset = await createTileset(loadUrl ? loadUrl : 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) {
+                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;
@@ -16810,26 +16811,32 @@ var TilesetRenderEngine;
             return cTileset;
         }
         else if (params.tileset.type === Tileset.EType.EntitiesSet) {
-            const cTileset = await createTileset(loadUrl ? loadUrl : 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 = 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 == Tileset.EType.PointCloud) {
-            const cTileset = await createTileset(loadUrl ? loadUrl : 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 = 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;
@@ -18126,11 +18133,18 @@ var TilesetCadRenderManager;
         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 TilesetRenderEngine.Styler();
+            this.modelTreeUpdate = new 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;
@@ -18170,8 +18184,11 @@ var TilesetCadRenderManager;
             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
                 });
@@ -18180,7 +18197,7 @@ var TilesetCadRenderManager;
                 // Single shared getter to avoid multiple assemblies fighting to render.
                 // This lets one complete, then the next start.
                 await SharedGetters.Queue.Run("Rendering assembly.", async () => {
-                    var _a;
+                    var _a, _b, _c;
                     if (this.disposed) {
                         return;
                     }
@@ -18215,11 +18232,62 @@ var TilesetCadRenderManager;
                     if (!tileset || this.disposed) {
                         return;
                     }
+                    loadUrl = tileset.loadUrl;
+                    // CDN enabled and available.
+                    if (viaCdn && api.GetCdnBaseUrl()) {
+                        loadUrl = 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 = 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 = 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 Entity$1.Get({
                                 entityId: rootId,
@@ -18249,34 +18317,15 @@ var TilesetCadRenderManager;
                 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 = 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 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
                 });
@@ -18526,17 +18575,11 @@ var TilesetCadRenderManager;
             }
         }
         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;
         }
@@ -18570,7 +18613,7 @@ var TilesetCadRenderManager;
                     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({
@@ -18584,18 +18627,12 @@ var TilesetCadRenderManager;
             }
         }
         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;
@@ -18606,16 +18643,11 @@ var TilesetCadRenderManager;
          * @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) {
@@ -18629,16 +18661,11 @@ var TilesetCadRenderManager;
          * @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) {
@@ -18655,16 +18682,11 @@ var TilesetCadRenderManager;
          * @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];
@@ -18688,16 +18710,11 @@ var TilesetCadRenderManager;
          * @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) {
@@ -18714,16 +18731,11 @@ var TilesetCadRenderManager;
          * @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;
@@ -18743,16 +18755,11 @@ var TilesetCadRenderManager;
          * @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) {
@@ -18776,16 +18783,11 @@ var TilesetCadRenderManager;
          * @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) {
@@ -18805,16 +18807,11 @@ var TilesetCadRenderManager;
          * @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
@@ -31573,6 +31570,7 @@ class WidgetInfoView extends Widget.AWidget {
                 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;
@@ -33127,7 +33125,7 @@ class WidgetViewBar extends Widget.AWidget {
     }
 }
 
-const VERSION = "5.9.2";
+const VERSION = "5.9.3";
 
 export { VERSION, CesiumViewMonitor, ViewerUtils, ViewerEventTracker, MenuItemManager, isOutlineChanged, EntityRenderEngine, EntityRenderEnginePoint, EntityRenderEnginePolyline, EntityRenderEnginePolygon, EntityRenderEngineModel3d, MenuItemCreator, VisualsRegister, RenderManager, EntitiesIdsRenderManager, DataLabRenderManager, EntitiesLoadedRenderManager, EntitiesRenderManager, EntityRenderManager, TilesetCadRenderManager, TilesetArbRenderManager, TilesetEntitiesRenderManager, TilesetOsmRenderManager, TilesetPointcloudRenderManager, TilesetGooglePhotosRenderManager, DataSourceStaticKmlManager, GoogleSearchRenderManager, AssemblyRenderManager, RelationsRenderManager, SharedGetters, CesiumParabola, EntityLabel, ViewRenderEngine, TileRenderEngine, TilesetRenderEngine, CESIUM_INSPECTOR_KEY, CESIUM_TIMELINE_KEY, CESIUM_TIMELINE_LIVE_KEY, CESIUM_TIMELINE_LIVE_PADDING_KEY, CESIUM_TIMELINE_INTERVAL_KEY, DEFAULT_LIVE_PADDING_SECONDS, ViewUtils, DrawingUtils, MeasureUtils, EntityUtils, CesiumEntityStyler, CesiumAnimatedProperty, CesiumAnimatedInOut, Draw3dPolygon, Draw3dPolyline, MeasureCreator, Walkthrough, Widget, VIEWER_BOOKMARKS_WIDGET_KEY, WidgetBookmarks, WidgetBranding, WidgetCursorBar, WidgetEmbeddedInfoView, WidgetInfoView, WidgetNavCompass$$1 as WidgetNavCompass, VIEWER_VIEW_BAR_WIDGET_KEY, WidgetViewBar, WidgetControlViewBar, WidgetControlViewBarSearch, VIEWER_LEFT_PANEL_WIDGET_KEY, VIEWER_LEFT_PANEL_CSS_VAR_LEFT, WidgetLeftPanel, WidgetLeftPanelTab, WidgetLeftPanelTabBookmarks };
 //# sourceMappingURL=bruce-cesium.es5.js.map