bruce-cesium 3.2.9 → 3.3.1

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
 import { Cartes, Carto, Entity as Entity$1, Geometry, Tileset, MathUtils, LRUCache, ProjectViewTile, DelayQueue, ZoomControl, Style, EntityTag, Calculator, EntityLod, EntityType, ClientFile, ObjectUtils, Bounds, EntityRelationType, BruceEvent, EntityCoords, Api, EntitySource, MenuItem, EntityRelation, ProgramKey, ENVIRONMENT, AbstractApi, ProjectViewBookmark, EntityAttachment, EntityAttachmentType, EntityAttribute, ProjectView, ProjectViewLegacyTile, Camera } from 'bruce-models';
 import * as Cesium from 'cesium';
-import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, SceneMode, DistanceDisplayCondition, NearFarScalar, Model, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, JulianDate, Primitive, Cesium3DTileFeature, HeadingPitchRange, Cesium3DTileColorBlendMode, KmlDataSource, Cesium3DTileStyle, Ion, SceneTransforms, EllipsoidTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, PolygonPipeline, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, Cesium3DTileset, Matrix4, Matrix3, IonResource, OrthographicFrustum, EasingFunction, CesiumInspector, ScreenSpaceEventHandler, ScreenSpaceEventType, BoundingSphere, GeometryInstance, Intersect, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, ColorMaterialProperty } from 'cesium';
+import { Cartographic, Color, HeightReference, Cartesian3, DistanceDisplayCondition, NearFarScalar, Model, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, HeadingPitchRoll, Math as Math$1, Transforms, ColorBlendMode, Cartesian2, CallbackProperty, Rectangle, SceneMode, JulianDate, HeadingPitchRange, Ion, Cesium3DTileStyle, Primitive, Cesium3DTileFeature, Cesium3DTileColorBlendMode, KmlDataSource, EllipsoidTerrainProvider, CesiumInspector, OrthographicFrustum, defined, EllipsoidGeodesic, sampleTerrainMostDetailed, Cesium3DTileset, Matrix4, Matrix3, IonResource, EasingFunction, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, PolygonPipeline, SceneTransforms, ScreenSpaceEventHandler, ScreenSpaceEventType, BoundingSphere, GeometryInstance, Intersect, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, ColorMaterialProperty } from 'cesium';
 
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1302,7 +1302,7 @@ var EntityUtils;
                                     case 0:
                                         entityId = sample.entityId, entity = sample.entity, tileset = sample.tileset, tilesetId = sample.tilesetId;
                                         evaluateRendered = function () { return __awaiter(_this, void 0, void 0, function () {
-                                            var rego, posses, parts, i, part, visualHeightRef, hierarchy, hPosses, hPossesSample, step, i_1, pPosses, pPossesSample, step, i_2, pPosses, pPossesSample, step, i_3, pos3d_1, toAdjust, modelExt, sphere, data_1, pos3d_2, toAdjust, sphere;
+                                            var rego, posses, parts, i, part, visualHeightRef, hierarchy, hPosses, hPossesSample, step, i_1, pPosses, pPossesSample, step, i_2, pPosses, pPossesSample, step, i_3, pos3d_1, toAdjust, modelExt, sphere, semiMajorAxis, semiMinorAxis, height, radius, sphere, data_1, pos3d_2, toAdjust, sphere;
                                             return __generator(this, function (_a) {
                                                 switch (_a.label) {
                                                     case 0:
@@ -1407,6 +1407,25 @@ var EntityUtils;
                                                                 spheres.push(sphere);
                                                             }
                                                         }
+                                                        else if (part.ellipse) {
+                                                            semiMajorAxis = GetValue(viewer, part.ellipse.semiMajorAxis);
+                                                            if (!semiMajorAxis || isNaN(semiMajorAxis)) {
+                                                                semiMajorAxis = 0;
+                                                            }
+                                                            semiMinorAxis = GetValue(viewer, part.ellipse.semiMinorAxis);
+                                                            if (!semiMinorAxis || isNaN(semiMinorAxis)) {
+                                                                semiMinorAxis = 0;
+                                                            }
+                                                            height = GetValue(viewer, part.ellipse.extrudedHeight);
+                                                            if (!height || isNaN(height)) {
+                                                                height = 0;
+                                                            }
+                                                            radius = Math.max(semiMajorAxis, semiMinorAxis, height);
+                                                            if (radius && radius > 0) {
+                                                                sphere = new BoundingSphere(pos3d_1, radius);
+                                                                spheres.push(sphere);
+                                                            }
+                                                        }
                                                         _a.label = 15;
                                                     case 15: return [3 /*break*/, 18];
                                                     case 16:
@@ -1686,31 +1705,36 @@ var EntityUtils;
                     case 4:
                         if (allPosses.length > 1) {
                             rect = allPosses.length == 1 ? null : Rectangle.fromCartesianArray(allPosses);
-                            factor = 0.1;
-                            marginX = rect.width * factor / 2;
-                            marginY = rect.height * factor / 2;
-                            rect.east += marginX;
-                            rect.west -= marginX;
-                            rect.north += marginY;
-                            rect.south -= marginY;
-                            data.rectangle = rect;
-                            carto = Rectangle.center(rect);
-                            carto.height = 0;
-                            for (i = 0; i < allPosses.length; i++) {
-                                pos = allPosses[i];
-                                carto.height += Cartographic.fromCartesian(pos).height;
-                            }
-                            if (carto.height != 0) {
-                                carto.height /= allPosses.length;
+                            if (rect.width > 0 && rect.height > 0) {
+                                factor = 0.1;
+                                marginX = rect.width * factor / 2;
+                                marginY = rect.height * factor / 2;
+                                rect.east += marginX;
+                                rect.west -= marginX;
+                                rect.north += marginY;
+                                rect.south -= marginY;
+                                data.rectangle = rect;
+                                carto = Rectangle.center(rect);
+                                carto.height = 0;
+                                for (i = 0; i < allPosses.length; i++) {
+                                    pos = allPosses[i];
+                                    carto.height += Cartographic.fromCartesian(pos).height;
+                                }
+                                if (carto.height != 0) {
+                                    carto.height /= allPosses.length;
+                                }
+                                data.pos3d = Cartesian3.fromRadians(carto.longitude, carto.latitude, carto.height);
+                                radius = Cartesian3.distance(Cartesian3.fromRadians(rect.west, rect.north), Cartesian3.fromRadians(rect.east, rect.south));
+                                if (radius != 0) {
+                                    radius /= 2;
+                                }
+                                sphere = new BoundingSphere(data.pos3d, radius);
+                                spheres.push(sphere);
+                                data.sphere = sphere;
                             }
-                            data.pos3d = Cartesian3.fromRadians(carto.longitude, carto.latitude, carto.height);
-                            radius = Cartesian3.distance(Cartesian3.fromRadians(rect.west, rect.north), Cartesian3.fromRadians(rect.east, rect.south));
-                            if (radius != 0) {
-                                radius /= 2;
+                            else {
+                                data.pos3d = allPosses[0];
                             }
-                            sphere = new BoundingSphere(data.pos3d, radius);
-                            spheres.push(sphere);
-                            data.sphere = sphere;
                         }
                         else if (allPosses.length == 1) {
                             data.pos3d = allPosses[0];
@@ -1725,6 +1749,9 @@ var EntityUtils;
                             combinedSphere = BoundingSphere.fromBoundingSpheres(spheres);
                             data.sphere = combinedSphere;
                         }
+                        if (data.sphere && data.sphere.radius <= 0) {
+                            data.sphere = null;
+                        }
                         return [2 /*return*/, data];
                 }
             });
@@ -3874,7 +3901,7 @@ var EntityRenderEngine;
         Point.CreateCircleBillboard = CreateCircleBillboard;
         function Render(params) {
             return __awaiter(this, void 0, void 0, function () {
-                var entity, style, type, cEntity, siblings, iconUrlRows, icon, iconUrl_1, res, blob_1, e_4, e_5, iconScale, disableDepthTest, heightRef, radius, bFill, cFill, outline, cOutline, outlineWidth, bOutline, heightRef, pos3d, extrusion, outlineExtrusion, bColor, cColor, size, heightRef, circleBillboard;
+                var entity, style, type, cEntity, siblings, iconUrlRows, icon, iconUrl_1, res, blob_1, e_4, e_5, iconScale, disableDepthTest, bColor, cColor, heightRef, radius, bFill, cFill, outline, cOutline, outlineWidth, bOutline, heightRef, pos3d, extrusion, outlineExtrusion, bColor, cColor, size, heightRef, circleBillboard;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
@@ -3964,6 +3991,8 @@ var EntityRenderEngine;
                                 }
                                 disableDepthTest = Boolean(style.renderOnTop);
                                 if (iconScale > 0) {
+                                    bColor = style.iconTintColor ? Calculator.GetColor(style.iconTintColor, entity, params.tags) : null;
+                                    cColor = bColor ? colorToCColor(bColor) : undefined;
                                     heightRef = getHeightRef(style);
                                     cEntity = new Entity({
                                         id: ObjectUtils.UId(10),
@@ -3974,7 +4003,8 @@ var EntityRenderEngine;
                                             heightReference: getHeightRef(style),
                                             scale: iconScale,
                                             disableDepthTestDistance: disableDepthTest ? Number.POSITIVE_INFINITY : undefined,
-                                            distanceDisplayCondition: getDisplayCondition(params.minDistance, params.maxDistance)
+                                            distanceDisplayCondition: getDisplayCondition(params.minDistance, params.maxDistance),
+                                            color: cColor
                                             // Would be great once we have a setting for this.
                                             // translucencyByDistance: getTranslucencyByDistance(params.minDistance, params.maxDistance),
                                         },
@@ -20003,7 +20033,7 @@ var CesiumViewMonitor;
     CesiumViewMonitor$$1.Monitor = Monitor;
 })(CesiumViewMonitor || (CesiumViewMonitor = {}));
 
-var VERSION$1 = "3.2.9";
+var VERSION$1 = "3.3.1";
 
 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, EntityLabel, ViewRenderEngine, TileRenderEngine, TilesetRenderEngine, CESIUM_INSPECTOR_KEY, ViewUtils, DrawingUtils, MeasureUtils, EntityUtils, Draw3dPolygon, Draw3dPolyline };
 //# sourceMappingURL=bruce-cesium.es5.js.map