bruce-cesium 7.1.5 → 7.1.6

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, ShaderSource, Cartesian3, Math as Math$1, Ellipsoid, Transforms, Matrix4, Geometry, GeometryAttribute, ComponentDatatype, PrimitiveType, BoundingSphere, GeometryPipeline, sampleTerrain, Texture, PixelFormat, Sampler, TextureWrap, TextureMinificationFilter, TextureMagnificationFilter, VertexArray, BufferUsage, ShaderProgram, RenderState, BlendingState, DrawCommand, Pass, Cartesian2, HeightReference, HorizontalOrigin, VerticalOrigin, ClassificationType, ConstantPositionProperty, ArcType, CornerType, ShadowMode, ColorBlendMode, HeadingPitchRoll, Model, JulianDate, Quaternion, ImageMaterialProperty, PolygonHierarchy, PolylineGraphics, Rectangle, SceneTransforms, NearFarScalar, Matrix3, KmlDataSource, GeoJsonDataSource, SceneMode, Ion, IonResource, Cesium3DTileStyle, HeadingPitchRange, Cesium3DTileColorBlendMode, OrthographicFrustum, EasingFunction, EllipsoidTerrainProvider, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, Cesium3DTileset, Intersect, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, CustomDataSource, PolygonPipeline, CesiumInspector, ClockRange, GeometryInstance, ScreenSpaceEventHandler, ScreenSpaceEventType, Fullscreen, CzmlDataSource } from 'cesium';
-import { Cartes, Entity as Entity$1, ENVIRONMENT, Api, Calculator, ClientFile, EntityTag, EntityType, LRUCache, ObjectUtils, Style, Carto, Geometry as Geometry$1, EntityLod, MenuItem, ProjectView, ProjectViewBookmark, Tileset, ZoomControl, Bounds, Color as Color$1, BruceEvent, EntityCoords, DataLab, DelayQueue, EntityHistoricData, BruceApi, AccountConcept, RecordChangeFeed, EntityRelation, ProgramKey, EntitySource, Camera, ProjectViewTile, ProjectViewLegacyTile, Account, AccountLimits, Session, UrlUtils, ProjectViewBookmarkGroup, EntityAttachment, EntityAttachmentType, EntityAttribute, MathUtils, EntityRelationType } from 'bruce-models';
+import { Cartographic, ColorMaterialProperty, Entity, Color, ConstantProperty, CallbackProperty, Primitive, Cesium3DTileFeature, ShaderSource, Cartesian3, Math as Math$1, Ellipsoid, Transforms, Matrix4, Geometry, GeometryAttribute, ComponentDatatype, PrimitiveType, BoundingSphere, GeometryPipeline, sampleTerrain, Texture, PixelFormat, Sampler, TextureWrap, TextureMinificationFilter, TextureMagnificationFilter, VertexArray, BufferUsage, ShaderProgram, RenderState, BlendingState, DrawCommand, Pass, Cartesian2, DistanceDisplayCondition, JulianDate, Quaternion, HeadingPitchRoll, ClassificationType, ArcType, HeightReference, CornerType, ShadowMode, ConstantPositionProperty, HorizontalOrigin, VerticalOrigin, ColorBlendMode, Model, ImageMaterialProperty, PolygonHierarchy, PolylineGraphics, Rectangle, SceneTransforms, NearFarScalar, Matrix3, 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, Intersect, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, OrthographicFrustum, EasingFunction, PolygonPipeline, GeometryInstance, CustomDataSource, CesiumInspector, ClockRange, ScreenSpaceEventHandler, ScreenSpaceEventType, Fullscreen, CzmlDataSource } from 'cesium';
+import { Cartes, Entity as Entity$1, ENVIRONMENT, Calculator, Carto, EntityTag, EntityType, Geometry as Geometry$1, ObjectUtils, Style, Api, ClientFile, LRUCache, MenuItem, ProjectView, ProjectViewBookmark, Tileset, ZoomControl, EntityLod, Bounds, Color as Color$1, BruceEvent, EntityCoords, DataLab, DelayQueue, BruceApi, EntityHistoricData, AccountConcept, RecordChangeFeed, EntityRelation, ProgramKey, EntitySource, ProjectViewLegacyTile, ProjectViewTile, Camera, Account, AccountLimits, Session, UrlUtils, EntityAttachment, EntityAttachmentType, EntityAttribute, MathUtils, ProjectViewBookmarkGroup, EntityRelationType } from 'bruce-models';
 
 /**
  * Ensures a number is returned from a given value.
@@ -3587,6 +3587,7 @@ var SimplifyGeometry;
         if (!geometry || !isTurfAvailable() || !turf.simplify) {
             return geometry;
         }
+        const original = geometry;
         // Convert to geojson so that we can interact with turf.
         const gFeature = Geometry$1.ToGeoJsonFeature({
             geometry: geometry
@@ -3607,13 +3608,97 @@ var SimplifyGeometry;
             });
         }
         // Converting back to Bruce geometry.
-        geometry = (_a = Geometry$1.FromGeoJson({
+        const simplified = (_a = Geometry$1.FromGeoJson({
             geoJson: gFeature
         })) === null || _a === void 0 ? void 0 : _a.geometry;
-        return geometry;
+        // A polygon we cannot vouch for is worse than an unsimplified one, so fall back instead of shipping it.
+        if (!simplified || !isSafeToRender(simplified)) {
+            return original;
+        }
+        return simplified;
     }
     SimplifyGeometry.Simplify = Simplify;
+    /**
+     * Whether a simplified geometry still describes something a renderer can triangulate.
+     * @param geometry the simplification result.
+     * @returns false when any polygon has a collapsed ring, a hole outside its outer ring, or a hole
+     * wound the same way as its outer ring.
+     */
+    function IsSafeToRender(geometry) {
+        return isSafeToRender(geometry);
+    }
+    SimplifyGeometry.IsSafeToRender = IsSafeToRender;
 })(SimplifyGeometry || (SimplifyGeometry = {}));
+// A ring needs three distinct corners plus the closing repeat before it encloses any area.
+const MIN_RING_POSITIONS = 4;
+function isSafeToRender(geometry) {
+    let safe = true;
+    const check = (g) => {
+        if (!safe) {
+            return;
+        }
+        if (g === null || g === void 0 ? void 0 : g.MultiGeometry) {
+            g.MultiGeometry.forEach(check);
+            return;
+        }
+        if (!(g === null || g === void 0 ? void 0 : g.Polygon) || g.Polygon.length === 0) {
+            return;
+        }
+        let outer = null;
+        let outerIsClockwise = false;
+        for (let i = 0; i < g.Polygon.length; i++) {
+            const points = Geometry$1.ParsePoints(g.Polygon[i].LinearRing);
+            if (!points || points.length < MIN_RING_POSITIONS) {
+                safe = false;
+                return;
+            }
+            const clockwise = signedRingArea(points) < 0;
+            if (g.Polygon[i].Facing !== "in") {
+                outer = points;
+                outerIsClockwise = clockwise;
+                continue;
+            }
+            // A hole with no outer ring ahead of it cannot be subtracted from anything.
+            if (!outer) {
+                safe = false;
+                return;
+            }
+            if (clockwise === outerIsClockwise) {
+                safe = false;
+                return;
+            }
+            for (let j = 0; j < points.length; j++) {
+                if (!isPointInRing(points[j], outer)) {
+                    safe = false;
+                    return;
+                }
+            }
+        }
+    };
+    check(geometry);
+    return safe;
+}
+function signedRingArea(points) {
+    let sum = 0;
+    for (let i = 0; i < points.length; i++) {
+        const a = points[i];
+        const b = points[(i + 1) % points.length];
+        sum += a.longitude * b.latitude - b.longitude * a.latitude;
+    }
+    return sum / 2;
+}
+function isPointInRing(point, ring) {
+    let inside = false;
+    for (let i = 0, j = ring.length - 1; i < ring.length; j = i++) {
+        const a = ring[i];
+        const b = ring[j];
+        if ((a.latitude > point.latitude) !== (b.latitude > point.latitude)
+            && point.longitude < (b.longitude - a.longitude) * (point.latitude - a.latitude) / (b.latitude - a.latitude) + a.longitude) {
+            inside = !inside;
+        }
+    }
+    return inside;
+}
 /**
  * Runs through all found polygons and runs unkink through turf on them.
  * @param feature
@@ -3655,9 +3740,26 @@ function untangleFeature(feature) {
             }
             // Recreate the rings and reapply to the collection.
             if (outer.length > 0) {
-                const combinedCoords = [outer[0]];
+                // Unkinking a self touching boundary splits it into pieces. Keeping whichever piece
+                // happened to come back first can discard most of the shape, so keep the biggest one.
+                let keep = outer[0];
+                if (outer.length > 1) {
+                    let best = Math.abs(ringArea(keep));
+                    for (let i = 1; i < outer.length; i++) {
+                        const area = Math.abs(ringArea(outer[i]));
+                        if (area > best) {
+                            best = area;
+                            keep = outer[i];
+                        }
+                    }
+                }
+                const combinedCoords = [keep];
                 for (let i = 0; i < inner.length; i++) {
-                    combinedCoords.push(inner[i]);
+                    // A hole belonging to a piece that was just discarded is no longer inside anything,
+                    // and a hole crossing the boundary is what tears the fill.
+                    if (isRingInsideRing(inner[i], keep)) {
+                        combinedCoords.push(inner[i]);
+                    }
                 }
                 // Add the combined coordinates to the collection
                 const polygon = {
@@ -3805,6 +3907,30 @@ function unionFeature(feature) {
         feature.geometry = collection;
     }
 }
+function ringArea(ring) {
+    let sum = 0;
+    for (let i = 0; i < ring.length; i++) {
+        const a = ring[i];
+        const b = ring[(i + 1) % ring.length];
+        sum += a[0] * b[1] - b[0] * a[1];
+    }
+    return sum / 2;
+}
+function isRingInsideRing(inner, outer) {
+    for (let i = 0; i < inner.length; i++) {
+        let inside = false;
+        for (let a = 0, b = outer.length - 1; a < outer.length; b = a++) {
+            if ((outer[a][1] > inner[i][1]) !== (outer[b][1] > inner[i][1])
+                && inner[i][0] < (outer[b][0] - outer[a][0]) * (inner[i][1] - outer[a][1]) / (outer[b][1] - outer[a][1]) + outer[a][0]) {
+                inside = !inside;
+            }
+        }
+        if (!inside) {
+            return false;
+        }
+    }
+    return true;
+}
 function dedupeCoordinates(inputCoords) {
     return inputCoords.map(ring => {
         if (ring.length < 2) {
@@ -43383,7 +43509,7 @@ var StyleUtils;
     StyleUtils.ApplyTypeStyle = ApplyTypeStyle;
 })(StyleUtils || (StyleUtils = {}));
 
-const VERSION = "7.1.5";
+const VERSION = "7.1.6";
 /**
  * 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.