bruce-cesium 1.3.9 → 1.4.0

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 { 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, CallbackProperty, OrthographicFrustum, JulianDate, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, Matrix4, Cesium3DTileset, IonResource, PolygonPipeline, EllipsoidGeodesic, sampleTerrainMostDetailed, ColorMaterialProperty, Matrix3, EasingFunction, GeometryInstance } 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, OrthographicFrustum, JulianDate, CallbackProperty, EllipsoidGeodesic, EllipsoidTerrainProvider, sampleTerrainMostDetailed, Matrix4, Cesium3DTileset, IonResource, PolygonPipeline, createWorldTerrain, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, ColorMaterialProperty, Matrix3, EasingFunction, GeometryInstance } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -702,7 +702,7 @@ var EntityUtils;
                         }
                         else if (visual.polyline) {
                             visualHeightRef = GetValue(viewer, visual.polyline.clampToGround) ?
-                                HeightReference.RELATIVE_TO_GROUND : HeightReference.NONE;
+                                HeightReference.CLAMP_TO_GROUND : HeightReference.NONE;
                         }
                         else if (visual.billboard) {
                             visualHeightRef = GetValue(viewer, visual.billboard.heightReference);
@@ -1440,6 +1440,7 @@ var EntityRenderEngine;
                 }
             }
             var cEntity = null;
+            var siblings = [];
             if (type == Style.EPointType.Icon) {
                 // Fixing poor data.
                 var iconUrlRows = style.iconUrl == null ? [] : style.iconUrl;
@@ -1482,7 +1483,67 @@ var EntityRenderEngine;
                     }
                 }
             }
-            if (type == Style.EPointType.Cylinder) ;
+            if (type == Style.EPointType.Cylinder) {
+                var radius = EnsureNumber(Calculator.GetNumber(style.CylinderRadius, entity, params.tags));
+                if (radius <= 0) {
+                    return null;
+                }
+                var bFill = style.CylinderFillColor ? Calculator.GetColor(style.CylinderFillColor, entity, params.tags) : null;
+                var cFill = bFill ? colorToCColor(bFill) : Color.RED;
+                var outline = Boolean(style.CylinderBorderEnabled);
+                var cOutline = null;
+                var outlineWidth = 1;
+                var outlineHeight = 0;
+                if (outline) {
+                    var bOutline = style.CylinderBorderColor ? Calculator.GetColor(style.CylinderBorderColor, entity, params.tags) : null;
+                    cOutline = bOutline ? colorToCColor(bOutline) : Color.BLACK;
+                    outlineWidth = EnsureNumber(Calculator.GetNumber(style.CylinderBorderWidth, entity, params.tags), 1);
+                    outlineHeight = EnsureNumber(Calculator.GetNumber(style.CylinderBorderExtrusion, entity, params.tags), 0);
+                }
+                var fillHeight = EnsureNumber(Calculator.GetNumber(style.CylinderFillExtrusion, entity, params.tags));
+                var exHeightRef = undefined;
+                if (fillHeight > 0) {
+                    exHeightRef = HeightReference.RELATIVE_TO_GROUND;
+                }
+                var pos = EntityUtils.GetPos({
+                    viewer: params.viewer,
+                    entity: entity
+                });
+                cEntity = new Entity({
+                    ellipse: {
+                        semiMajorAxis: radius,
+                        semiMinorAxis: radius,
+                        material: cFill,
+                        outlineWidth: null,
+                        extrudedHeight: fillHeight,
+                        heightReference: HeightReference.CLAMP_TO_GROUND,
+                        extrudedHeightReference: exHeightRef,
+                        zIndex: 1
+                    },
+                    position: pos === null || pos === void 0 ? void 0 : pos.clone(),
+                    show: false
+                });
+                if (outline && outlineWidth > 0) {
+                    if (!exHeightRef && outlineHeight > 0) {
+                        exHeightRef = HeightReference.RELATIVE_TO_GROUND;
+                        // We need height reference to match between rings.
+                        cEntity.ellipse.extrudedHeightReference = exHeightRef;
+                    }
+                    siblings.push(new Entity({
+                        ellipse: {
+                            semiMajorAxis: radius + outlineWidth,
+                            semiMinorAxis: radius + outlineWidth,
+                            material: cOutline,
+                            outlineWidth: undefined,
+                            extrudedHeight: outlineHeight,
+                            heightReference: HeightReference.CLAMP_TO_GROUND,
+                            extrudedHeightReference: exHeightRef,
+                            zIndex: 2
+                        },
+                        position: pos === null || pos === void 0 ? void 0 : pos.clone()
+                    }));
+                }
+            }
             if (!cEntity) {
                 var bColor = style.color ? Calculator.GetColor(style.color, entity, params.tags) : null;
                 var cColor = bColor ? colorToCColor(bColor) : Color.RED;
@@ -1509,6 +1570,12 @@ var EntityRenderEngine;
             }
             if (cEntity) {
                 params.viewer.entities.add(cEntity);
+                if (siblings) {
+                    siblings.forEach(function (sibling) {
+                        params.viewer.entities.add(sibling);
+                    });
+                }
+                cEntity._siblingGraphics = siblings;
             }
             return cEntity;
         }
@@ -1932,7 +1999,7 @@ var EntityRenderEngine;
                             tags = (_e.sent()).tags;
                             _e.label = 4;
                         case 4:
-                            mStyle = (_b = (_a = style === null || style === void 0 ? void 0 : style.Settings) === null || _a === void 0 ? void 0 : _a.polygonStyle) !== null && _b !== void 0 ? _b : {};
+                            mStyle = (_b = (_a = style === null || style === void 0 ? void 0 : style.Settings) === null || _a === void 0 ? void 0 : _a.modelStyle) !== null && _b !== void 0 ? _b : {};
                             group = mStyle.lodGroup ? Calculator.GetString(mStyle.lodGroup, entity, tags) : null;
                             if (!group) {
                                 group = "DEFAULT";
@@ -1986,7 +2053,7 @@ var EntityRenderEngine;
                                             if (!(lod === null || lod === void 0 ? void 0 : lod.clientFileId)) {
                                                 return [2 /*return*/, "continue"];
                                             }
-                                            mStyle = (_d = (_c = style === null || style === void 0 ? void 0 : style.Settings) === null || _c === void 0 ? void 0 : _c.polygonStyle) !== null && _d !== void 0 ? _d : {};
+                                            mStyle = (_d = (_c = style === null || style === void 0 ? void 0 : style.Settings) === null || _c === void 0 ? void 0 : _c.modelStyle) !== null && _d !== void 0 ? _d : {};
                                             cEntity = Render({
                                                 entity: entity,
                                                 style: mStyle,