bruce-cesium 4.7.4 → 4.7.6

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
-import { BruceEvent, Cartes, Entity as Entity$1, Carto, Geometry, MathUtils, LRUCache, Api, Calculator, ClientFile, EntityTag, EntityType, ObjectUtils, Style, ProjectViewTile, DelayQueue, EntityLod, Bounds, ZoomControl, EntityRelationType, ENVIRONMENT, EntityHistoricData, Tileset, EntityCoords, DataLab, EntitySource, MenuItem, EntityRelation, ProgramKey, ProjectView, ProjectViewBookmark, Camera, ProjectViewLegacyTile, EntityAttribute, EntityAttachment, EntityAttachmentType, Session, AbstractApi } from 'bruce-models';
+import { BruceEvent, Cartes, Entity as Entity$1, Carto, Geometry, MathUtils, LRUCache, Api, Calculator, ClientFile, EntityTag, EntityType, ObjectUtils, Style, ProjectViewTile, DelayQueue, EntityLod, Bounds, ZoomControl, EntityRelationType, ENVIRONMENT, EntityHistoricData, Tileset, EntityCoords, DataLab, EntitySource, MenuItem, EntityRelation, ProgramKey, ProjectView, ProjectViewBookmark, Camera, ProjectViewLegacyTile, AbstractApi, EntityAttribute, EntityAttachment, EntityAttachmentType, Session } from 'bruce-models';
 import * as Cesium from 'cesium';
-import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, Entity, DistanceDisplayCondition, HorizontalOrigin, VerticalOrigin, ConstantProperty, ConstantPositionProperty, ClassificationType, ArcType, CornerType, ShadowMode, ColorBlendMode, HeadingPitchRoll, Transforms, Model, SceneMode, Primitive, Cesium3DTileFeature, GeoJsonDataSource, ColorMaterialProperty, Cesium3DTileColorBlendMode, HeadingPitchRange, Cesium3DTileStyle, Ion, KmlDataSource, PolygonHierarchy, PolylineGraphics, SceneTransforms, OrthographicFrustum, EasingFunction, NearFarScalar, EllipsoidTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, CesiumInspector, defined, ClockRange, Cesium3DTileset, Matrix4, Matrix3, IonResource, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, Quaternion, BoundingSphere, GeometryInstance, ScreenSpaceEventHandler, ScreenSpaceEventType, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, CzmlDataSource, Intersect, Fullscreen } from 'cesium';
+import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, Entity, DistanceDisplayCondition, HorizontalOrigin, VerticalOrigin, ConstantProperty, ClassificationType, ConstantPositionProperty, ArcType, CornerType, ShadowMode, ColorBlendMode, HeadingPitchRoll, Transforms, Model, PolygonHierarchy, PolylineGraphics, ColorMaterialProperty, Primitive, Cesium3DTileFeature, SceneMode, GeoJsonDataSource, Cesium3DTileColorBlendMode, HeadingPitchRange, Cesium3DTileStyle, Ion, KmlDataSource, SceneTransforms, OrthographicFrustum, EasingFunction, NearFarScalar, Cesium3DTileset, Matrix4, Matrix3, IonResource, EllipsoidGeodesic, EllipsoidTerrainProvider, sampleTerrainMostDetailed, defined, CesiumInspector, ClockRange, PolygonPipeline, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, BoundingSphere, GeometryInstance, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, Quaternion, ScreenSpaceEventHandler, ScreenSpaceEventType, CzmlDataSource, Intersect, Fullscreen } from 'cesium';
 
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4229,7 +4229,7 @@ var EntityRenderEnginePoint;
     function Render(params) {
         var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function () {
-            var entity, style, type, cEntity, siblings, heightRef, animatePosition, shouldShowTrack, prepareExistingGraphic, updateShouldShowTrack, iconUrlRows, icon, iconUrl, metadata, api, image, e_1, iconScale, disableDepthTest, bColor, cColor, animateColorIn_1, position, series, currentImgKey, series, pos3d, prevPos3d, radius, bFill, cFill, outline, cOutline, outlineWidth, bOutline, pos3d, extrusion, hasOutline, outlineExtrusion, outlineEntity, bColor, cColor, size, circleBillboard, disableDepthTest, animateColorIn_2, position, series, imgKey, currentImgKey, series, pos3d, prevPos3d, lStyle, bColor, cColor, width, lHeightRef, trackEntity;
+            var entity, style, type, cEntity, siblings, heightRef, animatePosition, shouldShowTrack, prepareExistingGraphic, updateShouldShowTrack, iconUrlRows, icon, iconUrl, metadata, api, image, e_1, iconScale, disableDepthTest, bColor, cColor, animateColorIn_1, position, series, currentImgKey, series, pos3d, prevPos3d, radius, bFill, cFill, outline, cOutline, outlineWidth, bOutline, pos3d, extrusion, hasOutline, outlineExtrusion, classification, height, curRadius, curHeightRef, curHeight, curExtHeightRef, curExtHeight, curClassification, outlineHeight, outlineEntity, curRadius, curHeightRef, curHeight, curExtHeightRef, curExtHeight, curClassification, bColor, cColor, size, circleBillboard, disableDepthTest, animateColorIn_2, position, series, imgKey, currentImgKey, series, pos3d, prevPos3d, lStyle, bColor, cColor, width, lHeightRef, trackEntity;
             return __generator(this, function (_e) {
                 switch (_e.label) {
                     case 0:
@@ -4433,6 +4433,9 @@ var EntityRenderEnginePoint;
                                     cEntity.billboard.heightReference = new ConstantProperty(getHeightRef(style));
                                     cEntity.billboard.disableDepthTestDistance = new ConstantProperty(disableDepthTest ? Number.POSITIVE_INFINITY : undefined);
                                     cEntity.billboard.distanceDisplayCondition = new ConstantProperty(EntityRenderEngine.GetDisplayCondition(params.minDistance, params.maxDistance));
+                                    // Unset width/height.
+                                    cEntity.billboard.width = undefined;
+                                    cEntity.billboard.height = undefined;
                                     series = CesiumAnimatedProperty.GetSeriesPossesForHistoricEntity(params.viewer, heightRef, params.entityHistoric);
                                     if (series.length > 1) {
                                         animatePosition = new CesiumAnimatedProperty.AnimatePositionSeries({
@@ -4501,6 +4504,27 @@ var EntityRenderEnginePoint;
                             });
                             extrusion = getCylinderExtrusion(entity, params.tags, heightRef, style.CylinderFillExtrusion);
                             hasOutline = outline && outlineWidth > 0;
+                            outlineExtrusion = hasOutline ? getCylinderExtrusion(entity, params.tags, heightRef, style.CylinderBorderExtrusion) : null;
+                            // If this doesn't have its own extrusion, we must make it match the sibling.
+                            // This way they render in a uniform way.
+                            if (hasOutline) {
+                                if (outlineExtrusion.value == undefined && extrusion.value != undefined) {
+                                    outlineExtrusion.exHeightRef = extrusion.exHeightRef;
+                                    outlineExtrusion.value = 0;
+                                }
+                                else if (outlineExtrusion.value != undefined && extrusion.value == undefined) {
+                                    extrusion.exHeightRef = outlineExtrusion.exHeightRef;
+                                    extrusion.value = 0;
+                                }
+                            }
+                            classification = ClassificationType.TERRAIN;
+                            if (style["drapeOver"] == "ALL") {
+                                classification = ClassificationType.BOTH;
+                            }
+                            height = undefined;
+                            if (heightRef != HeightReference.CLAMP_TO_GROUND && extrusion.value != undefined) {
+                                height = Cartographic.fromCartesian(pos3d).height;
+                            }
                             if (!params.rendered || !params.rendered.ellipse) {
                                 cEntity = new Entity({
                                     id: ObjectUtils.UId(10),
@@ -4512,8 +4536,9 @@ var EntityRenderEnginePoint;
                                         extrudedHeight: extrusion.value,
                                         heightReference: heightRef,
                                         extrudedHeightReference: extrusion.exHeightRef,
-                                        height: Cartographic.fromCartesian(pos3d).height,
+                                        height: height,
                                         zIndex: 1,
+                                        classificationType: classification,
                                         distanceDisplayCondition: EntityRenderEngine.GetDisplayCondition(params.minDistance, params.maxDistance)
                                     },
                                     position: pos3d === null || pos3d === void 0 ? void 0 : pos3d.clone(),
@@ -4523,15 +4548,38 @@ var EntityRenderEnginePoint;
                             else {
                                 prepareExistingGraphic(params.rendered, hasOutline ? 1 : 0);
                                 cEntity = params.rendered;
-                                cEntity.ellipse.semiMajorAxis = new ConstantProperty(radius);
-                                cEntity.ellipse.semiMinorAxis = new ConstantProperty(radius);
+                                curRadius = GetCValue(params.viewer, cEntity.ellipse.semiMajorAxis);
+                                if (curRadius != radius) {
+                                    cEntity.ellipse.semiMajorAxis = new ConstantProperty(radius);
+                                    cEntity.ellipse.semiMinorAxis = new ConstantProperty(radius);
+                                }
                                 cEntity.ellipse.outlineWidth = undefined;
-                                cEntity.ellipse.extrudedHeight = new ConstantProperty(extrusion.value);
-                                cEntity.ellipse.heightReference = new ConstantProperty(heightRef);
-                                cEntity.ellipse.extrudedHeightReference = new ConstantProperty(extrusion.exHeightRef);
-                                cEntity.ellipse.height = new ConstantProperty(Cartographic.fromCartesian(pos3d).height);
+                                {
+                                    curHeightRef = GetCValue(params.viewer, cEntity.ellipse.heightReference);
+                                    if (curHeightRef != heightRef) {
+                                        cEntity.ellipse.heightReference = new ConstantProperty(heightRef);
+                                    }
+                                    curHeight = GetCValue(params.viewer, cEntity.ellipse.height);
+                                    if (curHeight != height) {
+                                        cEntity.ellipse.height = new ConstantProperty(height);
+                                    }
+                                }
+                                {
+                                    curExtHeightRef = GetCValue(params.viewer, cEntity.ellipse.extrudedHeightReference);
+                                    if (curExtHeightRef != extrusion.exHeightRef) {
+                                        cEntity.ellipse.extrudedHeightReference = new ConstantProperty(extrusion.exHeightRef);
+                                    }
+                                    curExtHeight = GetCValue(params.viewer, cEntity.ellipse.extrudedHeight);
+                                    if (curExtHeight != extrusion.value) {
+                                        cEntity.ellipse.extrudedHeight = new ConstantProperty(extrusion.value);
+                                    }
+                                }
                                 cEntity.ellipse.zIndex = new ConstantProperty(1);
                                 cEntity.ellipse.distanceDisplayCondition = new ConstantProperty(EntityRenderEngine.GetDisplayCondition(params.minDistance, params.maxDistance));
+                                curClassification = GetCValue(params.viewer, cEntity.ellipse.classificationType);
+                                if (curClassification != classification) {
+                                    cEntity.ellipse.classificationType = new ConstantProperty(classification);
+                                }
                                 cEntity.position = new ConstantPositionProperty(pos3d === null || pos3d === void 0 ? void 0 : pos3d.clone());
                                 // We'll use "SetDefaultColor" to updating the internal reference and to allow for an animation.
                                 // WARNING: ellipse does not support animation (yet?).
@@ -4545,22 +4593,43 @@ var EntityRenderEnginePoint;
                                 cEntity.show = true;
                             }
                             if (hasOutline) {
-                                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;
+                                outlineHeight = undefined;
+                                if (outlineExtrusion.exHeightRef != HeightReference.CLAMP_TO_GROUND && outlineExtrusion.value != undefined) {
+                                    outlineHeight = Cartographic.fromCartesian(pos3d).height;
                                 }
                                 outlineEntity = siblings === null || siblings === void 0 ? void 0 : siblings[0];
                                 if (outlineEntity && outlineEntity.ellipse) {
-                                    outlineEntity.ellipse.semiMajorAxis = new ConstantProperty(radius + outlineWidth);
-                                    outlineEntity.ellipse.semiMinorAxis = new ConstantProperty(radius + outlineWidth);
-                                    outlineEntity.ellipse.extrudedHeight = new ConstantProperty(outlineExtrusion.value);
-                                    outlineEntity.ellipse.heightReference = new ConstantProperty(heightRef);
-                                    outlineEntity.ellipse.extrudedHeightReference = new ConstantProperty(outlineExtrusion.exHeightRef);
-                                    outlineEntity.ellipse.height = new ConstantProperty(Cartographic.fromCartesian(pos3d).height);
+                                    curRadius = GetCValue(params.viewer, outlineEntity.ellipse.semiMajorAxis);
+                                    if (curRadius != radius + outlineWidth) {
+                                        outlineEntity.ellipse.semiMajorAxis = new ConstantProperty(radius + outlineWidth);
+                                        outlineEntity.ellipse.semiMinorAxis = new ConstantProperty(radius + outlineWidth);
+                                    }
+                                    {
+                                        curHeightRef = GetCValue(params.viewer, outlineEntity.ellipse.heightReference);
+                                        if (curHeightRef != heightRef) {
+                                            outlineEntity.ellipse.heightReference = new ConstantProperty(heightRef);
+                                        }
+                                        curHeight = GetCValue(params.viewer, outlineEntity.ellipse.height);
+                                        if (curHeight != outlineHeight) {
+                                            outlineEntity.ellipse.height = new ConstantProperty(outlineHeight);
+                                        }
+                                    }
+                                    {
+                                        curExtHeightRef = GetCValue(params.viewer, outlineEntity.ellipse.extrudedHeightReference);
+                                        if (curExtHeightRef != outlineExtrusion.exHeightRef) {
+                                            outlineEntity.ellipse.extrudedHeightReference = new ConstantProperty(outlineExtrusion.exHeightRef);
+                                        }
+                                        curExtHeight = GetCValue(params.viewer, outlineEntity.ellipse.extrudedHeight);
+                                        if (curExtHeight != outlineExtrusion.value) {
+                                            outlineEntity.ellipse.extrudedHeight = new ConstantProperty(outlineExtrusion.value);
+                                        }
+                                    }
                                     outlineEntity.ellipse.zIndex = new ConstantProperty(2);
                                     outlineEntity.ellipse.distanceDisplayCondition = new ConstantProperty(EntityRenderEngine.GetDisplayCondition(params.minDistance, params.maxDistance));
+                                    curClassification = GetCValue(params.viewer, outlineEntity.ellipse.classificationType);
+                                    if (curClassification != classification) {
+                                        outlineEntity.ellipse.classificationType = new ConstantProperty(classification);
+                                    }
                                     // We'll use "SetDefaultColor" to updating the internal reference and to allow for an animation.
                                     // WARNING: ellipse does not support animation (yet?).
                                     CesiumEntityStyler.SetDefaultColor({
@@ -4583,8 +4652,9 @@ var EntityRenderEnginePoint;
                                             extrudedHeight: outlineExtrusion.value,
                                             heightReference: heightRef,
                                             extrudedHeightReference: outlineExtrusion.exHeightRef,
-                                            height: Cartographic.fromCartesian(pos3d).height,
+                                            height: outlineHeight,
                                             zIndex: 2,
+                                            classificationType: classification,
                                             distanceDisplayCondition: EntityRenderEngine.GetDisplayCondition(params.minDistance, params.maxDistance)
                                         },
                                         position: pos3d === null || pos3d === void 0 ? void 0 : pos3d.clone()
@@ -28466,7 +28536,7 @@ var WidgetViewBar = /** @class */ (function (_super) {
     return WidgetViewBar;
 }(Widget.AWidget));
 
-var VERSION = "4.7.4";
+var VERSION = "4.7.6";
 
 export { VERSION, CesiumViewMonitor, ViewerUtils, ViewerEventTracker, MenuItemManager, EntityRenderEngine, EntityRenderEnginePoint, EntityRenderEnginePolyline, EntityRenderEnginePolygon, EntityRenderEngineModel3d, MenuItemCreator, VisualsRegister, RenderManager, EntitiesIdsRenderManager, DataLabRenderManager, EntitiesLoadedRenderManager, EntitiesRenderManager, EntityRenderManager, TilesetCadRenderManager, TilesetArbRenderManager, TilesetEntitiesRenderManager, TilesetOsmRenderManager, TilesetPointcloudRenderManager, TilesetGooglePhotosRenderManager, DataSourceStaticKmlManager, GoogleSearchRenderManager, RelationsRenderManager, SharedGetters, CesiumParabola, EntityLabel, ViewRenderEngine, TileRenderEngine, TilesetRenderEngine, CESIUM_INSPECTOR_KEY, CESIUM_TIMELINE_KEY, ViewUtils, DrawingUtils, MeasureUtils, EntityUtils, CesiumEntityStyler, CesiumAnimatedProperty, CesiumAnimatedInOut, Draw3dPolygon, Draw3dPolyline, MeasureCreator, Widget, VIEWER_BOOKMARKS_WIDGET_KEY, WidgetBookmarks, WidgetBranding, WidgetCursorBar, WidgetEmbeddedInfoView, WidgetInfoView, WidgetNavCompass$$1 as WidgetNavCompass, VIEWER_VIEW_BAR_WIDGET_KEY, WidgetViewBar, WidgetControlViewBar, WidgetControlViewBarSearch, VIEWER_LEFT_PANEL_WIDGET_KEY, VIEWER_LEFT_PANEL_CSS_VAR_LEFT, WidgetLeftPanel, WidgetLeftPanelTab, WidgetLeftPanelTabBookmarks };
 //# sourceMappingURL=bruce-cesium.es5.js.map