bruce-cesium 1.3.0 → 1.3.2

package/dist/bruce-cesium.es5.js

@@ -1,5 +1,5 @@
 import { BruceEvent, Cartes, Carto, Geometry, ZoomControl, Style, EntityTag, Calculator, EntityLod, EntityType, ClientFile, ObjectUtils, DelayQueue, Entity as Entity$1, BatchedDataGetter, EntityRelationType, Tileset, EntityCoords, EntityFilterGetter, EntitySource, EntityRelation, MenuItem, ProjectView, ProjectViewBookmark, ProjectViewTile, ProjectViewLegacyTile, ProgramKey, Camera } from 'bruce-models';
-import { Cartesian3, Color, HeightReference, Cartographic, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Math as Math$1, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, Cartesian2, Cesium3DTileColorBlendMode, HeadingPitchRange, createOsmBuildings, Cesium3DTileStyle, Rectangle, KmlDataSource, CallbackProperty, OrthographicFrustum, JulianDate, EllipsoidGeodesic, EllipsoidTerrainProvider, sampleTerrainMostDetailed, PolygonPipeline, Matrix4, Cesium3DTileset, IonResource, ColorMaterialProperty, Matrix3, EasingFunction, GeometryInstance, createWorldTerrain, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider } from 'cesium';
+import { Cartesian2, Cartographic, Math as Math$1, Color, HeightReference, Cartesian3, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, Cesium3DTileColorBlendMode, HeadingPitchRange, createOsmBuildings, Cesium3DTileStyle, Rectangle, KmlDataSource, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, CallbackProperty, Matrix4, Cesium3DTileset, IonResource, EllipsoidGeodesic, sampleTerrainMostDetailed, OrthographicFrustum, JulianDate, PolygonPipeline, ColorMaterialProperty, Matrix3, EasingFunction, GeometryInstance } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -1267,7 +1267,7 @@ var EntityRenderEngine;
                     case 2:
                         if (!(multiGeometry.length > 0)) return [3 /*break*/, 6];
                         _loop_1 = function (i) {
-                            var entity, pParams, zoomItem, j, subEntity, cPoly, rendered, cLines, cPoints, rootEntity, firstEntity;
+                            var entity, pParams, zoomItem, j, subEntity, cPoly, rendered, cLines, cPoints, rootEntity_1, firstEntity;
                             return __generator(this, function (_a) {
                                 switch (_a.label) {
                                     case 0:
@@ -1303,16 +1303,19 @@ var EntityRenderEngine;
                                         rendered = rendered.concat(Object.values(cPoints));
                                         rendered = rendered.filter(function (x) { return x != null; });
                                         if (rendered.length) {
-                                            rootEntity = new Entity({});
-                                            params.viewer.entities.add(rootEntity);
-                                            rootEntity._siblingGraphics = [];
-                                            rootEntity._renderGroup = getRenderGroupId(zoomItem);
-                                            rootEntity._siblingGraphics = rootEntity._siblingGraphics.concat(rendered);
-                                            cEntities[entity.Bruce.ID] = rootEntity;
+                                            rootEntity_1 = new Entity({});
+                                            params.viewer.entities.add(rootEntity_1);
+                                            rootEntity_1._siblingGraphics = [];
+                                            rootEntity_1._renderGroup = getRenderGroupId(zoomItem);
+                                            rootEntity_1._siblingGraphics = rootEntity_1._siblingGraphics.concat(rendered);
+                                            cEntities[entity.Bruce.ID] = rootEntity_1;
                                             firstEntity = rendered[0];
                                             if (firstEntity) {
-                                                rootEntity.position = getValue(params.viewer, firstEntity.position.getValue);
+                                                rootEntity_1.position = getValue(params.viewer, firstEntity.position.getValue);
                                             }
+                                            rendered.forEach(function (child) {
+                                                child._parentEntity = rootEntity_1;
+                                            });
                                         }
                                         else {
                                             polygons.push(entity);
@@ -1701,9 +1704,9 @@ var EntityRenderEngine;
             var outerRing = pRings.find(function (x) { return x.Facing == Geometry.EPolygonRingType.Boundaries; });
             var points = Geometry.ParsePoints(outerRing === null || outerRing === void 0 ? void 0 : outerRing.LinearRing);
             var posses = points.map(function (x) { return Cartesian3.fromDegrees(EnsureNumber(x.longitude), EnsureNumber(x.latitude), EnsureNumber(x.altitude)); });
+            Cartes.CloseRing3(posses);
             var extrusion = getPolygonExtrusion(entity, params.tags, outerRing, posses, heightRef, style);
             posses = extrusion.posses;
-            console.log("EXTRUSION", extrusion, style);
             var holeRings = pRings.filter(function (x) { return x.Facing == Geometry.EPolygonRingType.Hole; });
             var holePosses = holeRings.map(function (x) {
                 var points = Geometry.ParsePoints(x.LinearRing);
@@ -1729,11 +1732,11 @@ var EntityRenderEngine;
                 show: false
             });
             cEntity._siblingGraphics = [];
-            for (var i = 0; i < holePosses.length; i++) {
-                var posses_1 = holePosses[i];
-                var cEntityHole = new Entity({
+            console.count("POLYGON WIDTH = " + width + ", COLOR = " + (cLineColor === null || cLineColor === void 0 ? void 0 : cLineColor.toCssColorString()));
+            if (width > 0 && cLineColor) {
+                var cEntityBorder = new Entity({
                     polyline: new PolylineGraphics({
-                        positions: posses_1,
+                        positions: posses,
                         material: cLineColor,
                         width: width,
                         clampToGround: heightRef == HeightReference.CLAMP_TO_GROUND,
@@ -1743,9 +1746,28 @@ var EntityRenderEngine;
                     }),
                     show: false
                 });
-                cEntity._siblingGraphics.push(cEntityHole);
-                cEntityHole._parentEntity = cEntity;
-                params.viewer.entities.add(cEntityHole);
+                params.viewer.entities.add(cEntityBorder);
+                cEntityBorder._parentEntity = cEntity;
+                cEntity._siblingGraphics.push(cEntityBorder);
+                for (var i = 0; i < holePosses.length; i++) {
+                    var posses_1 = holePosses[i];
+                    Cartes.CloseRing3(posses_1);
+                    var cEntityHole = new Entity({
+                        polyline: new PolylineGraphics({
+                            positions: posses_1,
+                            material: cLineColor,
+                            width: width,
+                            clampToGround: heightRef == HeightReference.CLAMP_TO_GROUND,
+                            classificationType: ClassificationType.TERRAIN,
+                            arcType: ArcType.GEODESIC,
+                            zIndex: zIndex
+                        }),
+                        show: false
+                    });
+                    cEntity._siblingGraphics.push(cEntityHole);
+                    cEntityHole._parentEntity = cEntity;
+                    params.viewer.entities.add(cEntityHole);
+                }
             }
             params.viewer.entities.add(cEntity);
             return cEntity;