bruce-cesium 2.9.3 → 2.9.5

package/dist/bruce-cesium.umd.js

@@ -1965,6 +1965,24 @@
         _billboardCache.Set(key, data);
         return data;
     };
+    /**
+     * Removes duplicate points in a row and returns a new array.
+     * Passed array is not mutated.
+     * @param posses
+     */
+    function cullDuplicatePoints(posses) {
+        var newPosses = [];
+        var lastPos = null;
+        for (var i = 0; i < posses.length; i++) {
+            var pos = posses[i];
+            // Avoiding 'Cesium.Cartesian3.equals' because passed data might be just a json blob in certain cases.
+            if (pos && (!lastPos || (pos.x != lastPos.x || pos.y != lastPos.y || pos.z != lastPos.z))) {
+                newPosses.push(pos);
+                lastPos = pos;
+            }
+        }
+        return newPosses;
+    }
     (function (EntityRenderEngine) {
         function Render(params) {
             var _a, _b, _c, _d, _e, _f, _g, _h;
@@ -2095,10 +2113,13 @@
                                                 }
                                             });
                                             rendered = rendered.concat(Object.values(cLines));
+                                            if (!!rendered.length) return [3 /*break*/, 4];
                                             return [4 /*yield*/, Point.RenderGroup(pParams)];
                                         case 3:
                                             cPoints = _k.sent();
                                             rendered = rendered.concat(Object.values(cPoints));
+                                            _k.label = 4;
+                                        case 4:
                                             rendered = rendered.filter(function (x) { return x != null; });
                                             if (rendered.length) {
                                                 rootEntity_1 = new Cesium.Entity({});
@@ -2549,6 +2570,7 @@
                     flattenPoints = true;
                 }
                 var posses = points.map(function (x) { return Cesium.Cartesian3.fromDegrees(EnsureNumber(x.longitude), EnsureNumber(x.latitude), EnsureNumber(flattenPoints ? 0 : x.altitude)); });
+                posses = cullDuplicatePoints(posses);
                 // 5 points should be enough to tell most bad data.
                 var CHECK_POINTS = 5;
                 var MIN_LEN = 0.001;
@@ -2727,6 +2749,10 @@
                 bruceModels.Cartes.CloseRing3(posses);
                 var extrusion = getPolygonExtrusion(entity, params.tags, outerRing, posses, heightRef, style);
                 posses = extrusion.posses;
+                posses = cullDuplicatePoints(posses);
+                if (posses.length < 4) {
+                    return null;
+                }
                 var flattenPoints = false;
                 if (heightRef == Cesium.HeightReference.CLAMP_TO_GROUND && shouldApplyFlatFix((_b = params.viewer) === null || _b === void 0 ? void 0 : _b.terrainProvider)) {
                     heightRef = Cesium.HeightReference.NONE;
@@ -2735,8 +2761,10 @@
                 var holeRings = pRings.filter(function (x) { return x.Facing == bruceModels.Geometry.EPolygonRingType.Hole; });
                 var holePosses = holeRings.map(function (x) {
                     var points = bruceModels.Geometry.ParsePoints(x.LinearRing);
-                    return points.map(function (x) { return Cesium.Cartesian3.fromDegrees(EnsureNumber(x.longitude), EnsureNumber(x.latitude), EnsureNumber(flattenPoints ? 0 : x.altitude)); });
-                });
+                    var holePosses = points.map(function (x) { return Cesium.Cartesian3.fromDegrees(EnsureNumber(x.longitude), EnsureNumber(x.latitude), EnsureNumber(flattenPoints ? 0 : x.altitude)); });
+                    holePosses = cullDuplicatePoints(holePosses);
+                    return holePosses;
+                }).filter(function (x) { return x.length >= 4; });
                 var zIndex = getZIndex(style, entity, params.tags);
                 var size = getSizeOfPolygonEntity(entity);
                 var classification = Cesium.ClassificationType.TERRAIN;
@@ -7435,6 +7463,18 @@
                     }
                     if (!pos3d) {
                         pos3d = getCurPos3d();
+                        if (pos3d === null || pos3d === void 0 ? void 0 : pos3d.x) {
+                            var carto = Cesium.Cartographic.fromCartesian(pos3d);
+                            if (!isNaN(carto === null || carto === void 0 ? void 0 : carto.latitude)) {
+                                // We reapply back to the tileset so we can reference this location later.
+                                // For example we can reference within editing tools in navigator.
+                                position.location = {
+                                    altitude: carto.height,
+                                    latitude: Cesium.Math.toDegrees(carto.latitude),
+                                    longitude: Cesium.Math.toDegrees(carto.longitude)
+                                };
+                            }
+                        }
                     }
                     var offset = getOffset(pos3d, transform.x, transform.y, transform.z);
                     if (bruceModels.Cartes.ValidateCartes3(offset)) {
@@ -16641,7 +16681,7 @@
         ViewerUtils.CreateWidgets = CreateWidgets;
     })(exports.ViewerUtils || (exports.ViewerUtils = {}));
 
-    var VERSION$1 = "2.9.3";
+    var VERSION$1 = "2.9.5";
 
     exports.VERSION = VERSION$1;
     exports.CesiumViewMonitor = CesiumViewMonitor;