bruce-cesium 4.2.0 → 4.2.1

package/dist/bruce-cesium.umd.js

@@ -4636,11 +4636,6 @@
         }
     }
 
-    // Hash of input geometry to the simplified geometry.
-    var _cache = new bruceModels.LRUCache(1000);
-    function getHash(entityId, geometry) {
-        return bruceModels.EncryptUtils.Cyrb53Hash(entityId + JSON.stringify(geometry));
-    }
     /**
      * Util for simplifying geometry on the fly.
      */
@@ -4691,11 +4686,6 @@
             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 = bruceModels.Geometry.ToGeoJsonFeature({
                 geometry: geometry
@@ -4719,9 +4709,6 @@
             geometry = (_a = bruceModels.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;
@@ -4742,22 +4729,49 @@
             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;
         };
@@ -4879,7 +4893,7 @@
             }
         }
         catch (e) {
-            console.error("Failed to union polygons.", e);
+            // console.error("Failed to union polygons.", e);
             return;
         }
         // Re-assign the geometry.
@@ -4915,6 +4929,31 @@
             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 Cesium.Color(color.red ? color.red / 255 : 0, color.green ? color.green / 255 : 0, color.blue ? color.blue / 255 : 0, color.alpha);
@@ -5588,11 +5627,11 @@
     }
     (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,
@@ -5602,10 +5641,16 @@
                                 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 = bruceModels.Entity.GetValue({
+                            updated = new Map();
+                            cEntities = new Map();
+                            models = [];
+                            multiGeometry = [];
+                            polygons = [];
+                            polylines = [];
+                            points = [];
+                            prepareGeometry = function (entity) {
+                                var _a;
+                                var geometry = bruceModels.Entity.GetValue({
                                     entity: entity,
                                     path: ["Bruce", "VectorGeometry"]
                                 });
@@ -5620,14 +5665,13 @@
                                         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;
                                         }
                                     }
                                 }
@@ -5640,14 +5684,8 @@
                                 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];
@@ -5671,12 +5709,12 @@
                                         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);
                                     }
@@ -5687,20 +5725,22 @@
                                             // 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 == bruceModels.ZoomControl.EDisplayType.Model3D) {
+                                            entity = params.entities[i] = prepareGeometry(entity);
                                             models.push(entity);
                                         }
                                         else if (displayType == bruceModels.ZoomControl.EDisplayType.Geometry) {
+                                            entity = params.entities[i] = prepareGeometry(entity);
                                             geometry = bruceModels.Entity.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 {
@@ -5718,7 +5758,7 @@
                             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;
@@ -5730,20 +5770,20 @@
                                     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 = bruceModels.Entity.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"];
                                             }
@@ -5757,7 +5797,7 @@
                                             }
                                             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; });
@@ -5766,7 +5806,7 @@
                                             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; });
@@ -5776,9 +5816,9 @@
                                             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) {
@@ -5805,13 +5845,13 @@
                                 });
                             };
                             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];
@@ -5820,7 +5860,7 @@
                             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);
@@ -5831,13 +5871,13 @@
                                     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);
@@ -5848,13 +5888,13 @@
                                     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);
@@ -5862,7 +5902,7 @@
                                     cEntities.set(entity.Bruce.ID, cEntity);
                                 }
                             }
-                            _h.label = 12;
+                            _g.label = 12;
                         case 12: return [2 /*return*/, {
                                 entities: cEntities,
                                 updated: updated
@@ -6776,6 +6816,7 @@
                     var points = bruceModels.Geometry.ParsePoints(x.LinearRing);
                     var holePosses = points.map(function (x) { return Cesium.Cartesian3.fromDegrees(EnsureNumber(x.longitude), EnsureNumber(x.latitude), EnsureNumber(x.altitude)); });
                     holePosses = cullDuplicatePoints(holePosses);
+                    bruceModels.Cartes.CloseRing3(holePosses);
                     return holePosses;
                 }).filter(function (x) { return x.length >= 4; });
                 var zIndex = getZIndex(style, entity, params.tags);
@@ -25644,7 +25685,7 @@
         ViewRenderEngine.Render = Render;
     })(exports.ViewRenderEngine || (exports.ViewRenderEngine = {}));
 
-    var VERSION = "4.2.0";
+    var VERSION = "4.2.1";
 
     exports.VERSION = VERSION;
     exports.CesiumParabola = CesiumParabola;