bruce-cesium 2.6.2 → 2.6.3

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, Cartesian3, SceneMode, Math as Math$1, Cartesian2, CallbackProperty, Color, Rectangle, JulianDate, HeightReference, DistanceDisplayCondition, NearFarScalar, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, Cesium3DTileColorBlendMode, HeadingPitchRange, createOsmBuildings, Cesium3DTileStyle, KmlDataSource, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, OrthographicFrustum, ColorMaterialProperty, Matrix3, Matrix4, EasingFunction, GeometryInstance, Cesium3DTileset, IonResource, ScreenSpaceEventHandler, ScreenSpaceEventType, PolygonPipeline, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, Model, CesiumInspector, Ion, BoundingSphere } from 'cesium';
+import { Cartographic, Cartesian3, SceneMode, Math as Math$1, Cartesian2, CallbackProperty, Color, Rectangle, JulianDate, HeightReference, DistanceDisplayCondition, NearFarScalar, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, HeadingPitchRange, Cesium3DTileColorBlendMode, createOsmBuildings, Cesium3DTileStyle, KmlDataSource, OrthographicFrustum, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, CesiumInspector, defined, PolygonPipeline, Cesium3DTileset, Matrix4, Matrix3, IonResource, EllipsoidGeodesic, sampleTerrainMostDetailed, Model, ScreenSpaceEventHandler, ScreenSpaceEventType, ColorMaterialProperty, EasingFunction, GeometryInstance, Ion, BoundingSphere } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -1630,6 +1630,43 @@ function getPolygonExtrusion(entity, tags, ring, posses, heightRef, pStyle) {
     }
     return data;
 }
+function getCylinderStyleExtrusion(style, entity, tags, heightRef) {
+    var _a;
+    if (!style) {
+        return null;
+    }
+    try {
+        var extrusion = +Calculator.GetNumber(style, entity, tags);
+        if (!extrusion && extrusion != 0) {
+            return null;
+        }
+        /*
+            Cesium extrudes in strange way.
+            If you want something that is 50 meters above sea, and 5 meters tall,
+            You need to extrude by 55 meters, if you extrude by 5 it will extrude from sea and look flat.
+        */
+        var height = EnsureNumber((_a = entity.location) === null || _a === void 0 ? void 0 : _a.altitude, 0);
+        return heightRef != HeightReference.CLAMP_TO_GROUND ? extrusion + height : extrusion;
+    }
+    catch (e) {
+        console.error(e);
+    }
+    return 0;
+}
+function getCylinderExtrusion(entity, tags, heightRef, style) {
+    var data = {
+        value: undefined,
+        exHeightRef: heightRef == HeightReference.CLAMP_TO_GROUND ? HeightReference.RELATIVE_TO_GROUND : heightRef
+    };
+    var extrusion = getCylinderStyleExtrusion(style, entity, tags, heightRef);
+    if (extrusion) {
+        data.value = extrusion;
+    }
+    if (data.value != undefined) {
+        data.value = EnsureNumber(data.value);
+    }
+    return data;
+}
 function getHeightRef(style, defaultStyle) {
     var _a;
     var heightRef = defaultStyle == null ? HeightReference.CLAMP_TO_GROUND : defaultStyle;
@@ -1863,7 +1900,6 @@ var EntityRenderEngine;
             return __generator(this, function (_j) {
                 switch (_j.label) {
                     case 0:
-                        console.log("Rendering entities", params);
                         groupRenderParams = {
                             apiGetter: params.apiGetter,
                             viewer: params.viewer,
@@ -2115,7 +2151,7 @@ var EntityRenderEngine;
     (function (Point) {
         function Render(params) {
             return __awaiter(this, void 0, void 0, function () {
-                var entity, style, type, cEntity, siblings, iconUrlRows, icon, iconUrl, res, e_4, iconScale, disableDepthTest, heightRef, radius, bFill, cFill, outline, bOutline, cOutline, outlineWidth, outlineHeight, fillHeight, pos, cartographicPosition, bColor, cColor, size, heightRef;
+                var entity, style, type, cEntity, siblings, iconUrlRows, icon, iconUrl, res, e_4, iconScale, disableDepthTest, heightRef, radius, bFill, cFill, outline, cOutline, outlineWidth, bOutline, heightRef, pos3d, extrusion, outlineExtrusion, bColor, cColor, size, heightRef;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
@@ -2212,35 +2248,60 @@ var EntityRenderEngine;
                                 bFill = style.CylinderFillColor ? Calculator.GetColor(style.CylinderFillColor, entity, params.tags) : null;
                                 cFill = bFill ? colorToCColor(bFill) : Color.RED;
                                 outline = Boolean(style.CylinderBorderEnabled);
-                                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);
-                                fillHeight = EnsureNumber(Calculator.GetNumber(style.CylinderFillExtrusion, entity, params.tags));
-                                pos = EntityUtils.GetPos({
+                                cOutline = null;
+                                outlineWidth = 1;
+                                if (outline) {
+                                    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);
+                                }
+                                heightRef = getHeightRef(style);
+                                pos3d = EntityUtils.GetPos({
                                     viewer: params.viewer,
                                     entity: entity,
-                                    recordHeightRef: HeightReference.RELATIVE_TO_GROUND,
-                                    returnHeightRef: HeightReference.RELATIVE_TO_GROUND
+                                    recordHeightRef: heightRef,
+                                    returnHeightRef: heightRef
                                 });
-                                // Adjust the position to consider half the height of the cylinder
-                                if (pos) {
-                                    cartographicPosition = Cartographic.fromCartesian(pos);
-                                    cartographicPosition.height += fillHeight / 2;
-                                    pos = Cartographic.toCartesian(cartographicPosition);
-                                }
+                                extrusion = getCylinderExtrusion(entity, params.tags, heightRef, style.CylinderFillExtrusion);
                                 cEntity = new Entity({
-                                    position: pos,
-                                    cylinder: {
-                                        length: fillHeight,
-                                        topRadius: radius,
-                                        bottomRadius: radius,
+                                    ellipse: {
+                                        semiMajorAxis: radius,
+                                        semiMinorAxis: radius,
                                         material: cFill,
-                                        outline: outline,
-                                        outlineColor: cOutline,
-                                        outlineWidth: outlineWidth
-                                    }
+                                        outlineWidth: null,
+                                        extrudedHeight: extrusion.value,
+                                        heightReference: heightRef,
+                                        extrudedHeightReference: extrusion.exHeightRef,
+                                        height: Cartographic.fromCartesian(pos3d).height,
+                                        zIndex: 1,
+                                        distanceDisplayCondition: getDisplayCondition(params.minDistance, params.maxDistance)
+                                    },
+                                    position: pos3d === null || pos3d === void 0 ? void 0 : pos3d.clone(),
+                                    show: true
                                 });
+                                if (outline && outlineWidth > 0) {
+                                    outlineExtrusion = getCylinderExtrusion(entity, params.tags, heightRef, style.CylinderBorderExtrusion);
+                                    // If this doesn't have its own extrusion, we must make it match the sibling.
+                                    // This way they render in a uniform way.
+                                    if (!outlineExtrusion.value && extrusion.value) {
+                                        outlineExtrusion.exHeightRef = extrusion.exHeightRef;
+                                    }
+                                    siblings.push(new Entity({
+                                        ellipse: {
+                                            semiMajorAxis: radius + outlineWidth,
+                                            semiMinorAxis: radius + outlineWidth,
+                                            material: cOutline,
+                                            outlineWidth: undefined,
+                                            extrudedHeight: outlineExtrusion.value,
+                                            heightReference: heightRef,
+                                            extrudedHeightReference: outlineExtrusion.exHeightRef,
+                                            height: Cartographic.fromCartesian(pos3d).height,
+                                            zIndex: 2,
+                                            distanceDisplayCondition: getDisplayCondition(params.minDistance, params.maxDistance)
+                                        },
+                                        position: pos3d === null || pos3d === void 0 ? void 0 : pos3d.clone()
+                                    }));
+                                }
                             }
                             if (!cEntity) {
                                 bColor = style.color ? Calculator.GetColor(style.color, entity, params.tags) : null;
@@ -2269,8 +2330,6 @@ var EntityRenderEngine;
                                     }),
                                     show: true
                                 });
-                                console.log("Created point", cEntity);
-                                debugger;
                             }
                             if (cEntity) {
                                 cEntity._siblingGraphics = siblings;
@@ -14996,7 +15055,7 @@ var ViewerUtils;
     ViewerUtils.CreateWidgets = CreateWidgets;
 })(ViewerUtils || (ViewerUtils = {}));
 
-var VERSION$1 = "2.5.9";
+var VERSION$1 = "2.6.3";
 
 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, ViewRenderEngine, TileRenderEngine, TilesetRenderEngine, CESIUM_INSPECTOR_KEY, ViewUtils, DrawingUtils, MeasureUtils, EntityUtils, Draw3dPolygon, Draw3dPolyline };
 //# sourceMappingURL=bruce-cesium.es5.js.map