bruce-cesium 6.4.8 → 6.4.9

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
-import { Cartes, Entity as Entity$1, Calculator, EntityRelationType, EntityType, Style, ENVIRONMENT, ProjectViewTile, DelayQueue, LRUCache, BruceEvent, ObjectUtils, Geometry, EntityHistoricData, EntityLod, ZoomControl, EntityTag, Tileset, Api, EntityCoords, DataLab, EntitySource, ClientFile, MenuItem, EntityRelation, ProgramKey, Carto, ProjectView, ProjectViewBookmark, Bounds, Camera, ProjectViewLegacyTile, AbstractApi, Session, EntityAttachment, EntityAttachmentType, EntityAttribute, MathUtils } from 'bruce-models';
+import { Cartes, Entity as Entity$1, Calculator, EntityRelationType, EntityType, Style, ENVIRONMENT, ProjectViewTile, DelayQueue, LRUCache, BruceEvent, ObjectUtils, Geometry, EntityHistoricData, EntityLod, ZoomControl, EntityTag, Tileset, Api, EntityCoords, DataLab, EntitySource, ClientFile, MenuItem, EntityRelation, ProgramKey, Bounds, Carto, ProjectView, ProjectViewBookmark, ProjectViewLegacyTile, Camera, AbstractApi, EntityAttachment, EntityAttachmentType, EntityAttribute, MathUtils, Session } from 'bruce-models';
 import * as Cesium from 'cesium';
-import { Cartographic, ColorMaterialProperty, Entity, Color, ConstantProperty, CallbackProperty, Primitive, Cesium3DTileFeature, DistanceDisplayCondition, HeightReference, HorizontalOrigin, VerticalOrigin, Cartesian3, ClassificationType, ConstantPositionProperty, ArcType, CornerType, ShadowMode, ColorBlendMode, HeadingPitchRoll, Math as Math$1, Transforms, Model, JulianDate, Quaternion, Matrix4, Cartesian2, PolygonHierarchy, PolylineGraphics, SceneTransforms, Rectangle, NearFarScalar, Matrix3, KmlDataSource, GeoJsonDataSource, SceneMode, Cesium3DTileStyle, HeadingPitchRange, Ion, Cesium3DTileColorBlendMode, Cesium3DTileset, IonResource, 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, BoundingSphere, GeometryInstance, CesiumInspector, ClockRange, ScreenSpaceEventHandler, ScreenSpaceEventType, Intersect, CzmlDataSource, Fullscreen } from 'cesium';
+import { Cartographic, ColorMaterialProperty, Entity, Color, ConstantProperty, CallbackProperty, Primitive, Cesium3DTileFeature, Math as Math$1, Cartesian3, JulianDate, Quaternion, Transforms, HeadingPitchRoll, Matrix4, DistanceDisplayCondition, HeightReference, ColorBlendMode, ShadowMode, ClassificationType, Model, HorizontalOrigin, VerticalOrigin, ConstantPositionProperty, PolygonHierarchy, PolylineGraphics, ArcType, CornerType, Cartesian2, SceneTransforms, NearFarScalar, Matrix3, Rectangle, KmlDataSource, GeoJsonDataSource, SceneMode, Cesium3DTileStyle, HeadingPitchRange, Cesium3DTileColorBlendMode, Ion, EllipsoidTerrainProvider, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, IonResource, Cesium3DTileset, OrthographicFrustum, EasingFunction, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, BoundingSphere, GeometryInstance, PolygonPipeline, CesiumInspector, ClockRange, ScreenSpaceEventHandler, ScreenSpaceEventType, Intersect, CzmlDataSource, Fullscreen } from 'cesium';
 
 /**
  * Ensures a number is returned from a given value.
@@ -32834,12 +32834,7 @@ var EntityRenderEnginePolygon;
             cFillColor.alpha <= 0) {
             return null;
         }
-        const forcePerPositionHeight = Boolean(entity === null || entity === void 0 ? void 0 : entity.__bruceSyntheticMultiGeometryChild);
         let heightRef = getHeightRef$3(style);
-        if (forcePerPositionHeight && heightRef == HeightReference.CLAMP_TO_GROUND) {
-            // Synthetic multi-geometry children render more reliably as absolute polygons.
-            heightRef = HeightReference.NONE;
-        }
         const outerRing = pRings.find(x => x.Facing == Geometry.EPolygonRingType.Boundaries);
         const points = Geometry.ParsePoints(outerRing === null || outerRing === void 0 ? void 0 : outerRing.LinearRing);
         let posses = points.map(x => Cartesian3.fromDegrees(EnsureNumber(x.longitude), EnsureNumber(x.latitude), EnsureNumber(x.altitude)));
@@ -32860,19 +32855,10 @@ var EntityRenderEnginePolygon;
         }).filter(x => x.length >= 4);
         const zIndex = getZIndex$1(style, entity, params.tags);
         const size = getSizeOfPolygonEntity(entity);
-        const polygonDistanceDisplayCondition = forcePerPositionHeight ? undefined :
-            EntityRenderEngine.GetDisplayCondition(params.minDistance, params.maxDistance, width <= 0 || !cLineColor || units == "m" ? size : null, true);
-        const lineDistanceDisplayCondition = forcePerPositionHeight ? undefined :
-            EntityRenderEngine.GetDisplayCondition(params.minDistance, params.maxDistance);
-        const corridorDistanceDisplayCondition = forcePerPositionHeight ? undefined :
-            EntityRenderEngine.GetDisplayCondition(params.minDistance, params.maxDistance, width);
         let classification = ClassificationType.TERRAIN;
         if (style.drapeOver == "ALL") {
             classification = ClassificationType.BOTH;
         }
-        if (forcePerPositionHeight) {
-            classification = undefined;
-        }
         const prepareExistingGraphic = (cEntity, siblings = 0) => {
             // Gather entity in case previous version had sibling graphics we no longer need.
             const parts = EntityUtils.GatherEntity({
@@ -32905,10 +32891,10 @@ var EntityRenderEnginePolygon;
                     extrudedHeightReference: extrusion.exHeightRef,
                     shadows: ShadowMode.ENABLED,
                     heightReference: heightRef,
-                    classificationType: classification != null ? classification : undefined,
-                    perPositionHeight: forcePerPositionHeight || heightRef != HeightReference.CLAMP_TO_GROUND,
+                    classificationType: classification,
+                    perPositionHeight: heightRef == HeightReference.CLAMP_TO_GROUND ? false : true,
                     zIndex: zIndex,
-                    distanceDisplayCondition: polygonDistanceDisplayCondition
+                    distanceDisplayCondition: EntityRenderEngine.GetDisplayCondition(params.minDistance, params.maxDistance, width <= 0 || !cLineColor || units == "m" ? size : null, true)
                 },
                 position: EntityUtils.GetPos({
                     viewer: params.viewer,
@@ -32944,9 +32930,8 @@ var EntityRenderEnginePolygon;
                 cEntity.polygon.heightReference = new ConstantProperty(heightRef);
             }
             const oldPerPosHeight = GetCValue(params.viewer, cEntity.polygon.perPositionHeight);
-            const newPerPosHeight = forcePerPositionHeight || heightRef != HeightReference.CLAMP_TO_GROUND;
-            if (oldPerPosHeight != newPerPosHeight) {
-                cEntity.polygon.perPositionHeight = new ConstantProperty(newPerPosHeight);
+            if (oldPerPosHeight != (heightRef == HeightReference.CLAMP_TO_GROUND ? false : true)) {
+                cEntity.polygon.perPositionHeight = new ConstantProperty(heightRef == HeightReference.CLAMP_TO_GROUND ? false : true);
             }
             const oldPosition = GetCValue(params.viewer, cEntity.position);
             const newPosition = EntityUtils.GetPos({
@@ -32963,9 +32948,9 @@ var EntityRenderEnginePolygon;
             if (oldZIndex != zIndex) {
                 cEntity.polygon.zIndex = new ConstantProperty(zIndex);
             }
-            cEntity.polygon.distanceDisplayCondition = polygonDistanceDisplayCondition != null ? new ConstantProperty(polygonDistanceDisplayCondition) : undefined;
+            cEntity.polygon.distanceDisplayCondition = new ConstantProperty(EntityRenderEngine.GetDisplayCondition(params.minDistance, params.maxDistance, width <= 0 || !cLineColor || units == "m" ? size : null, true));
             cEntity.polygon.shadows = new ConstantProperty(ShadowMode.ENABLED);
-            cEntity.polygon.classificationType = classification != null ? new ConstantProperty(classification) : undefined;
+            cEntity.polygon.classificationType = new ConstantProperty(classification);
             // We'll use "SetDefaultColor" to updating the internal reference and to allow for an animation.
             // WARNING: polygon does not support animation (yet?).
             CesiumEntityStyler.SetDefaultColor({
@@ -33003,7 +32988,7 @@ var EntityRenderEnginePolygon;
                         classificationType: ClassificationType.TERRAIN,
                         arcType: ArcType.GEODESIC,
                         zIndex: zIndex,
-                        distanceDisplayCondition: lineDistanceDisplayCondition
+                        distanceDisplayCondition: EntityRenderEngine.GetDisplayCondition(params.minDistance, params.maxDistance)
                     }) : null,
                     corridor: units == "m" ? {
                         positions: borderPosses,
@@ -33015,7 +33000,7 @@ var EntityRenderEnginePolygon;
                         zIndex: zIndex + 1,
                         cornerType: CornerType.MITERED,
                         classificationType: classification,
-                        distanceDisplayCondition: corridorDistanceDisplayCondition,
+                        distanceDisplayCondition: EntityRenderEngine.GetDisplayCondition(params.minDistance, params.maxDistance, width),
                         shadows: ShadowMode.ENABLED
                     } : null,
                     show: true
@@ -33046,7 +33031,7 @@ var EntityRenderEnginePolygon;
                         cEntityBorder.polyline.material = newMaterial;
                     }
                     cEntityBorder.polyline.classificationType = new ConstantProperty(ClassificationType.TERRAIN);
-                    cEntityBorder.polyline.distanceDisplayCondition = lineDistanceDisplayCondition != null ? new ConstantProperty(lineDistanceDisplayCondition) : undefined;
+                    cEntityBorder.polyline.distanceDisplayCondition = new ConstantProperty(EntityRenderEngine.GetDisplayCondition(params.minDistance, params.maxDistance));
                     cEntityBorder.corridor = undefined;
                 }
                 else {
@@ -33076,7 +33061,7 @@ var EntityRenderEnginePolygon;
                         cEntityBorder.corridor.material = newMaterial;
                     }
                     cEntityBorder.corridor.fill = new ConstantProperty(true);
-                    cEntityBorder.corridor.distanceDisplayCondition = corridorDistanceDisplayCondition != null ? new ConstantProperty(corridorDistanceDisplayCondition) : undefined;
+                    cEntityBorder.corridor.distanceDisplayCondition = new ConstantProperty(EntityRenderEngine.GetDisplayCondition(params.minDistance, params.maxDistance, width));
                     cEntityBorder.polyline = undefined;
                 }
                 cEntityBorder.show = true;
@@ -33096,7 +33081,7 @@ var EntityRenderEnginePolygon;
                         classificationType: ClassificationType.TERRAIN,
                         arcType: ArcType.GEODESIC,
                         zIndex: zIndex,
-                        distanceDisplayCondition: lineDistanceDisplayCondition
+                        distanceDisplayCondition: EntityRenderEngine.GetDisplayCondition(params.minDistance, params.maxDistance)
                     }) : null,
                     corridor: units == "m" ? {
                         positions: borderPosses,
@@ -33108,7 +33093,7 @@ var EntityRenderEnginePolygon;
                         zIndex: zIndex + 1,
                         cornerType: CornerType.MITERED,
                         classificationType: classification,
-                        distanceDisplayCondition: corridorDistanceDisplayCondition,
+                        distanceDisplayCondition: EntityRenderEngine.GetDisplayCondition(params.minDistance, params.maxDistance, width),
                         shadows: ShadowMode.ENABLED,
                     } : null,
                     show: true
@@ -33553,7 +33538,7 @@ var EntityRenderEngine;
     }
     EntityRenderEngine.GetRenderGroupId = GetRenderGroupId;
     async function Render(params) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d;
         const groupRenderParams = {
             apiGetter: params.apiGetter,
             viewer: params.viewer,
@@ -33715,21 +33700,14 @@ var EntityRenderEngine;
                 };
                 pParams.entitiesHistoric = params.entitiesHistoric;
                 const zoomItem = pParams.zoomItems[entity.Bruce.ID];
-                // Preserve the full feature extent so tiny child polygons don't get over-culled.
-                const multiGeometryBounds = Bounds.FromEntity(entity);
                 for (let j = 0; j < geometry.MultiGeometry.length; j++) {
                     const subEntity = {
                         ...entity,
-                        __bruceSyntheticMultiGeometryChild: true,
                         geometry: null,
                         Bruce: {
                             ...entity.Bruce,
                             ID: ObjectUtils.UId(),
-                            Location: null,
-                            VectorGeometry: geometry.MultiGeometry[j],
-                            Boundaries: multiGeometryBounds ? {
-                                ...multiGeometryBounds
-                            } : (_e = entity.Bruce) === null || _e === void 0 ? void 0 : _e.Boundaries
+                            VectorGeometry: geometry.MultiGeometry[j]
                         }
                     };
                     pParams.zoomItems[subEntity.Bruce.ID] = zoomItem;
@@ -35303,7 +35281,7 @@ class WidgetViewBar extends Widget.AWidget {
     }
 }
 
-const VERSION = "6.4.8";
+const VERSION = "6.4.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.