bruce-cesium 5.2.6 → 5.2.8

package/dist/bruce-cesium.umd.js

@@ -16839,6 +16839,10 @@
                 // This likely means poor data so we have to disable drilling otherwise lag would be too bad.
                 // The result is no entity type IDs are known so most styles fail.
                 this.hasHitDepthLimit = false;
+                // Cache of 'something isolated' that we detect and use to calculate a default show state.
+                // It's pretty expensive so we save it for a few seconds inbetween checks.
+                this.somethingIsolated = null;
+                this.somethingIsolatedDateTime = null;
                 const { viewer, register: visualsManager, getters, item } = params;
                 this.viewer = viewer;
                 this.getters = getters;
@@ -16846,24 +16850,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;
                         }
@@ -16871,7 +16880,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
@@ -16884,14 +16893,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
@@ -16939,7 +16947,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"]
                     });
@@ -16954,10 +16962,18 @@
                             if (this.disposed || cTileset.isDestroyed()) {
                                 return;
                             }
+                            // We style Entities to be hidden by default so that we can selectively-
+                            // do a default later.
+                            // This stops them flickering in/out as Bookmark settings get applied.
+                            this.cTileset.style = new Cesium.Cesium3DTileStyle({
+                                show: "false"
+                            });
                             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,
@@ -17014,7 +17030,12 @@
                 for (let i = 0; i < content.featuresLength; i++) {
                     const feature = content.getFeature(i);
                     let rego = this.mapTilesetFeature(feature, load);
-                    if ((rego === null || rego === void 0 ? void 0 : rego.entityId) && this.styler) {
+                    if (!(rego === null || rego === void 0 ? void 0 : rego.entityId)) {
+                        // Override the default hide state set by the style.
+                        feature.show = true;
+                        continue;
+                    }
+                    if (this.styler) {
                         this.styler.QueueEntities([rego]);
                     }
                 }
@@ -17034,7 +17055,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,
@@ -17100,6 +17121,31 @@
                     return null;
                 }
                 if (add) {
+                    // Get the initial hide/show state.
+                    const state = this.visualsManager.GetState({
+                        entityId: rego.entityId,
+                        menuItemId: this.item.id,
+                    });
+                    if (this.somethingIsolated == null ||
+                        // 5s cache.
+                        (this.somethingIsolatedDateTime && this.somethingIsolatedDateTime.getTime() + 5000 < new Date().getTime())) {
+                        this.somethingIsolated = this.visualsManager.GetIsIsolatedAny();
+                        this.somethingIsolatedDateTime = new Date();
+                    }
+                    // Override the default hide state set by the style.
+                    let hide = false;
+                    if (state) {
+                        if (state.hidden) {
+                            hide = true;
+                        }
+                        else if (state.opacity === 0) {
+                            hide = true;
+                        }
+                        else if (!state.isolated && this.somethingIsolated) {
+                            hide = true;
+                        }
+                    }
+                    feature.show = !hide;
                     this.visualsManager.AddRego({
                         rego,
                         requestRender: false
@@ -29836,7 +29882,7 @@
         }
     }
 
-    const VERSION = "5.2.6";
+    const VERSION = "5.2.8";
 
     exports.VERSION = VERSION;
     exports.isHistoricMetadataChanged = isHistoricMetadataChanged;