bruce-cesium 6.8.8 → 6.8.9

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
 import * as Cesium from 'cesium';
-import { Cartographic, ColorMaterialProperty, Entity, Color, ConstantProperty, CallbackProperty, Primitive, Cesium3DTileFeature, DistanceDisplayCondition, HeightReference, HorizontalOrigin, VerticalOrigin, Cartesian3, ClassificationType, ConstantPositionProperty, ArcType, CornerType, ShadowMode, Math as Math$1, JulianDate, Quaternion, Transforms, HeadingPitchRoll, Matrix4, ColorBlendMode, Model, PolygonHierarchy, PolylineGraphics, Cartesian2, SceneTransforms, NearFarScalar, Matrix3, Rectangle, KmlDataSource, GeoJsonDataSource, SceneMode, Ion, IonResource, Cesium3DTileStyle, HeadingPitchRange, Cesium3DTileColorBlendMode, Cesium3DTileset, OrthographicFrustum, EasingFunction, EllipsoidTerrainProvider, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, PolygonPipeline, CesiumInspector, ClockRange, ScreenSpaceEventHandler, ScreenSpaceEventType, BoundingSphere, GeometryInstance, Intersect, CzmlDataSource, Fullscreen } from 'cesium';
-import { Cartes, Entity as Entity$1, ENVIRONMENT, Api, Calculator, ClientFile, EntityTag, EntityType, LRUCache, ObjectUtils, Style, Carto, Geometry, EntityLod, MenuItem, ProjectView, ProjectViewBookmark, Tileset, ZoomControl, BruceEvent, EntityCoords, Bounds, DataLab, DelayQueue, EntityHistoricData, BruceApi, AccountConcept, RecordChangeFeed, EntityRelation, ProgramKey, EntitySource, Camera, ProjectViewTile, ProjectViewLegacyTile, EntityAttachment, EntityAttachmentType, EntityAttribute, MathUtils, Session, EntityRelationType } from 'bruce-models';
+import { Cartographic, ColorMaterialProperty, Entity, Color, ConstantProperty, CallbackProperty, Primitive, Cesium3DTileFeature, DistanceDisplayCondition, Cartesian3, HeightReference, ClassificationType, PolygonHierarchy, ShadowMode, ConstantPositionProperty, PolylineGraphics, ArcType, CornerType, ColorBlendMode, HeadingPitchRoll, Math as Math$1, Transforms, Model, JulianDate, Quaternion, Matrix4, Cartesian2, HorizontalOrigin, VerticalOrigin, SceneTransforms, NearFarScalar, Matrix3, Rectangle, KmlDataSource, GeoJsonDataSource, SceneMode, Cesium3DTileStyle, HeadingPitchRange, Ion, IonResource, Cesium3DTileColorBlendMode, Cesium3DTileset, EllipsoidTerrainProvider, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, OrthographicFrustum, EasingFunction, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, PolygonPipeline, CesiumInspector, ClockRange, BoundingSphere, GeometryInstance, ScreenSpaceEventHandler, ScreenSpaceEventType, Intersect, CzmlDataSource, Fullscreen } from 'cesium';
+import { Cartes, Entity as Entity$1, ENVIRONMENT, Bounds, Calculator, EntityTag, EntityType, Geometry, ObjectUtils, Style, Carto, ClientFile, EntityLod, LRUCache, MenuItem, ProjectView, ProjectViewBookmark, Tileset, ZoomControl, BruceEvent, EntityCoords, Api, DataLab, DelayQueue, EntityHistoricData, BruceApi, EntityRelation, AccountConcept, RecordChangeFeed, ProgramKey, EntitySource, ProjectViewLegacyTile, ProjectViewTile, Camera, EntityAttachment, EntityAttachmentType, EntityAttribute, MathUtils, Session, EntityRelationType } from 'bruce-models';
 
 /**
  * Ensures a number is returned from a given value.
@@ -6340,7 +6340,12 @@ function updateEntity(viewer, entityId, register, refresh, cache = {}) {
                 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.
@@ -6394,10 +6399,19 @@ function updateEntity(viewer, entityId, register, refresh, cache = {}) {
                 }
             }
             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) {
                     EntityUtils.SetOpacity({
                         entity: rego.visual,
-                        opacity: state.opacity,
+                        opacity: effectiveOpacity,
                         viewer: viewer,
                         requestRender: false
                     });
@@ -6541,6 +6555,10 @@ var VisualsRegister;
             // 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;
@@ -6722,12 +6740,12 @@ var VisualsRegister;
             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) {
@@ -6785,6 +6803,7 @@ var VisualsRegister;
             const updateRefreshMarkers = (state) => {
                 if (state.hasOwnProperty("isolated")) {
                     updateAll = true;
+                    refreshAccumulated.opacity = true;
                 }
                 let values = refresh[state.entityId];
                 if (!values) {
@@ -6883,6 +6902,7 @@ var VisualsRegister;
             }
             if (keys.includes("isolated")) {
                 this.isolatedAnyCache = null;
+                this.isolationOpacityCache = undefined;
             }
             let changed = false;
             const eStates = this.states[entityId] || {};
@@ -7720,18 +7740,28 @@ var VisualsRegister;
         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;
@@ -7741,9 +7771,12 @@ var VisualsRegister;
                 }
             }
             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();
@@ -7756,7 +7789,9 @@ var VisualsRegister;
                 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) {
@@ -7764,6 +7799,36 @@ var VisualsRegister;
             }
             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
@@ -7790,6 +7855,7 @@ var VisualsRegister;
             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({
@@ -37568,7 +37634,7 @@ var StyleUtils;
     StyleUtils.ApplyTypeStyle = ApplyTypeStyle;
 })(StyleUtils || (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.