bruce-cesium 2.9.3 → 2.9.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, Bounds, EntityRelationType, DelayQueue, BatchedDataGetter, 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, JulianDate, HeightReference, DistanceDisplayCondition, NearFarScalar, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, SceneMode, Cesium3DTileColorBlendMode, HeadingPitchRange, Cesium3DTileStyle, createOsmBuildings, KmlDataSource, OrthographicFrustum, EasingFunction, SceneTransforms, EllipsoidTerrainProvider, CesiumInspector, defined, createWorldTerrain, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, EllipsoidGeodesic, sampleTerrainMostDetailed, Cesium3DTileset, Model, PolygonPipeline, Matrix4, Matrix3, IonResource, Ion, ColorMaterialProperty, GeometryInstance, ScreenSpaceEventHandler, ScreenSpaceEventType, BoundingSphere } from 'cesium';
+import { Cartographic, Cartesian2, CallbackProperty, Cartesian3, Color, Rectangle, Math as Math$1, JulianDate, Entity, Primitive, Cesium3DTileFeature, SceneMode, HeightReference, DistanceDisplayCondition, NearFarScalar, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Cesium3DTileColorBlendMode, HeadingPitchRange, Cesium3DTileStyle, KmlDataSource, createOsmBuildings, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, SceneTransforms, CesiumInspector, OrthographicFrustum, defined, Cesium3DTileset, Matrix4, Matrix3, IonResource, Ion, EllipsoidGeodesic, sampleTerrainMostDetailed, Model, EasingFunction, PolygonPipeline, ColorMaterialProperty, GeometryInstance, ScreenSpaceEventHandler, ScreenSpaceEventType, BoundingSphere } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -1967,6 +1967,24 @@ var createCircleBillboard = function (size, colorCss) {
     _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;
+}
 var EntityRenderEngine;
 (function (EntityRenderEngine) {
     function Render(params) {
@@ -2098,10 +2116,13 @@ var EntityRenderEngine;
                                             }
                                         });
                                         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 Entity({});
@@ -2552,6 +2573,7 @@ var EntityRenderEngine;
                 flattenPoints = true;
             }
             var posses = points.map(function (x) { return 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;
@@ -2730,6 +2752,10 @@ var EntityRenderEngine;
             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 == HeightReference.CLAMP_TO_GROUND && shouldApplyFlatFix((_b = params.viewer) === null || _b === void 0 ? void 0 : _b.terrainProvider)) {
                 heightRef = HeightReference.NONE;
@@ -2738,8 +2764,10 @@ var EntityRenderEngine;
             var holeRings = pRings.filter(function (x) { return x.Facing == Geometry.EPolygonRingType.Hole; });
             var holePosses = holeRings.map(function (x) {
                 var points = Geometry.ParsePoints(x.LinearRing);
-                return points.map(function (x) { return Cartesian3.fromDegrees(EnsureNumber(x.longitude), EnsureNumber(x.latitude), EnsureNumber(flattenPoints ? 0 : x.altitude)); });
-            });
+                var holePosses = points.map(function (x) { return 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 = ClassificationType.TERRAIN;
@@ -7468,6 +7496,18 @@ var TilesetRenderEngine;
                 }
                 if (!pos3d) {
                     pos3d = getCurPos3d();
+                    if (pos3d === null || pos3d === void 0 ? void 0 : pos3d.x) {
+                        var carto = 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: Math$1.toDegrees(carto.latitude),
+                                longitude: Math$1.toDegrees(carto.longitude)
+                            };
+                        }
+                    }
                 }
                 var offset = getOffset(pos3d, transform.x, transform.y, transform.z);
                 if (Cartes.ValidateCartes3(offset)) {
@@ -16699,7 +16739,7 @@ var ViewerUtils;
     ViewerUtils.CreateWidgets = CreateWidgets;
 })(ViewerUtils || (ViewerUtils = {}));
 
-var VERSION$1 = "2.9.3";
+var VERSION$1 = "2.9.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, EntityLabel, ViewRenderEngine, TileRenderEngine, TilesetRenderEngine, CESIUM_INSPECTOR_KEY, ViewUtils, DrawingUtils, MeasureUtils, EntityUtils, Draw3dPolygon, Draw3dPolyline };
 //# sourceMappingURL=bruce-cesium.es5.js.map