bruce-cesium 6.8.8 → 6.8.9

package/dist/bruce-cesium.umd.js

@@ -6324,7 +6324,12 @@
                     cache.isIsolatedAny = register.GetIsIsolatedAny();
                 }
                 if (cache.isIsolatedAny) {
-                    return false;
+                    if (cache.isolationOpacity === undefined) {
+                        cache.isolationOpacity = register.GetIsolationOpacity();
+                    }
+                    if (cache.isolationOpacity == null) {
+                        return false;
+                    }
                 }
             }
             // We show all regos in the same highest priority level.
@@ -6378,10 +6383,19 @@
                     }
                 }
                 if (refresh === true || (refresh !== false && (refresh === null || refresh === void 0 ? void 0 : refresh.opacity))) {
-                    if (state.opacity != null && state.opacity != 1) {
+                    let effectiveOpacity = state.opacity;
+                    if ((effectiveOpacity == null || effectiveOpacity == 1) && !state.isolated && visible) {
+                        if (cache.isolationOpacity === undefined) {
+                            cache.isolationOpacity = register.GetIsolationOpacity();
+                        }
+                        if (cache.isolationOpacity != null) {
+                            effectiveOpacity = cache.isolationOpacity;
+                        }
+                    }
+                    if (effectiveOpacity != null && effectiveOpacity != 1) {
                         exports.EntityUtils.SetOpacity({
                             entity: rego.visual,
-                            opacity: state.opacity,
+                            opacity: effectiveOpacity,
                             viewer: viewer,
                             requestRender: false
                         });
@@ -6521,6 +6535,10 @@
                 // Caches GetIsIsolatedAny(). `null` means "unknown, recompute".
                 // Invalidated on any write that could affect isolation.
                 this.isolatedAnyCache = null;
+                // Caches GetIsolationOpacity(). `undefined` means "unknown, recompute", `null` means
+                // "isolation (if any) is the legacy boolean/full-hide kind, not a numeric dim".
+                // Invalidated alongside isolatedAnyCache.
+                this.isolationOpacityCache = undefined;
                 // Lazy OverrideStates() bookkeeping. See cancelLazyOverride()/startLazyOverride().
                 this.lazyOverrideToken = 0;
                 this.lazyOverrideActive = false;
@@ -6702,12 +6720,12 @@
                 if (!state || isBlankState(state)) {
                     return;
                 }
+                const updateAll = state.hasOwnProperty("isolated");
                 const refresh = {
                     highlighted: state.hasOwnProperty("highlighted"),
                     selected: state.hasOwnProperty("selected"),
-                    opacity: state.hasOwnProperty("opacity")
+                    opacity: state.hasOwnProperty("opacity") || updateAll
                 };
-                const updateAll = state.hasOwnProperty("isolated");
                 let changed = this.setStateValues(state);
                 // Update the related Entity.
                 if (changed && update) {
@@ -6765,6 +6783,7 @@
                 const updateRefreshMarkers = (state) => {
                     if (state.hasOwnProperty("isolated")) {
                         updateAll = true;
+                        refreshAccumulated.opacity = true;
                     }
                     let values = refresh[state.entityId];
                     if (!values) {
@@ -6863,6 +6882,7 @@
                 }
                 if (keys.includes("isolated")) {
                     this.isolatedAnyCache = null;
+                    this.isolationOpacityCache = undefined;
                 }
                 let changed = false;
                 const eStates = this.states[entityId] || {};
@@ -7700,18 +7720,28 @@
             SetIsolated(params) {
                 var _a;
                 const { entityIds, isolated: isolate, requestRender, menuItemId, source, doUpdate } = params;
+                let isolatedValue;
+                if (isolate === true) {
+                    isolatedValue = true;
+                }
+                else if (typeof isolate === "number" && !isNaN(isolate)) {
+                    isolatedValue = Math.max(0, Math.min(1, isolate));
+                }
+                else {
+                    isolatedValue = null;
+                }
                 for (let i = 0; i < entityIds.length; i++) {
                     const entityId = entityIds[i];
                     this.setStateValues({
                         entityId: entityId,
                         menuItemId: menuItemId,
                         // Null means it will be deleted from the object.
-                        isolated: isolate ? true : null
+                        isolated: isolatedValue
                     });
                     const update = {
                         entityId: entityId,
                         type: EVisualUpdateType.Update,
-                        isolated: isolate
+                        isolated: isolatedValue
                     };
                     if (source) {
                         update.source = source;
@@ -7721,9 +7751,12 @@
                     }
                 }
                 if (doUpdate !== false) {
+                    // Always a full refresh (not just when isolating): un-isolating these entities can
+                    // change opacity for every other entity too, eg: if this was the last isolated
+                    // entity, everyone else needs to revert from a numeric dim back to full opacity.
                     this.updateAllEntities({
                         requestRender: false,
-                        refresh: isolate
+                        refresh: true
                     });
                     if (requestRender != false) {
                         this.viewer.scene.requestRender();
@@ -7736,7 +7769,9 @@
                     entityId: id,
                     menuItemId: menuItemId
                 });
-                return state.isolated === true;
+                // Truthy check (not strict `=== true`) so a numeric isolate value (see
+                // GetIsolationOpacity()) still counts as "this entity is isolated".
+                return Boolean(state.isolated);
             }
             GetIsIsolatedAny() {
                 if (this.isolatedAnyCache == null) {
@@ -7744,6 +7779,36 @@
                 }
                 return this.isolatedAnyCache;
             }
+            /**
+             * Returns the opacity that should be applied to non-isolated entities while isolation is
+             * active, or null if isolation (if any) is the legacy boolean kind.
+             */
+            GetIsolationOpacity() {
+                if (this.isolationOpacityCache !== undefined) {
+                    return this.isolationOpacityCache;
+                }
+                let sawBooleanIsolate = false;
+                let minOpacity = null;
+                for (const entityStates of Object.values(this.states)) {
+                    if (!entityStates) {
+                        continue;
+                    }
+                    for (const item of Object.values(entityStates)) {
+                        const isolated = item === null || item === void 0 ? void 0 : item.isolated;
+                        if (isolated === true) {
+                            sawBooleanIsolate = true;
+                        }
+                        else if (typeof isolated === "number" && !isNaN(isolated)) {
+                            const clamped = Math.max(0, Math.min(1, isolated));
+                            if (minOpacity == null || clamped < minOpacity) {
+                                minOpacity = clamped;
+                            }
+                        }
+                    }
+                }
+                this.isolationOpacityCache = sawBooleanIsolate ? null : minOpacity;
+                return this.isolationOpacityCache;
+            }
             /**
              * Returns all isolated entity ids, without regard to menu item id.
              * @returns
@@ -7770,6 +7835,7 @@
                 if (changed) {
                     // Mutated `isolated` directly rather than through setStateValues().
                     this.isolatedAnyCache = false;
+                    this.isolationOpacityCache = null;
                 }
                 if (changed && (params === null || params === void 0 ? void 0 : params.doUpdate) !== false) {
                     this.updateAllEntities({
@@ -37446,7 +37512,7 @@
         StyleUtils.ApplyTypeStyle = ApplyTypeStyle;
     })(exports.StyleUtils || (exports.StyleUtils = {}));
 
-    const VERSION = "6.8.8";
+    const VERSION = "6.8.9";
     /**
      * 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.