bruce-cesium 2.5.4 → 2.5.6

package/dist/bruce-cesium.umd.js

@@ -1628,9 +1628,9 @@
         }
         return data;
     }
-    function getHeightRef(style) {
+    function getHeightRef(style, defaultStyle) {
         var _a;
-        var heightRef = Cesium.HeightReference.CLAMP_TO_GROUND;
+        var heightRef = defaultStyle == null ? Cesium.HeightReference.CLAMP_TO_GROUND : defaultStyle;
         var altOptionId = (_a = style === null || style === void 0 ? void 0 : style.altitudeOption) === null || _a === void 0 ? void 0 : _a.id;
         if (altOptionId == 1) {
             heightRef = Cesium.HeightReference.NONE;
@@ -1691,38 +1691,52 @@
     }
     function getStyle(api, entity, styleId) {
         return __awaiter(this, void 0, void 0, function () {
-            var style, typeId, type;
+            var style, e_2, typeId, type, e_3;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         style = null;
-                        if (!styleId) return [3 /*break*/, 2];
+                        if (!styleId) return [3 /*break*/, 4];
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 4]);
                         return [4 /*yield*/, bruceModels.Style.Get({
                                 api: api,
                                 styleId: styleId
                             })];
-                    case 1:
-                        style = (_a.sent()).style;
-                        _a.label = 2;
                     case 2:
-                        if (!!style) return [3 /*break*/, 5];
+                        style = (_a.sent()).style;
+                        return [3 /*break*/, 4];
+                    case 3:
+                        e_2 = _a.sent();
+                        console.error(e_2);
+                        return [3 /*break*/, 4];
+                    case 4:
+                        if (!!style) return [3 /*break*/, 9];
                         typeId = entity.Bruce["EntityType.ID"];
-                        if (!typeId) return [3 /*break*/, 5];
+                        if (!typeId) return [3 /*break*/, 9];
                         return [4 /*yield*/, bruceModels.EntityType.Get({
                                 api: api,
                                 entityTypeId: typeId
                             })];
-                    case 3:
+                    case 5:
                         type = (_a.sent()).entityType;
-                        if (!type["DisplaySetting.ID"]) return [3 /*break*/, 5];
+                        if (!type["DisplaySetting.ID"]) return [3 /*break*/, 9];
+                        _a.label = 6;
+                    case 6:
+                        _a.trys.push([6, 8, , 9]);
                         return [4 /*yield*/, bruceModels.Style.Get({
                                 api: api,
                                 styleId: type["DisplaySetting.ID"]
                             })];
-                    case 4:
+                    case 7:
                         style = (_a.sent()).style;
-                        _a.label = 5;
-                    case 5: return [2 /*return*/, style];
+                        return [3 /*break*/, 9];
+                    case 8:
+                        e_3 = _a.sent();
+                        console.error(e_3);
+                        return [3 /*break*/, 9];
+                    case 9: return [2 /*return*/, style];
                 }
             });
         });
@@ -2097,7 +2111,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_2, iconScale, heightRef, radius, bFill, cFill, outline, cOutline, outlineWidth, outlineHeight, bOutline, fillHeight, exHeightRef, pos, bColor, cColor, size, heightRef;
+                    var entity, style, type, cEntity, siblings, iconUrlRows, icon, iconUrl, res, e_4, iconScale, heightRef, radius, bFill, cFill, outline, cOutline, outlineWidth, outlineHeight, bOutline, fillHeight, exHeightRef, pos, bColor, cColor, size, heightRef;
                     return __generator(this, function (_a) {
                         switch (_a.label) {
                             case 0:
@@ -2150,7 +2164,7 @@
                                 _a.label = 4;
                             case 4: return [3 /*break*/, 6];
                             case 5:
-                                e_2 = _a.sent();
+                                e_4 = _a.sent();
                                 iconUrl = null;
                                 return [3 /*break*/, 6];
                             case 6:
@@ -2251,10 +2265,10 @@
                                 }
                                 if (!cEntity) {
                                     bColor = style.color ? bruceModels.Calculator.GetColor(style.color, entity, params.tags) : null;
-                                    cColor = bColor ? colorToCColor(bColor) : Cesium.Color.RED;
+                                    cColor = bColor ? colorToCColor(bColor) : Cesium.Color.fromCssColorString("rgba(33, 150, 243, 0.8)");
                                     size = style.size ? bruceModels.Calculator.GetNumber(style.size, entity, params.tags) : null;
                                     if (size == null) {
-                                        size = 30;
+                                        size = 20;
                                     }
                                     size = EnsureNumber(size);
                                     if (size <= 0) {
@@ -2403,13 +2417,13 @@
                     return null;
                 }
                 var bColor = style.lineColor ? bruceModels.Calculator.GetColor(style.lineColor, entity, params.tags) : null;
-                var cColor = bColor ? colorToCColor(bColor) : Cesium.Color.RED;
+                var cColor = bColor ? colorToCColor(bColor) : Cesium.Color.fromCssColorString("rgba(255, 193, 7, 0.8)");
                 if (cColor.alpha <= 0) {
                     return null;
                 }
                 var width = style.lineWidth ? bruceModels.Calculator.GetNumber(style.lineWidth, entity, params.tags) : null;
                 if (width == null) {
-                    width = 4;
+                    width = 2;
                 }
                 width = EnsureNumber(width);
                 if (width < 0.01) {
@@ -2531,12 +2545,12 @@
                 }
                 var style = params.style;
                 var bFillColor = bruceModels.Calculator.GetColor(style.fillColor, entity, params.tags);
-                var cFillColor = bFillColor ? colorToCColor(bFillColor) : Cesium.Color.RED;
+                var cFillColor = bFillColor ? colorToCColor(bFillColor) : Cesium.Color.fromCssColorString("rgba(139, 195, 74, 0.8)");
                 var bLineColor = bruceModels.Calculator.GetColor(style.lineColor, entity, params.tags);
-                var cLineColor = bLineColor ? colorToCColor(bLineColor) : Cesium.Color.RED;
+                var cLineColor = bLineColor ? colorToCColor(bLineColor) : Cesium.Color.fromCssColorString("rgba(80, 80, 80, 0.8)");
                 var width = style.lineWidth ? bruceModels.Calculator.GetNumber(style.lineWidth, entity, params.tags) : null;
                 if (width == null) {
-                    width = 4;
+                    width = 1;
                 }
                 width = EnsureNumber(width);
                 if (width < 0.01) {
@@ -2759,7 +2773,7 @@
                     styleScale = 1;
                 }
                 var hpr = new Cesium.HeadingPitchRoll(Cesium.Math.toRadians(heading), Cesium.Math.toRadians(pitch), Cesium.Math.toRadians(roll));
-                var heightRef = getHeightRef(style);
+                var heightRef = getHeightRef(style, Cesium.HeightReference.RELATIVE_TO_GROUND);
                 var pos = exports.EntityUtils.GetPos({
                     viewer: params.viewer,
                     entity: entity,
@@ -9976,7 +9990,7 @@
                             })];
                     case 2:
                         pKey = (_a.sent()).programKey;
-                        key = pKey.Key;
+                        key = pKey === null || pKey === void 0 ? void 0 : pKey.Key;
                         return [3 /*break*/, 4];
                     case 3:
                         e_1 = _a.sent();
@@ -14948,7 +14962,7 @@
         ViewerUtils.CreateWidgets = CreateWidgets;
     })(exports.ViewerUtils || (exports.ViewerUtils = {}));
 
-    var VERSION$1 = "2.5.4";
+    var VERSION$1 = "2.5.6";
 
     exports.VERSION = VERSION$1;
     exports.CesiumViewMonitor = CesiumViewMonitor;