bruce-cesium 2.5.4 → 2.5.5

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, Cartesian2, CallbackProperty, Cartesian3, Color, Rectangle, Math as Math$1, JulianDate, HeightReference, DistanceDisplayCondition, NearFarScalar, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, HeadingPitchRoll, Transforms, ColorBlendMode, SceneMode, Primitive, Cesium3DTileFeature, Cesium3DTileColorBlendMode, HeadingPitchRange, createOsmBuildings, Cesium3DTileStyle, KmlDataSource, OrthographicFrustum, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, Cesium3DTileset, Matrix4, Matrix3, IonResource, CesiumInspector, defined, EllipsoidGeodesic, sampleTerrainMostDetailed, Model, PolygonPipeline, ColorMaterialProperty, EasingFunction, GeometryInstance, ScreenSpaceEventHandler, ScreenSpaceEventType, Ion, BoundingSphere } from 'cesium';
+import { Cartographic, Cartesian2, CallbackProperty, Cartesian3, Color, Rectangle, Math as Math$1, JulianDate, Entity, Primitive, Cesium3DTileFeature, SceneMode, HeightReference, DistanceDisplayCondition, NearFarScalar, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, HeadingPitchRoll, Transforms, ColorBlendMode, Cesium3DTileColorBlendMode, HeadingPitchRange, createOsmBuildings, Cesium3DTileStyle, KmlDataSource, OrthographicFrustum, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, CesiumInspector, defined, Cesium3DTileset, Matrix4, Matrix3, IonResource, ColorMaterialProperty, EasingFunction, GeometryInstance, PolygonPipeline, ScreenSpaceEventHandler, ScreenSpaceEventType, EllipsoidGeodesic, sampleTerrainMostDetailed, Model, Ion, BoundingSphere } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -1630,9 +1630,9 @@ function getPolygonExtrusion(entity, tags, ring, posses, heightRef, pStyle) {
     }
     return data;
 }
-function getHeightRef(style) {
+function getHeightRef(style, defaultStyle) {
     var _a;
-    var heightRef = HeightReference.CLAMP_TO_GROUND;
+    var heightRef = defaultStyle == null ? 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 = HeightReference.NONE;
@@ -1693,38 +1693,52 @@ function getName(api, entity) {
 }
 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*/, 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*/, 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*/, 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];
             }
         });
     });
@@ -2100,7 +2114,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_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:
@@ -2153,7 +2167,7 @@ var EntityRenderEngine;
                             _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:
@@ -2254,10 +2268,10 @@ var EntityRenderEngine;
                             }
                             if (!cEntity) {
                                 bColor = style.color ? Calculator.GetColor(style.color, entity, params.tags) : null;
-                                cColor = bColor ? colorToCColor(bColor) : Color.RED;
+                                cColor = bColor ? colorToCColor(bColor) : Color.fromCssColorString("rgba(33, 150, 243, 0.8)");
                                 size = style.size ? Calculator.GetNumber(style.size, entity, params.tags) : null;
                                 if (size == null) {
-                                    size = 30;
+                                    size = 20;
                                 }
                                 size = EnsureNumber(size);
                                 if (size <= 0) {
@@ -2406,13 +2420,13 @@ var EntityRenderEngine;
                 return null;
             }
             var bColor = style.lineColor ? Calculator.GetColor(style.lineColor, entity, params.tags) : null;
-            var cColor = bColor ? colorToCColor(bColor) : Color.RED;
+            var cColor = bColor ? colorToCColor(bColor) : Color.fromCssColorString("rgba(255, 193, 7, 0.8)");
             if (cColor.alpha <= 0) {
                 return null;
             }
             var width = style.lineWidth ? Calculator.GetNumber(style.lineWidth, entity, params.tags) : null;
             if (width == null) {
-                width = 4;
+                width = 2;
             }
             width = EnsureNumber(width);
             if (width < 0.01) {
@@ -2534,12 +2548,12 @@ var EntityRenderEngine;
             }
             var style = params.style;
             var bFillColor = Calculator.GetColor(style.fillColor, entity, params.tags);
-            var cFillColor = bFillColor ? colorToCColor(bFillColor) : Color.RED;
+            var cFillColor = bFillColor ? colorToCColor(bFillColor) : Color.fromCssColorString("rgba(139, 195, 74, 0.8)");
             var bLineColor = Calculator.GetColor(style.lineColor, entity, params.tags);
-            var cLineColor = bLineColor ? colorToCColor(bLineColor) : Color.RED;
+            var cLineColor = bLineColor ? colorToCColor(bLineColor) : Color.fromCssColorString("rgba(80, 80, 80, 0.8)");
             var width = style.lineWidth ? Calculator.GetNumber(style.lineWidth, entity, params.tags) : null;
             if (width == null) {
-                width = 4;
+                width = 1;
             }
             width = EnsureNumber(width);
             if (width < 0.01) {
@@ -2762,7 +2776,7 @@ var EntityRenderEngine;
                 styleScale = 1;
             }
             var hpr = new HeadingPitchRoll(Math$1.toRadians(heading), Math$1.toRadians(pitch), Math$1.toRadians(roll));
-            var heightRef = getHeightRef(style);
+            var heightRef = getHeightRef(style, HeightReference.RELATIVE_TO_GROUND);
             var pos = EntityUtils.GetPos({
                 viewer: params.viewer,
                 entity: entity,
@@ -15002,7 +15016,7 @@ var ViewerUtils;
     ViewerUtils.CreateWidgets = CreateWidgets;
 })(ViewerUtils || (ViewerUtils = {}));
 
-var VERSION$1 = "2.5.4";
+var VERSION$1 = "2.5.5";
 
 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