bruce-cesium 4.2.0 → 4.2.1

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
-import { BruceEvent, Cartes, Carto, Entity as Entity$1, Geometry, Tileset, MathUtils, LRUCache, ProjectViewTile, DelayQueue, EncryptUtils, ZoomControl, Style, EntityTag, Calculator, EntityLod, EntityType, ClientFile, ObjectUtils, Bounds, Api, EntityRelationType, ENVIRONMENT, EntityHistoricData, EntityCoords, EntitySource, MenuItem, EntityRelation, ProgramKey, AbstractApi, ProjectViewBookmark, EntityAttachment, EntityAttachmentType, EntityAttribute, ProjectView, ProjectViewLegacyTile, Camera } from 'bruce-models';
+import { BruceEvent, Cartes, Carto, Entity as Entity$1, Geometry, Tileset, MathUtils, LRUCache, ProjectViewTile, DelayQueue, ZoomControl, Style, EntityTag, Calculator, EntityLod, EntityType, ClientFile, ObjectUtils, Bounds, Api, EntityRelationType, ENVIRONMENT, EntityHistoricData, EntityCoords, EntitySource, MenuItem, EntityRelation, ProgramKey, AbstractApi, ProjectViewBookmark, EntityAttachment, EntityAttachmentType, EntityAttribute, ProjectView, ProjectViewLegacyTile, Camera } from 'bruce-models';
 import * as Cesium from 'cesium';
-import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, DistanceDisplayCondition, NearFarScalar, Model, ColorMaterialProperty, Entity, HorizontalOrigin, VerticalOrigin, ConstantProperty, ConstantPositionProperty, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, ColorBlendMode, HeadingPitchRoll, Transforms, Primitive, Cesium3DTileFeature, SceneMode, GeoJsonDataSource, Cesium3DTileColorBlendMode, HeadingPitchRange, Ion, Cesium3DTileStyle, KmlDataSource, OrthographicFrustum, EasingFunction, SceneTransforms, EllipsoidTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, Cesium3DTileset, Matrix4, Matrix3, IonResource, CesiumInspector, defined, ClockRange, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, BoundingSphere, GeometryInstance, ScreenSpaceEventHandler, ScreenSpaceEventType, CzmlDataSource, Quaternion, Intersect } from 'cesium';
+import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, DistanceDisplayCondition, NearFarScalar, Model, ColorMaterialProperty, Entity, HorizontalOrigin, VerticalOrigin, ConstantProperty, ConstantPositionProperty, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, ColorBlendMode, HeadingPitchRoll, Transforms, Primitive, Cesium3DTileFeature, SceneMode, GeoJsonDataSource, HeadingPitchRange, Ion, Cesium3DTileStyle, Cesium3DTileColorBlendMode, KmlDataSource, OrthographicFrustum, EasingFunction, SceneTransforms, Cesium3DTileset, Matrix4, Matrix3, IonResource, EllipsoidTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, CesiumInspector, defined, ClockRange, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, BoundingSphere, GeometryInstance, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, ScreenSpaceEventHandler, ScreenSpaceEventType, CzmlDataSource, Quaternion, Intersect } from 'cesium';
 
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4646,11 +4646,6 @@ function OneTimeError(key, message) {
     }
 }
 
-// Hash of input geometry to the simplified geometry.
-var _cache = new LRUCache(1000);
-function getHash(entityId, geometry) {
-    return EncryptUtils.Cyrb53Hash(entityId + JSON.stringify(geometry));
-}
 /**
  * Util for simplifying geometry on the fly.
  */
@@ -4701,11 +4696,6 @@ var SimplifyGeometry;
         if (!geometry || !turf || !turf.simplify) {
             return geometry;
         }
-        // Generate unique hash for the geometry.
-        var hash = getHash(entityId, geometry);
-        if (_cache.Get(hash)) {
-            return _cache.Get(hash);
-        }
         // Convert to geojson so that we can interact with turf.
         var gFeature = Geometry.ToGeoJsonFeature({
             geometry: geometry
@@ -4729,9 +4719,6 @@ var SimplifyGeometry;
         geometry = (_a = Geometry.FromGeoJson({
             geoJson: gFeature
         })) === null || _a === void 0 ? void 0 : _a.geometry;
-        // Store cached result to avoid recalculating.
-        // Hashing a large geometry string is slow, but all these operations are slower.
-        _cache.Set(hash, geometry);
         return geometry;
     }
     SimplifyGeometry.Simplify = Simplify;
@@ -4752,22 +4739,49 @@ function untangleFeature(feature) {
         try {
             // Dedupe the coordinates to avoid issues with unkink.
             coords = dedupeCoordinates(coords);
-            var tmpFeature = turf.polygon(coords);
-            var untangled = turf.unkinkPolygon(tmpFeature);
-            if (untangled.features.length) {
-                if (untangled.type == "FeatureCollection") {
-                    for (var i = 0; i < untangled.features.length; i++) {
-                        collection.geometries.push(untangled.features[i].geometry);
+            var outer = [];
+            var inner = [];
+            // We'll unkink each ring separately as this is killing the holes when it is done as a whole.
+            // So we'll do it separate then recombine.
+            for (var i = 0; i < coords.length; i++) {
+                var ring = coords[i];
+                var unkink = turf.unkinkPolygon({
+                    type: "Polygon",
+                    coordinates: [ring]
+                });
+                if (unkink.type == "FeatureCollection") {
+                    var target = i == 0 ? outer : inner;
+                    for (var j = 0; j < unkink.features.length; j++) {
+                        var unkinked = unkink.features[j].geometry.coordinates;
+                        if (unkinked.length > 0) {
+                            target.push(unkinked[0]);
+                        }
                     }
-                    return true;
                 }
                 else {
-                    console.error("Unexpected unkink result.", untangled);
+                    console.error("Unexpected unkink result.", unkink);
+                }
+            }
+            // Recreate the rings and reapply to the collection.
+            if (outer.length > 0) {
+                var combinedCoords = [outer[0]];
+                for (var i = 0; i < inner.length; i++) {
+                    combinedCoords.push(inner[i]);
                 }
+                // Add the combined coordinates to the collection
+                var polygon = {
+                    type: "Polygon",
+                    coordinates: combinedCoords
+                };
+                // Ensure right-hand rule is followed.
+                ensureRightHandRule(polygon);
+                // Add to the collection.
+                collection.geometries.push(polygon);
+                return true;
             }
         }
         catch (e) {
-            console.error("Failed to unkink polygon.", e);
+            // console.error("Failed to unkink polygon.", e);
         }
         return false;
     };
@@ -4889,7 +4903,7 @@ function unionFeature(feature) {
         }
     }
     catch (e) {
-        console.error("Failed to union polygons.", e);
+        // console.error("Failed to union polygons.", e);
         return;
     }
     // Re-assign the geometry.
@@ -4925,6 +4939,31 @@ function dedupeCoordinates(inputCoords) {
         return dedupeCoords;
     });
 }
+function ensureRightHandRule(polygon) {
+    // Ensure the outer ring follows the right-hand rule
+    if (polygon.coordinates.length > 0) {
+        var outerRing = polygon.coordinates[0];
+        if (isClockwise(outerRing)) {
+            polygon.coordinates[0] = outerRing.reverse();
+        }
+    }
+    // Ensure any inner rings (holes) follow the right-hand rule
+    for (var i = 1; i < polygon.coordinates.length; i++) {
+        var innerRing = polygon.coordinates[i];
+        if (!isClockwise(innerRing)) {
+            polygon.coordinates[i] = innerRing.reverse();
+        }
+    }
+}
+function isClockwise(ring) {
+    var sum = 0;
+    for (var i = 0; i < ring.length - 1; i++) {
+        var p1 = ring[i];
+        var p2 = ring[i + 1];
+        sum += (p2[0] - p1[0]) * (p2[1] + p1[1]);
+    }
+    return sum > 0;
+}
 
 function colorToCColor(color) {
     return new Color(color.red ? color.red / 255 : 0, color.green ? color.green / 255 : 0, color.blue ? color.blue / 255 : 0, color.alpha);
@@ -5599,11 +5638,11 @@ function compareColorMaterials(viewer, a, b) {
 var EntityRenderEngine;
 (function (EntityRenderEngine) {
     function Render(params) {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f;
         return __awaiter(this, void 0, void 0, function () {
-            var groupRenderParams, i, entity, geometry, optimized, updated, cEntities, models, multiGeometry, polygons, polylines, points, i, entity, id, zoomItem, displayType, existingRego, newRenderId, oldRenderId, geometry, mParams, mEntities, i, entity, id, cEntity, _loop_1, i, pParams, pEntities, i, entity, cEntity, pParams, pEntities, i, entity, cEntity, pParams, pEntities, i, entity, cEntity;
-            return __generator(this, function (_h) {
-                switch (_h.label) {
+            var groupRenderParams, updated, cEntities, models, multiGeometry, polygons, polylines, points, prepareGeometry, i, entity, id, zoomItem, displayType, existingRego, newRenderId, oldRenderId, geometry, mParams, mEntities, i, entity, id, cEntity, _loop_1, i, pParams, pEntities, i, entity, cEntity, pParams, pEntities, i, entity, cEntity, pParams, pEntities, i, entity, cEntity;
+            return __generator(this, function (_g) {
+                switch (_g.label) {
                     case 0:
                         groupRenderParams = {
                             apiGetter: params.apiGetter,
@@ -5613,10 +5652,16 @@ var EntityRenderEngine;
                             menuItemId: params.menuItemId,
                             visualRegister: params.visualRegister
                         };
-                        // Flatten multi-geometry if it's only got 1 piece.
-                        for (i = 0; i < params.entities.length; i++) {
-                            entity = params.entities[i];
-                            geometry = Entity$1.GetValue({
+                        updated = new Map();
+                        cEntities = new Map();
+                        models = [];
+                        multiGeometry = [];
+                        polygons = [];
+                        polylines = [];
+                        points = [];
+                        prepareGeometry = function (entity) {
+                            var _a;
+                            var geometry = Entity$1.GetValue({
                                 entity: entity,
                                 path: ["Bruce", "VectorGeometry"]
                             });
@@ -5631,14 +5676,13 @@ var EntityRenderEngine;
                                     if (params.optimizeTolerance == null) {
                                         params.optimizeTolerance = 0.00001;
                                     }
-                                    optimized = SimplifyGeometry.Simplify(entity.Bruce.ID, geometry, params.optimizeTolerance);
+                                    var optimized = SimplifyGeometry.Simplify(entity.Bruce.ID, geometry, params.optimizeTolerance);
                                     if (optimized) {
                                         // Continue on with the rendering using the optimized geometry.
                                         geometry = optimized;
                                         // Dereference the Entity object now that we have done a destructive operation.
                                         entity = Object.assign({}, entity);
                                         entity.Bruce = Object.assign({}, entity.Bruce);
-                                        params.entities[i] = entity;
                                     }
                                 }
                             }
@@ -5651,14 +5695,8 @@ var EntityRenderEngine;
                             else {
                                 entity.Bruce.VectorGeometry = geometry;
                             }
-                        }
-                        updated = new Map();
-                        cEntities = new Map();
-                        models = [];
-                        multiGeometry = [];
-                        polygons = [];
-                        polylines = [];
-                        points = [];
+                            return entity;
+                        };
                         // Initial sorting.
                         for (i = 0; i < params.entities.length; i++) {
                             entity = params.entities[i];
@@ -5682,12 +5720,12 @@ var EntityRenderEngine;
                                     menuItemId: params.menuItemId
                                 });
                                 newRenderId = getRenderGroupId(zoomItem);
-                                oldRenderId = (_b = existingRego === null || existingRego === void 0 ? void 0 : existingRego.visual) === null || _b === void 0 ? void 0 : _b._renderGroup;
+                                oldRenderId = (_a = existingRego === null || existingRego === void 0 ? void 0 : existingRego.visual) === null || _a === void 0 ? void 0 : _a._renderGroup;
                                 if (!params.force &&
                                     newRenderId == oldRenderId &&
                                     !(existingRego === null || existingRego === void 0 ? void 0 : existingRego.stale) &&
                                     // If historic metadata is different then it's also stale.
-                                    ((existingRego === null || existingRego === void 0 ? void 0 : existingRego.historicDateTime) == ((_c = entity.Bruce) === null || _c === void 0 ? void 0 : _c.HistoricDateTime))) {
+                                    ((existingRego === null || existingRego === void 0 ? void 0 : existingRego.historicDateTime) == ((_b = entity.Bruce) === null || _b === void 0 ? void 0 : _b.HistoricDateTime))) {
                                     // No sorting category needed. Already rendered the way we want.
                                     cEntities.set(id, existingRego.visual);
                                 }
@@ -5698,20 +5736,22 @@ var EntityRenderEngine;
                                         // Flag as no longer stale as we're unlikely to recreate the rego if we're reusing the graphic.
                                         existingRego.stale = false;
                                         // Update metadata for the same reason.
-                                        existingRego.historicDateTime = (_d = entity.Bruce) === null || _d === void 0 ? void 0 : _d.HistoricDateTime;
-                                        existingRego.historicAttrKey = (_e = entity.Bruce) === null || _e === void 0 ? void 0 : _e.HistoricAttrKey;
+                                        existingRego.historicDateTime = (_c = entity.Bruce) === null || _c === void 0 ? void 0 : _c.HistoricDateTime;
+                                        existingRego.historicAttrKey = (_d = entity.Bruce) === null || _d === void 0 ? void 0 : _d.HistoricAttrKey;
                                         existingRego.entityTypeId = entity.Bruce["EntityType.ID"];
                                         updated.set(id, true);
                                     }
                                     if (displayType == ZoomControl.EDisplayType.Model3D) {
+                                        entity = params.entities[i] = prepareGeometry(entity);
                                         models.push(entity);
                                     }
                                     else if (displayType == ZoomControl.EDisplayType.Geometry) {
+                                        entity = params.entities[i] = prepareGeometry(entity);
                                         geometry = Entity$1.GetValue({
                                             entity: entity,
                                             path: ["Bruce", "VectorGeometry"]
                                         });
-                                        if ((_f = geometry === null || geometry === void 0 ? void 0 : geometry.MultiGeometry) === null || _f === void 0 ? void 0 : _f.length) {
+                                        if ((_e = geometry === null || geometry === void 0 ? void 0 : geometry.MultiGeometry) === null || _e === void 0 ? void 0 : _e.length) {
                                             multiGeometry.push(entity);
                                         }
                                         else {
@@ -5729,7 +5769,7 @@ var EntityRenderEngine;
                         mParams = __assign(__assign({}, groupRenderParams), { rendered: cEntities, entities: models, entitiesHistoric: params.entitiesHistoric });
                         return [4 /*yield*/, Model3d.RenderGroup(mParams)];
                     case 1:
-                        mEntities = _h.sent();
+                        mEntities = _g.sent();
                         for (i = 0; i < mParams.entities.length; i++) {
                             entity = mParams.entities[i];
                             id = entity.Bruce.ID;
@@ -5741,20 +5781,20 @@ var EntityRenderEngine;
                                 multiGeometry.push(entity);
                             }
                         }
-                        _h.label = 2;
+                        _g.label = 2;
                     case 2:
                         if (!(multiGeometry.length > 0)) return [3 /*break*/, 6];
                         _loop_1 = function (i) {
                             var entity, geometry, pParams, zoomItem, j, subEntity, cPoly, rendered, cLines, cPoints, rootEntity_1, firstEntity;
-                            return __generator(this, function (_j) {
-                                switch (_j.label) {
+                            return __generator(this, function (_h) {
+                                switch (_h.label) {
                                     case 0:
                                         entity = multiGeometry[i];
                                         geometry = Entity$1.GetValue({
                                             entity: entity,
                                             path: ["Bruce", "VectorGeometry"]
                                         });
-                                        if (!((_g = geometry === null || geometry === void 0 ? void 0 : geometry.MultiGeometry) === null || _g === void 0 ? void 0 : _g.length)) {
+                                        if (!((_f = geometry === null || geometry === void 0 ? void 0 : geometry.MultiGeometry) === null || _f === void 0 ? void 0 : _f.length)) {
                                             polygons.push(entity);
                                             return [2 /*return*/, "continue"];
                                         }
@@ -5768,7 +5808,7 @@ var EntityRenderEngine;
                                         }
                                         return [4 /*yield*/, Polygon.RenderGroup(pParams)];
                                     case 1:
-                                        cPoly = _j.sent();
+                                        cPoly = _h.sent();
                                         Array.from(cPoly.keys()).forEach(function (key) {
                                             if (cPoly.get(key)) {
                                                 pParams.entities = pParams.entities.filter(function (e) { return e.Bruce.ID != key; });
@@ -5777,7 +5817,7 @@ var EntityRenderEngine;
                                         rendered = Array.from(cPoly.values());
                                         return [4 /*yield*/, Polyline.RenderGroup(pParams)];
                                     case 2:
-                                        cLines = _j.sent();
+                                        cLines = _h.sent();
                                         Array.from(cLines.keys()).forEach(function (key) {
                                             if (cLines.get(key)) {
                                                 pParams.entities = pParams.entities.filter(function (e) { return e.Bruce.ID != key; });
@@ -5787,9 +5827,9 @@ var EntityRenderEngine;
                                         if (!!rendered.length) return [3 /*break*/, 4];
                                         return [4 /*yield*/, Point.RenderGroup(pParams)];
                                     case 3:
-                                        cPoints = _j.sent();
+                                        cPoints = _h.sent();
                                         rendered = rendered.concat(Array.from(cPoints.values()));
-                                        _j.label = 4;
+                                        _h.label = 4;
                                     case 4:
                                         rendered = rendered.filter(function (x) { return x != null; });
                                         if (rendered.length) {
@@ -5816,13 +5856,13 @@ var EntityRenderEngine;
                             });
                         };
                         i = 0;
-                        _h.label = 3;
+                        _g.label = 3;
                     case 3:
                         if (!(i < multiGeometry.length)) return [3 /*break*/, 6];
                         return [5 /*yield**/, _loop_1(i)];
                     case 4:
-                        _h.sent();
-                        _h.label = 5;
+                        _g.sent();
+                        _g.label = 5;
                     case 5:
                         i++;
                         return [3 /*break*/, 3];
@@ -5831,7 +5871,7 @@ var EntityRenderEngine;
                         pParams = __assign(__assign({}, groupRenderParams), { entities: polygons, rendered: cEntities });
                         return [4 /*yield*/, Polygon.RenderGroup(pParams)];
                     case 7:
-                        pEntities = _h.sent();
+                        pEntities = _g.sent();
                         for (i = 0; i < pParams.entities.length; i++) {
                             entity = pParams.entities[i];
                             cEntity = pEntities.get(entity.Bruce.ID);
@@ -5842,13 +5882,13 @@ var EntityRenderEngine;
                                 polylines.push(entity);
                             }
                         }
-                        _h.label = 8;
+                        _g.label = 8;
                     case 8:
                         if (!(polylines.length > 0)) return [3 /*break*/, 10];
                         pParams = __assign(__assign({}, groupRenderParams), { entities: polylines, rendered: cEntities });
                         return [4 /*yield*/, Polyline.RenderGroup(pParams)];
                     case 9:
-                        pEntities = _h.sent();
+                        pEntities = _g.sent();
                         for (i = 0; i < pParams.entities.length; i++) {
                             entity = pParams.entities[i];
                             cEntity = pEntities.get(entity.Bruce.ID);
@@ -5859,13 +5899,13 @@ var EntityRenderEngine;
                                 points.push(entity);
                             }
                         }
-                        _h.label = 10;
+                        _g.label = 10;
                     case 10:
                         if (!(points.length > 0)) return [3 /*break*/, 12];
                         pParams = __assign(__assign({}, groupRenderParams), { entities: points, rendered: cEntities, entitiesHistoric: params.entitiesHistoric });
                         return [4 /*yield*/, Point.RenderGroup(pParams)];
                     case 11:
-                        pEntities = _h.sent();
+                        pEntities = _g.sent();
                         for (i = 0; i < pParams.entities.length; i++) {
                             entity = pParams.entities[i];
                             cEntity = pEntities.get(entity.Bruce.ID);
@@ -5873,7 +5913,7 @@ var EntityRenderEngine;
                                 cEntities.set(entity.Bruce.ID, cEntity);
                             }
                         }
-                        _h.label = 12;
+                        _g.label = 12;
                     case 12: return [2 /*return*/, {
                             entities: cEntities,
                             updated: updated
@@ -6787,6 +6827,7 @@ var EntityRenderEngine;
                 var points = Geometry.ParsePoints(x.LinearRing);
                 var holePosses = points.map(function (x) { return Cartesian3.fromDegrees(EnsureNumber(x.longitude), EnsureNumber(x.latitude), EnsureNumber(x.altitude)); });
                 holePosses = cullDuplicatePoints(holePosses);
+                Cartes.CloseRing3(holePosses);
                 return holePosses;
             }).filter(function (x) { return x.length >= 4; });
             var zIndex = getZIndex(style, entity, params.tags);
@@ -25711,7 +25752,7 @@ var ViewRenderEngine;
     ViewRenderEngine.Render = Render;
 })(ViewRenderEngine || (ViewRenderEngine = {}));
 
-var VERSION = "4.2.0";
+var VERSION = "4.2.1";
 
 export { VERSION, CesiumViewMonitor, ViewerUtils, MenuItemManager, EntityRenderEngine, MenuItemCreator, VisualsRegister, RenderManager, EntitiesIdsRenderManager, EntitiesLoadedRenderManager, EntitiesRenderManager, EntityRenderManager, TilesetCadRenderManager, TilesetArbRenderManager, TilesetEntitiesRenderManager, TilesetOsmRenderManager, TilesetPointcloudRenderManager, TilesetGooglePhotosRenderManager, DataSourceStaticKmlManager, GoogleSearchRenderManager, RelationsRenderManager, SharedGetters, CesiumParabola, EntityLabel, ViewRenderEngine, TileRenderEngine, TilesetRenderEngine, CESIUM_INSPECTOR_KEY, CESIUM_TIMELINE_KEY, ViewUtils, DrawingUtils, MeasureUtils, EntityUtils, CesiumEntityStyler, CesiumAnimatedProperty, CesiumAnimatedInOut, Draw3dPolygon, Draw3dPolyline };
 //# sourceMappingURL=bruce-cesium.es5.js.map