bruce-cesium 6.8.4 → 6.8.6

package/dist/bruce-cesium.umd.js

@@ -10675,7 +10675,7 @@
                 if ((_a = payload.renderQueue) === null || _a === void 0 ? void 0 : _a.length) {
                     this.distributeForRender(payload.renderQueue);
                 }
-                this.doEntityCheck(Object.keys(this.renderedEntities));
+                this.ReRender({ entityIds: Object.keys(this.renderedEntities), force: true });
                 this.viewer.scene.requestRender();
             }
         }
@@ -17092,7 +17092,7 @@
                 if ((_a = payload.renderQueue) === null || _a === void 0 ? void 0 : _a.length) {
                     this.distributeForRender(payload.renderQueue);
                 }
-                this.doEntityCheck(Object.keys(this.renderedEntities));
+                this.ReRender({ entityIds: Object.keys(this.renderedEntities), force: true });
                 this.viewer.scene.requestRender();
             }
         }
@@ -18316,7 +18316,9 @@
                     return null;
                 }
                 const accountId = ((_b = item.tileset) === null || _b === void 0 ? void 0 : _b.ClientAccountID) || "";
-                return `${accountId}:${tilesetId}`;
+                // Styled <-> unstyled has no cheap revert path, force a reload instead.
+                const applyStyles = Boolean(item.ApplyStyles);
+                return `${accountId}:${tilesetId}:${applyStyles}`;
             }
             // Returns null (fall back to a normal Dispose()) if the tileset hasn't finished loading yet.
             PrepareHandoff() {
@@ -22085,7 +22087,7 @@
              * @returns
              */
             RenderItem(params) {
-                var _a, _b, _c, _d, _e, _f, _g, _h;
+                var _a, _b, _c, _d, _e, _f, _g;
                 if (this.viewer.isDestroyed()) {
                     return null;
                 }
@@ -22113,17 +22115,13 @@
                 let create = true;
                 // Item already exists so we'll check if we should re-create it.
                 if (rItem) {
-                    // This means we're updating a tag menu item.
-                    // Tag menu items have alternative states based on bookmark settings.
-                    // Eg: different tags that were enabled.
+                    // This means we're updating an entities menu item re-using the same id.
+                    // Eg: a bookmark swap that keeps the same item but changes tags, style, or zoom settings.
                     if (rItem.type == BModels.MenuItem.EType.Entities && params.item.Type == BModels.MenuItem.EType.Entities) {
-                        const eItem = rItem.item;
-                        if ((_a = eItem === null || eItem === void 0 ? void 0 : eItem.BruceEntity) === null || _a === void 0 ? void 0 : _a.ExpandLayers) {
-                            rItem.renderManager.Init({
-                                item: params.item,
-                            });
-                            rItem.item = params.item;
-                        }
+                        rItem.renderManager.Init({
+                            item: params.item,
+                        });
+                        rItem.item = params.item;
                         create = false;
                     }
                     // This means we're updating a entities tileset menu item.
@@ -22197,7 +22195,7 @@
                         const oRenderManager = rItem.renderManager;
                         const oItem = params.item;
                         if (oRenderManager && oItem) {
-                            if (+oRenderManager.SourceId == +((_b = oItem.BruceEntity) === null || _b === void 0 ? void 0 : _b.SourceId) && oRenderManager.EntityTypeId == ((_c = oItem.BruceEntity) === null || _c === void 0 ? void 0 : _c["EntityType.ID"])) {
+                            if (+oRenderManager.SourceId == +((_a = oItem.BruceEntity) === null || _a === void 0 ? void 0 : _a.SourceId) && oRenderManager.EntityTypeId == ((_b = oItem.BruceEntity) === null || _b === void 0 ? void 0 : _b["EntityType.ID"])) {
                                 oRenderManager.Init({
                                     item: oItem
                                 });
@@ -22212,7 +22210,7 @@
                         const eIdsItem = params.item;
                         if (eIdsRenderManager && eIdsItem) {
                             const eEntityIds = eIdsRenderManager.EntityIds;
-                            const mEntityIds = (_d = eIdsItem.BruceEntity) === null || _d === void 0 ? void 0 : _d.EntityIds;
+                            const mEntityIds = (_c = eIdsItem.BruceEntity) === null || _c === void 0 ? void 0 : _c.EntityIds;
                             const eEntityIdsStr = eEntityIds ? eEntityIds.join(",") : "";
                             const mEntityIdsStr = mEntityIds ? mEntityIds.join(",") : "";
                             if (eEntityIdsStr == mEntityIdsStr) {
@@ -22229,7 +22227,7 @@
                     }
                     if (create) {
                         try {
-                            (_e = rItem.renderManager) === null || _e === void 0 ? void 0 : _e.Dispose();
+                            (_d = rItem.renderManager) === null || _d === void 0 ? void 0 : _d.Dispose();
                         }
                         catch (e) {
                             console.error(e);
@@ -22240,7 +22238,7 @@
                 if (create) {
                     if (!rItem) {
                         rItem = {
-                            id: (_f = params.item.id) !== null && _f !== void 0 ? _f : BModels.ObjectUtils.UId(),
+                            id: (_e = params.item.id) !== null && _e !== void 0 ? _e : BModels.ObjectUtils.UId(),
                             childIds: [],
                             item: params.item,
                             renderManager: null,
@@ -22448,8 +22446,8 @@
                         rItem.childIds.push(childId);
                     }
                 }
-                if (rItem.renderManager && !((_g = rItem.renderManager) === null || _g === void 0 ? void 0 : _g.Disposed)) {
-                    (_h = this.onUpdate) === null || _h === void 0 ? void 0 : _h.Trigger({ isEnabling: true, itemId: rItem.id });
+                if (rItem.renderManager && !((_f = rItem.renderManager) === null || _f === void 0 ? void 0 : _f.Disposed)) {
+                    (_g = this.onUpdate) === null || _g === void 0 ? void 0 : _g.Trigger({ isEnabling: true, itemId: rItem.id });
                 }
                 return rItem.id;
             }
@@ -37446,7 +37444,7 @@
         StyleUtils.ApplyTypeStyle = ApplyTypeStyle;
     })(exports.StyleUtils || (exports.StyleUtils = {}));
 
-    const VERSION = "6.8.4";
+    const VERSION = "6.8.6";
     /**
      * 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.