bruce-cesium 2.6.2 → 2.6.3

package/dist/bruce-cesium.umd.js

@@ -1628,6 +1628,43 @@
         }
         return data;
     }
+    function getCylinderStyleExtrusion(style, entity, tags, heightRef) {
+        var _a;
+        if (!style) {
+            return null;
+        }
+        try {
+            var extrusion = +bruceModels.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 != Cesium.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 == Cesium.HeightReference.CLAMP_TO_GROUND ? Cesium.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 ? Cesium.HeightReference.CLAMP_TO_GROUND : defaultStyle;
@@ -1860,7 +1897,6 @@
                 return __generator(this, function (_j) {
                     switch (_j.label) {
                         case 0:
-                            console.log("Rendering entities", params);
                             groupRenderParams = {
                                 apiGetter: params.apiGetter,
                                 viewer: params.viewer,
@@ -2112,7 +2148,7 @@
         (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:
@@ -2209,35 +2245,60 @@
                                     bFill = style.CylinderFillColor ? bruceModels.Calculator.GetColor(style.CylinderFillColor, entity, params.tags) : null;
                                     cFill = bFill ? colorToCColor(bFill) : Cesium.Color.RED;
                                     outline = Boolean(style.CylinderBorderEnabled);
-                                    bOutline = style.CylinderBorderColor ? bruceModels.Calculator.GetColor(style.CylinderBorderColor, entity, params.tags) : null;
-                                    cOutline = bOutline ? colorToCColor(bOutline) : Cesium.Color.BLACK;
-                                    outlineWidth = EnsureNumber(bruceModels.Calculator.GetNumber(style.CylinderBorderWidth, entity, params.tags), 1);
-                                    outlineHeight = EnsureNumber(bruceModels.Calculator.GetNumber(style.CylinderBorderExtrusion, entity, params.tags), 0);
-                                    fillHeight = EnsureNumber(bruceModels.Calculator.GetNumber(style.CylinderFillExtrusion, entity, params.tags));
-                                    pos = exports.EntityUtils.GetPos({
+                                    cOutline = null;
+                                    outlineWidth = 1;
+                                    if (outline) {
+                                        bOutline = style.CylinderBorderColor ? bruceModels.Calculator.GetColor(style.CylinderBorderColor, entity, params.tags) : null;
+                                        cOutline = bOutline ? colorToCColor(bOutline) : Cesium.Color.BLACK;
+                                        outlineWidth = EnsureNumber(bruceModels.Calculator.GetNumber(style.CylinderBorderWidth, entity, params.tags), 1);
+                                    }
+                                    heightRef = getHeightRef(style);
+                                    pos3d = exports.EntityUtils.GetPos({
                                         viewer: params.viewer,
                                         entity: entity,
-                                        recordHeightRef: Cesium.HeightReference.RELATIVE_TO_GROUND,
-                                        returnHeightRef: Cesium.HeightReference.RELATIVE_TO_GROUND
+                                        recordHeightRef: heightRef,
+                                        returnHeightRef: heightRef
                                     });
-                                    // Adjust the position to consider half the height of the cylinder
-                                    if (pos) {
-                                        cartographicPosition = Cesium.Cartographic.fromCartesian(pos);
-                                        cartographicPosition.height += fillHeight / 2;
-                                        pos = Cesium.Cartographic.toCartesian(cartographicPosition);
-                                    }
+                                    extrusion = getCylinderExtrusion(entity, params.tags, heightRef, style.CylinderFillExtrusion);
                                     cEntity = new Cesium.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: Cesium.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 Cesium.Entity({
+                                            ellipse: {
+                                                semiMajorAxis: radius + outlineWidth,
+                                                semiMinorAxis: radius + outlineWidth,
+                                                material: cOutline,
+                                                outlineWidth: undefined,
+                                                extrudedHeight: outlineExtrusion.value,
+                                                heightReference: heightRef,
+                                                extrudedHeightReference: outlineExtrusion.exHeightRef,
+                                                height: Cesium.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 ? bruceModels.Calculator.GetColor(style.color, entity, params.tags) : null;
@@ -2266,8 +2327,6 @@
                                         }),
                                         show: true
                                     });
-                                    console.log("Created point", cEntity);
-                                    debugger;
                                 }
                                 if (cEntity) {
                                     cEntity._siblingGraphics = siblings;
@@ -14942,7 +15001,7 @@
         ViewerUtils.CreateWidgets = CreateWidgets;
     })(exports.ViewerUtils || (exports.ViewerUtils = {}));
 
-    var VERSION$1 = "2.5.9";
+    var VERSION$1 = "2.6.3";
 
     exports.VERSION = VERSION$1;
     exports.CesiumViewMonitor = CesiumViewMonitor;