bruce-cesium 7.5.0 → 7.5.2

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
 import * as Cesium from 'cesium';
-import { Cartographic, ColorMaterialProperty, Entity, Color, ConstantProperty, CallbackProperty, Primitive, Cesium3DTileFeature, ConstantPositionProperty, HeightReference, DistanceDisplayCondition, Math as Math$1, Cartesian3, JulianDate, Quaternion, Transforms, HeadingPitchRoll, Matrix4, ShaderSource, Ellipsoid, Geometry, GeometryAttribute, ComponentDatatype, PrimitiveType, BoundingSphere, GeometryPipeline, Cartesian2, Cartesian4, sampleTerrain, Texture, PixelFormat, Sampler, TextureWrap, TextureMinificationFilter, TextureMagnificationFilter, VertexArray, BufferUsage, ShaderProgram, RenderState, BlendingState, DrawCommand, Pass, ClassificationType, ArcType, CornerType, ShadowMode, ColorBlendMode, Model, HorizontalOrigin, VerticalOrigin, ImageMaterialProperty, PolygonHierarchy, PolylineGraphics, Rectangle, FeatureDetection, SceneMode, SceneTransforms, KmlDataSource, NearFarScalar, Matrix3, GeoJsonDataSource, Cesium3DTileStyle, HeadingPitchRange, Ion, IonResource, Cesium3DTileColorBlendMode, Cesium3DTileset, Intersect, OrthographicFrustum, EasingFunction, EllipsoidTerrainProvider, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, PolygonPipeline, CesiumInspector, ClockRange, DynamicEnvironmentMapManager, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, GeometryInstance, ScreenSpaceEventHandler, ScreenSpaceEventType, CustomDataSource, Fullscreen, CzmlDataSource } from 'cesium';
-import { Cartes, LRUCache, ProjectViewTile, ENVIRONMENT, Calculator, Carto, Entity as Entity$1, EntityTag, EntityType, Geometry as Geometry$1, ObjectUtils, Style, ClientFile, EntityLod, Api, MenuItem, ProjectView, ProjectViewBookmark, Tileset, ZoomControl, Bounds, ClientFileValueMap, Color as Color$1, BruceEvent, EntityCoords, DataLab, DelayQueue, AccountConcept, RecordChangeFeed, BruceApi, EntityRelation, EntitySource, Camera, ProgramKey, ProjectViewLegacyTile, Account, AccountLimits, Session, UrlUtils, ProjectViewBookmarkGroup, EntityAttachment, EntityAttachmentType, EntityAttribute, MathUtils, EntityRelationType, EntityHistoricData } from 'bruce-models';
+import { Cartographic, ColorMaterialProperty, Entity, Color, ConstantProperty, CallbackProperty, Primitive, Cesium3DTileFeature, ConstantPositionProperty, HeightReference, DistanceDisplayCondition, HorizontalOrigin, VerticalOrigin, Cartesian3, ClassificationType, Math as Math$1, JulianDate, Quaternion, Transforms, HeadingPitchRoll, Matrix4, ArcType, CornerType, ShadowMode, ColorBlendMode, Model, ImageMaterialProperty, Ellipsoid, Cartesian2, SceneTransforms, ShaderSource, Geometry, GeometryAttribute, ComponentDatatype, PrimitiveType, BoundingSphere, GeometryPipeline, Cartesian4, sampleTerrain, Texture, PixelFormat, Sampler, TextureWrap, TextureMinificationFilter, TextureMagnificationFilter, VertexArray, BufferUsage, ShaderProgram, RenderState, BlendingState, DrawCommand, Pass, PolygonHierarchy, PolylineGraphics, Rectangle, FeatureDetection, SceneMode, NearFarScalar, KmlDataSource, Matrix3, GeoJsonDataSource, Cesium3DTileStyle, HeadingPitchRange, Ion, IonResource, Cesium3DTileColorBlendMode, EllipsoidTerrainProvider, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, Cesium3DTileset, Intersect, OrthographicFrustum, EasingFunction, PolygonPipeline, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, CesiumInspector, defined, ClockRange, DynamicEnvironmentMapManager, GeometryInstance, EllipsoidGeodesic, sampleTerrainMostDetailed, CustomDataSource, ScreenSpaceEventHandler, ScreenSpaceEventType, Fullscreen, CzmlDataSource } from 'cesium';
+import { Cartes, LRUCache, ProjectViewTile, ENVIRONMENT, Api, Calculator, ClientFile, Entity as Entity$1, EntityTag, EntityType, ObjectUtils, Style, Carto, Geometry as Geometry$1, EntityLod, ClientFileValueMap, Color as Color$1, MenuItem, ProjectView, ProjectViewBookmark, Tileset, ZoomControl, Bounds, BruceEvent, EntityCoords, DataLab, DelayQueue, BruceApi, EntityRelation, AccountConcept, RecordChangeFeed, EntitySource, ProgramKey, ProjectViewLegacyTile, Camera, Account, AccountLimits, Session, UrlUtils, ProjectViewBookmarkGroup, EntityAttachment, EntityAttachmentType, EntityAttribute, MathUtils, EntityRelationType, EntityHistoricData } from 'bruce-models';
 
 /**
  * Ensures a number is returned from a given value.
@@ -29069,7 +29069,7 @@ class WidgetLeftPanelTabBookmarks extends WidgetLeftPanelTab.ATab {
         // In case another widget messed with the panel width.
         // Probably should just add a SetWidth method to avoid having plugins mess with the container CSS.
         if (this.Container) {
-            this.Container.style.width = "300px";
+            this.Container.style.width = "260px";
         }
     }
     Dispose() {
@@ -29635,7 +29635,7 @@ class WidgetLeftPanelTabUser extends WidgetLeftPanelTab.ATab {
         // In case another widget messed with the panel width.
         // Probably should just add a SetWidth method to avoid having plugins mess with the container CSS.
         if (this.Container) {
-            this.Container.style.width = "300px";
+            this.Container.style.width = "390px";
         }
         this.loadUser();
         this.paramsChangeRemoval = ENVIRONMENT.OnParamsChange.Subscribe(() => {
@@ -48212,12 +48212,33 @@ void main() {
     }
 })(DisplacedSurfacePrimitive || (DisplacedSurfacePrimitive = {}));
 
+// Vertex heights within this many metres of zero count as no height at all.
+const FLAT_HEIGHT_EPSILON = 1e-3;
 const TEXTURE_FRAME_SERIES_ANIMATOR_KEY = "TextureFrameSeriesAnimator.Animator";
 const EXTRUSION_ANIMATOR_KEY = "TextureFrameSeriesAnimator.ExtrusionAnimator";
 const TEXTURE_VALUE_LABELS_KEY = "TextureValueLabels.Overlay";
 const DISPLACED_SURFACE_KEY = "DisplacedSurfacePrimitive.Surface";
 var EntityRenderEnginePolygon;
 (function (EntityRenderEnginePolygon) {
+    /**
+     * The height reference a polygon is actually drawn with.
+     * @param params
+     */
+    function FlatHeightRef(params) {
+        const { heightRef, extruded, textured, altitudes } = params;
+        if (extruded || heightRef === HeightReference.CLAMP_TO_GROUND) {
+            return heightRef;
+        }
+        const hasHeights = altitudes.some((altitude) => Math.abs(EnsureNumber(altitude)) > FLAT_HEIGHT_EPSILON);
+        if (hasHeights) {
+            return heightRef;
+        }
+        if (heightRef === HeightReference.RELATIVE_TO_GROUND || textured) {
+            return HeightReference.CLAMP_TO_GROUND;
+        }
+        return heightRef;
+    }
+    EntityRenderEnginePolygon.FlatHeightRef = FlatHeightRef;
     async function Render(params) {
         var _a, _b, _c, _d, _e;
         const entity = params.entity;
@@ -48318,6 +48339,14 @@ var EntityRenderEnginePolygon;
             ? { posses, value: undefined, exHeightRef: HeightReference.NONE }
             : getPolygonExtrusion(entity, params.tags, outerRing, posses, heightRef, style);
         posses = extrusion.posses;
+        heightRef = FlatHeightRef({
+            heightRef,
+            extruded: drawsDisplacedSurface || extrusion.value != undefined,
+            textured: fillType === Style.EPolygonFillType.Texture,
+            altitudes: pRings.flatMap((ring) => (ring === null || ring === void 0 ? void 0 : ring.LinearRing)
+                ? Geometry$1.ParsePoints(ring.LinearRing).map((point) => point.altitude)
+                : [])
+        });
         posses = CullDuplicateCPosses(posses);
         if (posses.length < 4) {
             return null;
@@ -48357,6 +48386,14 @@ var EntityRenderEnginePolygon;
             }
         };
         const hasOutline = width > 0 && cLineColor;
+        // Cesium draws nothing for a ground polygon with an image material once it carries a distance display condition.
+        const drapesImage = (!drawsDisplacedSurface &&
+            heightRef === HeightReference.CLAMP_TO_GROUND &&
+            extrusion.value == undefined &&
+            (fillMaterial instanceof ImageMaterialProperty || Boolean(frameArchive || keepsAnimator)));
+        const polygonDisplayCondition = drapesImage
+            ? undefined
+            : EntityRenderEngine.GetDisplayCondition(params.minDistance, params.maxDistance, width <= 0 || !cLineColor || units == "m" ? size : null, true, size);
         let cEntity = null;
         const isExistingGraphic = Boolean(params.rendered && params.rendered.polygon);
         if (!isExistingGraphic) {
@@ -48373,7 +48410,7 @@ var EntityRenderEnginePolygon;
                     classificationType: classification,
                     perPositionHeight: heightRef == HeightReference.CLAMP_TO_GROUND ? false : true,
                     zIndex: zIndex,
-                    distanceDisplayCondition: EntityRenderEngine.GetDisplayCondition(params.minDistance, params.maxDistance, width <= 0 || !cLineColor || units == "m" ? size : null, true, size)
+                    distanceDisplayCondition: polygonDisplayCondition
                 },
                 position: EntityUtils.GetPos({
                     viewer: params.viewer,
@@ -48433,12 +48470,17 @@ var EntityRenderEnginePolygon;
             if (oldZIndex != zIndex) {
                 cEntity.polygon.zIndex = new ConstantProperty(zIndex);
             }
-            SetCPropIfChanged({
-                viewer: params.viewer,
-                graphic: cEntity.polygon,
-                property: "distanceDisplayCondition",
-                value: EntityRenderEngine.GetDisplayCondition(params.minDistance, params.maxDistance, width <= 0 || !cLineColor || units == "m" ? size : null, true, size)
-            });
+            if (polygonDisplayCondition) {
+                SetCPropIfChanged({
+                    viewer: params.viewer,
+                    graphic: cEntity.polygon,
+                    property: "distanceDisplayCondition",
+                    value: polygonDisplayCondition
+                });
+            }
+            else if (cEntity.polygon.distanceDisplayCondition) {
+                cEntity.polygon.distanceDisplayCondition = undefined;
+            }
             SetCPropIfChanged({
                 viewer: params.viewer,
                 graphic: cEntity.polygon,
@@ -51014,7 +51056,7 @@ var StyleUtils;
     StyleUtils.ApplyTypeStyle = ApplyTypeStyle;
 })(StyleUtils || (StyleUtils = {}));
 
-const VERSION = "7.5.0";
+const VERSION = "7.5.2";
 /**
  * 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.