bruce-cesium 2.4.3 → 2.4.5

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, DelayQueue, BatchedDataGetter, EntityRelationType, EntityCoords, EntityFilterGetter, EntitySource, MenuItem, EntityRelation, ENVIRONMENT, ProjectView, ProjectViewBookmark, ProjectViewTile, ProjectViewLegacyTile, ProgramKey, Camera, AbstractApi, EntityAttachment, EntityAttachmentType, EntityAttribute } from 'bruce-models';
+import { BruceEvent, Cartes, Carto, Entity as Entity$1, Geometry, Tileset, MathUtils, LRUCache, ZoomControl, Style, EntityTag, Calculator, EntityLod, EntityType, ClientFile, ObjectUtils, Bounds, DelayQueue, BatchedDataGetter, EntityRelationType, 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, Entity, Primitive, Cesium3DTileFeature, HeightReference, DistanceDisplayCondition, NearFarScalar, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, HeadingPitchRoll, Transforms, ColorBlendMode, SceneMode, Cesium3DTileColorBlendMode, HeadingPitchRange, createOsmBuildings, Cesium3DTileStyle, KmlDataSource, OrthographicFrustum, JulianDate, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, CesiumInspector, defined, Cesium3DTileset, Matrix4, Matrix3, IonResource, ColorMaterialProperty, EasingFunction, GeometryInstance, ScreenSpaceEventHandler, ScreenSpaceEventType, PolygonPipeline, EllipsoidGeodesic, sampleTerrainMostDetailed, Model, Ion, BoundingSphere } from 'cesium';
+import { Cartographic, Cartesian2, CallbackProperty, Cartesian3, Color, Rectangle, Math as Math$1, Entity, Primitive, Cesium3DTileFeature, SceneMode, Cesium3DTileColorBlendMode, HeadingPitchRange, createOsmBuildings, Cesium3DTileStyle, HeightReference, DistanceDisplayCondition, NearFarScalar, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, HeadingPitchRoll, Transforms, ColorBlendMode, KmlDataSource, OrthographicFrustum, JulianDate, CesiumInspector, defined, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, Cesium3DTileset, Matrix4, Matrix3, IonResource, EllipsoidGeodesic, sampleTerrainMostDetailed, Model, PolygonPipeline, ScreenSpaceEventHandler, ScreenSpaceEventType, ColorMaterialProperty, EasingFunction, GeometryInstance, Ion, BoundingSphere } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -1740,7 +1740,14 @@ function getRenderGroupId(zoomItem, terrain) {
     return zoomItem.MinZoom + "-" + zoomItem.MaxZoom + "-" + shouldApplyFlatFix(terrain);
 }
 var _fileValidationCache = {};
-function getDisplayCondition(min, max) {
+/**
+ * @param min
+ * @param max
+ * @param meterSize size of "thing" in meters, eg polyline is 0.5 meters width. If size is provided we can potentially cull it earlier.
+ * @param isPolygon
+ * @returns
+ */
+function getDisplayCondition(min, max, meterSize, isPolygon) {
     // Max is required.
     if (isNaN(+max)) {
         return undefined;
@@ -1755,8 +1762,78 @@ function getDisplayCondition(min, max) {
     if (min > 0) {
         min = (+min) * 0.8;
     }
+    meterSize = +meterSize;
+    if (!isNaN(meterSize) && meterSize > 0) {
+        // A 1m thing at 2000m distance is barely visible, so we can cull it.
+        // So we'll multiply this magic distance by the size of the thing and determine when it'll be too small to see.
+        var METER_DISTANCE_PER_METER = isPolygon ? 100 : 2000;
+        var newMax = meterSize * METER_DISTANCE_PER_METER;
+        // Enforcing a minimum max distance in case something goes wrong we want stuff to always be visible when close.
+        var MIN_MAX = 300;
+        newMax = Math.max(newMax, MIN_MAX);
+        //console.log(`meterSize ${isPolygon ? "polygon" : "thing"} of ${meterSize}m was provided so max was changed from ${max}m to ${Math.min(newMax, max)}m`)
+        max = Math.min(newMax, max);
+        if (max < min) {
+            return undefined;
+        }
+    }
     return new DistanceDisplayCondition(min, max);
 }
+/**
+ * Returns an entity's "size" used for distance display condition calcs.
+ * This will return the distance in meters between the two boundary corners.
+ * @param entity
+ */
+function getSizeOfPolygonEntity(entity) {
+    var _a, _b;
+    if (!entity) {
+        return null;
+    }
+    var hasResetBounds = false;
+    var resetBounds = function () {
+        hasResetBounds = true;
+        entity.boundaries = Bounds.FromEntity(entity);
+        return entity.boundaries;
+    };
+    var checkHasArea = function () {
+        var _a, _b, _c, _d;
+        return ((_a = entity.boundaries) === null || _a === void 0 ? void 0 : _a.minLongitude) != ((_b = entity.boundaries) === null || _b === void 0 ? void 0 : _b.maxLongitude) || ((_c = entity.boundaries) === null || _c === void 0 ? void 0 : _c.minLatitude) != ((_d = entity.boundaries) === null || _d === void 0 ? void 0 : _d.maxLatitude);
+    };
+    // Create bounds if missing entirely.
+    if (!entity.boundaries) {
+        resetBounds();
+    }
+    if (!((_a = entity.boundaries) === null || _a === void 0 ? void 0 : _a.minLatitude)) {
+        return null;
+    }
+    // Check for bounds that are a single point.
+    if (!checkHasArea()) {
+        // Already tried to reconstruct, so we'll just give up.
+        if (hasResetBounds) {
+            return null;
+        }
+        resetBounds();
+        // Check after reconstruction. If still bad then give up.
+        if (!((_b = entity.boundaries) === null || _b === void 0 ? void 0 : _b.minLatitude) || !checkHasArea()) {
+            return null;
+        }
+    }
+    var bounds = entity === null || entity === void 0 ? void 0 : entity.boundaries;
+    var minLat = +(bounds === null || bounds === void 0 ? void 0 : bounds.minLatitude);
+    var maxLat = +(bounds === null || bounds === void 0 ? void 0 : bounds.maxLatitude);
+    var minLon = +(bounds === null || bounds === void 0 ? void 0 : bounds.minLongitude);
+    var maxLon = +(bounds === null || bounds === void 0 ? void 0 : bounds.maxLongitude);
+    if (isNaN(minLat) || isNaN(maxLat) || isNaN(minLon) || isNaN(maxLon)) {
+        return null;
+    }
+    var p1 = Cartesian3.fromDegrees(minLon, minLat);
+    var p2 = Cartesian3.fromDegrees(maxLon, maxLat);
+    var length = Cartesian3.distance(p1, p2);
+    if (isNaN(length) || length <= 0) {
+        return null;
+    }
+    return length;
+}
 var EntityRenderEngine;
 (function (EntityRenderEngine) {
     function Render(params) {
@@ -2361,7 +2438,7 @@ var EntityRenderEngine;
                     classificationType: ClassificationType.TERRAIN,
                     heightReference: heightRef,
                     zIndex: getZIndex(style, entity, params.tags),
-                    distanceDisplayCondition: getDisplayCondition(params.minDistance, params.maxDistance),
+                    distanceDisplayCondition: getDisplayCondition(params.minDistance, params.maxDistance, width),
                     cornerType: CornerType.MITERED,
                     shadows: ShadowMode.ENABLED,
                     fill: true
@@ -2479,6 +2556,7 @@ var EntityRenderEngine;
                 return points.map(function (x) { return Cartesian3.fromDegrees(EnsureNumber(x.longitude), EnsureNumber(x.latitude), EnsureNumber(flattenPoints ? 0 : x.altitude)); });
             });
             var zIndex = getZIndex(style, entity, params.tags);
+            var size = getSizeOfPolygonEntity(entity);
             var cEntity = new Entity({
                 polygon: {
                     hierarchy: new PolygonHierarchy(posses, holePosses.map(function (x) { return new PolygonHierarchy(x); })),
@@ -2490,7 +2568,7 @@ var EntityRenderEngine;
                     classificationType: ClassificationType.BOTH,
                     perPositionHeight: heightRef == HeightReference.CLAMP_TO_GROUND ? false : true,
                     zIndex: zIndex,
-                    distanceDisplayCondition: getDisplayCondition(params.minDistance, params.maxDistance)
+                    distanceDisplayCondition: getDisplayCondition(params.minDistance, params.maxDistance, size, true)
                 },
                 position: EntityUtils.GetPos({
                     viewer: params.viewer,
@@ -2527,7 +2605,7 @@ var EntityRenderEngine;
                         zIndex: zIndex + 1,
                         cornerType: CornerType.MITERED,
                         classificationType: ClassificationType.TERRAIN,
-                        distanceDisplayCondition: getDisplayCondition(params.minDistance, params.maxDistance),
+                        distanceDisplayCondition: getDisplayCondition(params.minDistance, params.maxDistance, width),
                         shadows: ShadowMode.ENABLED
                     },
                     show: false
@@ -2558,7 +2636,7 @@ var EntityRenderEngine;
                             zIndex: zIndex + 1,
                             cornerType: CornerType.MITERED,
                             classificationType: ClassificationType.TERRAIN,
-                            distanceDisplayCondition: getDisplayCondition(params.minDistance, params.maxDistance),
+                            distanceDisplayCondition: getDisplayCondition(params.minDistance, params.maxDistance, width),
                             shadows: ShadowMode.ENABLED,
                         },
                         show: false
@@ -14449,7 +14527,7 @@ var ViewerUtils;
     ViewerUtils.CreateWidgets = CreateWidgets;
 })(ViewerUtils || (ViewerUtils = {}));
 
-var VERSION$1 = "2.4.3";
+var VERSION$1 = "2.4.5";
 
 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