bruce-cesium 5.2.7 → 5.2.9

package/dist/bruce-cesium.umd.js

@@ -16843,6 +16843,10 @@
                 // It's pretty expensive so we save it for a few seconds inbetween checks.
                 this.somethingIsolated = null;
                 this.somethingIsolatedDateTime = null;
+                // Entity ID -> rego.
+                // We retain this information as a quick look-up on what has been registered.
+                // This lets us properly assign siblings to the same rego when hierarchy items are marked as collapsed.
+                this.loadedCesiumEntities = {};
                 const { viewer, register: visualsManager, getters, item } = params;
                 this.viewer = viewer;
                 this.getters = getters;
@@ -16850,24 +16854,29 @@
                 this.visualsManager = visualsManager;
             }
             Init() {
-                var _a;
+                var _a, _b;
                 const tilesetId = (_a = this.item.tileset) === null || _a === void 0 ? void 0 : _a.TilesetID;
                 if (!tilesetId) {
                     return;
                 }
+                let accountId = (_b = this.item.tileset) === null || _b === void 0 ? void 0 : _b.ClientAccountID;
+                if (!accountId) {
+                    accountId = this.getters.GetAccountId();
+                }
                 this.renderPriority = this.item.renderPriority;
                 if (this.renderPriority == null) {
                     this.renderPriority = 0;
                 }
                 (async () => {
-                    var _a, _b, _c;
-                    let api = this.getters.GetBruceApi();
+                    var _a;
+                    const api = this.getters.GetBruceApi({
+                        accountId: accountId
+                    });
                     let coords = null;
                     let tileset = null;
                     // 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, _b;
                         if (this.disposed) {
                             return;
                         }
@@ -16875,7 +16884,7 @@
                             let canAccess = false;
                             try {
                                 canAccess = await BModels.Tileset.Publish.IsAccessAllowed({
-                                    sourceAccountId: (_a = this.item.tileset) === null || _a === void 0 ? void 0 : _a.ClientAccountID,
+                                    sourceAccountId: accountId,
                                     tilesetId: tilesetId,
                                     forAccountId: this.getters.GetAccountId(),
                                     getters: this.getters
@@ -16888,14 +16897,13 @@
                                 console.error(e);
                             }
                             if (!canAccess) {
-                                console.warn(`Cannot access tileset: ${tilesetId}, from account: ${(_b = this.item.tileset) === null || _b === void 0 ? void 0 : _b.ClientAccountID}.`);
+                                console.warn(`Cannot access tileset: ${tilesetId}, from account: ${accountId}.`);
                                 return;
                             }
                         }
                         else {
                             console.warn("No tileset id found. Skipping access check.");
                         }
-                        api = this.getters.GetBruceApi();
                         tileset = (await BModels.Tileset.Get({
                             api,
                             tilesetId
@@ -16943,7 +16951,7 @@
                         tileset: tileset,
                         viewer: this.viewer,
                         coords: coords,
-                        accountId: (_c = (_b = this.item.tileset) === null || _b === void 0 ? void 0 : _b.ClientAccountID) !== null && _c !== void 0 ? _c : this.getters.GetAccountId(),
+                        accountId: accountId,
                         viaCdn: Boolean(this.item.cdnEnabled == null ? true : this.item.cdnEnabled),
                         noMemoryLimit: this.item["noMaximumMemory"]
                     });
@@ -16967,7 +16975,9 @@
                             this.onCTilesetLoad();
                             this.styler.Init({
                                 viewer: this.viewer,
-                                api,
+                                // Default API instead of the account one.
+                                // Records are driven by the account loading it instead of the source account.
+                                api: this.getters.GetBruceApi(),
                                 cTileset: this.cTileset,
                                 fallbackStyleId: this.item.styleId,
                                 styleMapping: this.item.StyleMapping,
@@ -17049,7 +17059,7 @@
                     menuItemType: this.item.Type,
                     priority: this.renderPriority,
                     visual: feature,
-                    accountId: (_b = (_a = this.item.tileset) === null || _a === void 0 ? void 0 : _a.ClientAccountID) !== null && _b !== void 0 ? _b : this.getters.GetAccountId(),
+                    accountId: (_b = ((_a = this.item.tileset) === null || _a === void 0 ? void 0 : _a.ClientAccountID)) !== null && _b !== void 0 ? _b : this.getters.GetAccountId(),
                     tilesetId: (_c = this.item.tileset) === null || _c === void 0 ? void 0 : _c.TilesetID,
                     tilesetType: BModels.Tileset.EType.Cad,
                     rootId: this.rootId,
@@ -17140,6 +17150,26 @@
                         }
                     }
                     feature.show = !hide;
+                    // Already exists, so we add this graphic as a sibling.
+                    if (this.loadedCesiumEntities[rego.entityId]) {
+                        rego = this.loadedCesiumEntities[rego.entityId];
+                        if (!rego.visual) {
+                            // No parent graphic.
+                            rego.visual = feature;
+                        }
+                        else if (rego.visual == feature) ;
+                        else {
+                            const visual = rego.visual;
+                            // Sibling graphic.
+                            if (!visual._siblingGraphics) {
+                                visual._siblingGraphics = [];
+                            }
+                            if (visual._siblingGraphics.indexOf(feature) < 0) {
+                                visual._siblingGraphics.push(feature);
+                            }
+                        }
+                    }
+                    this.loadedCesiumEntities[rego.entityId] = rego;
                     this.visualsManager.AddRego({
                         rego,
                         requestRender: false
@@ -17153,6 +17183,9 @@
                         menuItemId: this.item.id,
                         doRemove: false
                     });
+                    // Might have to do something smarter since siblings could still be OK.
+                    this.loadedCesiumEntities[rego.entityId] = null;
+                    delete this.loadedCesiumEntities[rego.entityId];
                 }
             }
             getMetaByGeomId(geomId, tileset) {
@@ -17165,9 +17198,9 @@
                 if (!modelTree) {
                     return null;
                 }
-                return this.digMetaByGeomId(geomId, modelTree, [], 0);
+                return this.digMetaByGeomId(geomId, modelTree, [], 0, null);
             }
-            digMetaByGeomId(geomId, branch, path, depth) {
+            digMetaByGeomId(geomId, branch, path, depth, firstFoundCollapsedBranch) {
                 if (this.hasHitDepthLimit || depth > 10) {
                     if (!this.hasHitDepthLimit) {
                         console.error("digMetaByGeomId: depth > 10. Disabling further attempts.");
@@ -17177,12 +17210,19 @@
                 }
                 path = [].concat(path);
                 path.push(branch.id);
+                if (!firstFoundCollapsedBranch && branch.collapsed) {
+                    firstFoundCollapsedBranch = branch;
+                }
                 if (branch.geomId == geomId) {
-                    return { id: path[path.length - 1], typeId: branch.typeId, name: branch.name };
+                    // If we collapsed on a higher branch then we return it instead.
+                    if (firstFoundCollapsedBranch) {
+                        branch = firstFoundCollapsedBranch;
+                    }
+                    return { id: branch.id, typeId: branch.typeId, name: branch.name };
                 }
                 else if (branch.children) {
                     for (let i = 0; i < branch.children.length; i++) {
-                        let meta = this.digMetaByGeomId(geomId, branch.children[i], path, depth + 1);
+                        let meta = this.digMetaByGeomId(geomId, branch.children[i], path, depth + 1, firstFoundCollapsedBranch);
                         if (meta) {
                             return meta;
                         }
@@ -29876,7 +29916,7 @@
         }
     }
 
-    const VERSION = "5.2.7";
+    const VERSION = "5.2.9";
 
     exports.VERSION = VERSION;
     exports.isHistoricMetadataChanged = isHistoricMetadataChanged;