bruce-cesium 2.7.6 → 2.7.7

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
 import { BruceEvent, Cartes, Carto, Entity as Entity$1, Geometry, Tileset, MathUtils, LRUCache, ZoomControl, Style, EntityTag, Calculator, EntityLod, EntityType, ClientFile, ObjectUtils, Bounds, EntityRelationType, DelayQueue, BatchedDataGetter, EntityCoords, EntityFilterGetter, EntitySource, MenuItem, EntityRelation, ENVIRONMENT, ProjectView, ProjectViewBookmark, ProjectViewTile, ProjectViewLegacyTile, ProgramKey, Camera, AbstractApi, EntityAttachment, EntityAttachmentType, EntityAttribute } from 'bruce-models';
 import * as Cesium from 'cesium';
-import { Cartographic, Cartesian2, CallbackProperty, Cartesian3, Color, Rectangle, Math as Math$1, JulianDate, HeightReference, DistanceDisplayCondition, NearFarScalar, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, SceneMode, Cesium3DTileColorBlendMode, HeadingPitchRange, createOsmBuildings, Cesium3DTileStyle, KmlDataSource, OrthographicFrustum, EasingFunction, Cesium3DTileset, Matrix4, Matrix3, IonResource, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, Model, PolygonPipeline, CesiumInspector, ColorMaterialProperty, GeometryInstance, ScreenSpaceEventHandler, ScreenSpaceEventType, Ion, BoundingSphere } from 'cesium';
+import { Cartographic, JulianDate, Cartesian2, CallbackProperty, Cartesian3, Color, Rectangle, Math as Math$1, Entity, Primitive, Cesium3DTileFeature, HeightReference, DistanceDisplayCondition, NearFarScalar, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, SceneMode, Cesium3DTileColorBlendMode, HeadingPitchRange, KmlDataSource, Cesium3DTileStyle, EllipsoidTerrainProvider, CesiumInspector, OrthographicFrustum, defined, createOsmBuildings, Cesium3DTileset, Matrix4, Matrix3, IonResource, PolygonPipeline, EasingFunction, EllipsoidGeodesic, sampleTerrainMostDetailed, Model, ColorMaterialProperty, GeometryInstance, createWorldTerrain, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, ScreenSpaceEventHandler, ScreenSpaceEventType, Ion, BoundingSphere } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -2647,6 +2647,10 @@ var EntityRenderEngine;
             if (width < 0.01) {
                 width = 0;
             }
+            var units = style.lineWidthUnits;
+            if (units != "px" && units != "m") {
+                units = "m";
+            }
             // If both outline and fill is not available then don't render anything.
             if ((width <= 0 || cLineColor.alpha <= 0) &&
                 cFillColor.alpha <= 0) {
@@ -2686,7 +2690,7 @@ var EntityRenderEngine;
                     classificationType: classification,
                     perPositionHeight: heightRef == HeightReference.CLAMP_TO_GROUND ? false : true,
                     zIndex: zIndex,
-                    distanceDisplayCondition: getDisplayCondition(params.minDistance, params.maxDistance, size, true)
+                    distanceDisplayCondition: getDisplayCondition(params.minDistance, params.maxDistance, width <= 0 || !cLineColor || units == "m" ? size : null, true)
                 },
                 position: EntityUtils.GetPos({
                     viewer: params.viewer,
@@ -2722,17 +2726,17 @@ var EntityRenderEngine;
                     borderPosses = posses.map(function (x) { return x.clone ? x.clone() : __assign({}, x); });
                 }
                 var cEntityBorder = new Entity({
-                    // polyline: new Cesium.PolylineGraphics({
-                    //     positions: borderPosses,
-                    //     material: <Cesium.MaterialProperty><any>cLineColor,
-                    //     width: width,
-                    //     clampToGround: heightRef == Cesium.HeightReference.CLAMP_TO_GROUND,
-                    //     classificationType: Cesium.ClassificationType.TERRAIN,
-                    //     arcType: Cesium.ArcType.GEODESIC,
-                    //     zIndex: zIndex,
-                    //     distanceDisplayCondition: getDisplayCondition(params.minDistance, params.maxDistance)
-                    // }),
-                    corridor: {
+                    polyline: units == "px" ? new PolylineGraphics({
+                        positions: borderPosses,
+                        material: cLineColor,
+                        width: width,
+                        clampToGround: heightRef == HeightReference.CLAMP_TO_GROUND,
+                        classificationType: ClassificationType.TERRAIN,
+                        arcType: ArcType.GEODESIC,
+                        zIndex: zIndex,
+                        distanceDisplayCondition: getDisplayCondition(params.minDistance, params.maxDistance)
+                    }) : null,
+                    corridor: units == "m" ? {
                         positions: borderPosses,
                         material: cLineColor,
                         heightReference: heightRef,
@@ -2744,7 +2748,7 @@ var EntityRenderEngine;
                         classificationType: classification,
                         distanceDisplayCondition: getDisplayCondition(params.minDistance, params.maxDistance, width),
                         shadows: ShadowMode.ENABLED
-                    },
+                    } : null,
                     show: true
                 });
                 cEntityBorder._parentEntity = cEntity;
@@ -2753,17 +2757,17 @@ var EntityRenderEngine;
                     var posses_1 = holePosses[i];
                     Cartes.CloseRing3(posses_1);
                     var cEntityHole = new Entity({
-                        // polyline: new Cesium.PolylineGraphics({
-                        //     positions: posses,
-                        //     material: <Cesium.MaterialProperty><any>cLineColor,
-                        //     width: width,
-                        //     clampToGround: heightRef == Cesium.HeightReference.CLAMP_TO_GROUND,
-                        //     classificationType: Cesium.ClassificationType.TERRAIN,
-                        //     arcType: Cesium.ArcType.GEODESIC,
-                        //     zIndex: zIndex,
-                        //     distanceDisplayCondition: getDisplayCondition(params.minDistance, params.maxDistance)
-                        // }),
-                        corridor: {
+                        polyline: units == "px" ? new PolylineGraphics({
+                            positions: posses_1,
+                            material: cLineColor,
+                            width: width,
+                            clampToGround: heightRef == HeightReference.CLAMP_TO_GROUND,
+                            classificationType: ClassificationType.TERRAIN,
+                            arcType: ArcType.GEODESIC,
+                            zIndex: zIndex,
+                            distanceDisplayCondition: getDisplayCondition(params.minDistance, params.maxDistance)
+                        }) : null,
+                        corridor: units == "m" ? {
                             positions: borderPosses,
                             material: cLineColor,
                             heightReference: heightRef,
@@ -2775,7 +2779,7 @@ var EntityRenderEngine;
                             classificationType: classification,
                             distanceDisplayCondition: getDisplayCondition(params.minDistance, params.maxDistance, width),
                             shadows: ShadowMode.ENABLED,
-                        },
+                        } : null,
                         show: true
                     });
                     cEntity._siblingGraphics.push(cEntityHole);
@@ -15289,7 +15293,7 @@ var ViewerUtils;
     ViewerUtils.CreateWidgets = CreateWidgets;
 })(ViewerUtils || (ViewerUtils = {}));
 
-var VERSION$1 = "2.7.6";
+var VERSION$1 = "2.7.7";
 
 export { VERSION$1 as VERSION, CesiumViewMonitor, ViewerUtils, MenuItemManager, EntityRenderEngine, MenuItemCreator, VisualsRegister, RenderManager, EntitiesIdsRenderManager, EntitiesLoadedRenderManager, EntitiesRenderManager, EntityRenderManager, TilesetCadRenderManager, TilesetArbRenderManager, TilesetEntitiesRenderManager, TilesetOsmRenderManager, TilesetPointcloudRenderManager, TilesetGooglePhotosRenderManager, DataSourceStaticKmlManager, RelationsRenderManager, SharedGetters, CesiumParabola, ViewRenderEngine, TileRenderEngine, TilesetRenderEngine, CESIUM_INSPECTOR_KEY, ViewUtils, DrawingUtils, MeasureUtils, EntityUtils, Draw3dPolygon, Draw3dPolyline };
 //# sourceMappingURL=bruce-cesium.es5.js.map