bruce-cesium 4.3.3 → 4.3.5

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
 import { BruceEvent, Cartes, Carto, Entity as Entity$1, Geometry, Tileset, MathUtils, LRUCache, ProjectViewTile, DelayQueue, ZoomControl, Style, EntityTag, Calculator, EntityLod, EntityType, ClientFile, ObjectUtils, Bounds, Api, EntityRelationType, ENVIRONMENT, EntityHistoricData, EntityCoords, EntitySource, MenuItem, EntityRelation, ProgramKey, ProjectView, ProjectViewBookmark, Camera, ProjectViewLegacyTile, EntityAttribute, EntityAttachment, EntityAttachmentType, AbstractApi, Session } from 'bruce-models';
 import * as Cesium from 'cesium';
-import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, DistanceDisplayCondition, NearFarScalar, Model, ColorMaterialProperty, Entity, HorizontalOrigin, VerticalOrigin, ConstantProperty, ConstantPositionProperty, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, ColorBlendMode, HeadingPitchRoll, Transforms, Primitive, Cesium3DTileFeature, SceneMode, GeoJsonDataSource, Cesium3DTileColorBlendMode, HeadingPitchRange, Ion, Cesium3DTileStyle, KmlDataSource, SceneTransforms, OrthographicFrustum, EasingFunction, EllipsoidTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, Cesium3DTileset, Matrix4, Matrix3, IonResource, CesiumInspector, defined, ClockRange, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, BoundingSphere, GeometryInstance, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, ScreenSpaceEventHandler, ScreenSpaceEventType, CzmlDataSource, Quaternion, Intersect } from 'cesium';
+import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, DistanceDisplayCondition, NearFarScalar, Model, ColorMaterialProperty, Entity, HorizontalOrigin, VerticalOrigin, ConstantProperty, ConstantPositionProperty, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, ColorBlendMode, HeadingPitchRoll, Transforms, Primitive, Cesium3DTileFeature, SceneMode, GeoJsonDataSource, Cesium3DTileColorBlendMode, HeadingPitchRange, Ion, Cesium3DTileStyle, KmlDataSource, SceneTransforms, OrthographicFrustum, EasingFunction, EllipsoidTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, Cesium3DTileset, Matrix4, Matrix3, IonResource, CesiumInspector, defined, ClockRange, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, BoundingSphere, GeometryInstance, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, ScreenSpaceEventHandler, ScreenSpaceEventType, Intersect, CzmlDataSource, Quaternion } from 'cesium';
 
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2578,11 +2578,24 @@ var EntityUtils;
                                             });
                                         }); };
                                         evaluateRecord = function () { return __awaiter(_this, void 0, void 0, function () {
-                                            var posses, location, latitude, longitude, pos3d_3, geometry, pointStr, points, point, pos3d_4, lineStr, points, pPosses, pRings, boundary, points, pPosses, boundaries, point, bPosses;
+                                            var posses, assemblyLocation, latitude, longitude, pos3d_3, location, latitude, longitude, pos3d_4, geometry, pointStr, points, point, pos3d_5, lineStr, points, pPosses, pRings, boundary, points, pPosses, boundaries, point, bPosses;
                                             return __generator(this, function (_a) {
                                                 switch (_a.label) {
                                                     case 0:
                                                         posses = [];
+                                                        assemblyLocation = Entity$1.GetValue({
+                                                            entity: entity,
+                                                            path: ["Bruce", "AssemblyLocation"]
+                                                        });
+                                                        if (assemblyLocation && typeof assemblyLocation == "object" && Carto.ValidateCarto(assemblyLocation)) {
+                                                            latitude = EnsureNumber(assemblyLocation.latitude);
+                                                            longitude = EnsureNumber(assemblyLocation.longitude);
+                                                            // Disallowing exact 0.
+                                                            if (latitude || longitude) {
+                                                                pos3d_3 = Cartesian3.fromDegrees(longitude, latitude, EnsureNumber(assemblyLocation.altitude));
+                                                                posses.push(pos3d_3);
+                                                            }
+                                                        }
                                                         location = Entity$1.GetValue({
                                                             entity: entity,
                                                             path: ["Bruce", "Location"]
@@ -2592,8 +2605,8 @@ var EntityUtils;
                                                             longitude = EnsureNumber(location.longitude);
                                                             // Disallowing exact 0.
                                                             if (latitude || longitude) {
-                                                                pos3d_3 = Cartesian3.fromDegrees(longitude, latitude, EnsureNumber(location.altitude));
-                                                                posses.push(pos3d_3);
+                                                                pos3d_4 = Cartesian3.fromDegrees(longitude, latitude, EnsureNumber(location.altitude));
+                                                                posses.push(pos3d_4);
                                                             }
                                                         }
                                                         geometry = Entity$1.GetValue({
@@ -2608,8 +2621,8 @@ var EntityUtils;
                                                             points = Geometry.ParsePoints(pointStr);
                                                             point = points.length > 0 ? points[0] : null;
                                                             if (point && Carto.ValidateCarto(point)) {
-                                                                pos3d_4 = Cartesian3.fromDegrees(EnsureNumber(point.longitude), EnsureNumber(point.latitude), EnsureNumber(point.altitude));
-                                                                posses.push(pos3d_4);
+                                                                pos3d_5 = Cartesian3.fromDegrees(EnsureNumber(point.longitude), EnsureNumber(point.latitude), EnsureNumber(point.altitude));
+                                                                posses.push(pos3d_5);
                                                             }
                                                         }
                                                         lineStr = geometry.LineString;
@@ -2955,9 +2968,9 @@ var EntityUtils;
             if ((rego === null || rego === void 0 ? void 0 : rego.visual) instanceof Entity) {
                 var visual = rego.visual;
                 if (visual.position) {
-                    var pos3d_5 = GetValue(viewer, visual.position);
+                    var pos3d_6 = GetValue(viewer, visual.position);
                     // Fix height reference.
-                    if (pos3d_5 === null || pos3d_5 === void 0 ? void 0 : pos3d_5.x) {
+                    if (pos3d_6 === null || pos3d_6 === void 0 ? void 0 : pos3d_6.x) {
                         var visualHeightRef = HeightReference.RELATIVE_TO_GROUND;
                         if (visual.model) {
                             visualHeightRef = GetValue(viewer, visual.model.heightReference);
@@ -2984,7 +2997,7 @@ var EntityUtils;
                         return DrawingUtils.EnsurePosHeight({
                             desiredHeightRef: params.returnHeightRef,
                             heightRef: visualHeightRef,
-                            pos3d: pos3d_5,
+                            pos3d: pos3d_6,
                             viewer: viewer
                         });
                     }
@@ -2993,6 +3006,19 @@ var EntityUtils;
             return null;
         }
         function evaluateRecord() {
+            // Checking for a pre-calculated lat/lon for assembly entities.
+            var assemblyLocation = Entity$1.GetValue({
+                entity: entity,
+                path: ["Bruce", "AssemblyLocation"]
+            });
+            if (assemblyLocation && typeof assemblyLocation == "object" && Carto.ValidateCarto(assemblyLocation)) {
+                var latitude = EnsureNumber(assemblyLocation.latitude);
+                var longitude = EnsureNumber(assemblyLocation.longitude);
+                // Disallowing exact 0.
+                if (latitude || longitude) {
+                    return Cartesian3.fromDegrees(longitude, latitude, EnsureNumber(assemblyLocation.altitude));
+                }
+            }
             var location = Entity$1.GetValue({
                 entity: entity,
                 path: ["Bruce", "Location"]
@@ -8757,14 +8783,28 @@ var EntityLabel;
                                     // We get the pos3d and add 'n' to it, then turn it back into 2d.
                                     var lineEndPos3d = _this._pos3d.clone();
                                     var lineEndPoint = Cartographic.fromCartesian(lineEndPos3d);
-                                    // If known then calculate based on size.
-                                    // If we're close then we'll favour the distance over the size.
-                                    var addHeight = sizeInM > 0 ? Math.max(5, Math.min(distance / 5, sizeInM * 1.2)) : null;
-                                    // If unknown then calculate based on camera height or distance.
-                                    // Radius is unknown for Tileset things. We could bake the radius in possibly as a feature property.
-                                    // We have to make it work for both labels against tall skyscrapers, and up-close assembly models.
-                                    if (addHeight == null) {
-                                        addHeight = Math.max(5, Math.min(distance, _this.viewer.camera.positionCartographic.height) / 5);
+                                    var addHeight = null;
+                                    // If we're pre-positioned that means the user is hovering over the entity.
+                                    // We will keep the height low to avoid looking goofy.
+                                    if (_this.prePositioned) {
+                                        addHeight = distance / 12;
+                                    }
+                                    else {
+                                        // If known then calculate based on size.
+                                        // If we're close then we'll favour the distance over the size.
+                                        if (sizeInM && sizeInM > 0) {
+                                            addHeight = Math.min(distance / 5, sizeInM * 1.2);
+                                        }
+                                        // If unknown then calculate based on camera height or distance.
+                                        // Radius is unknown for Tileset things. We could bake the radius in possibly as a feature property.
+                                        // We have to make it work for both labels against tall skyscrapers, and up-close assembly models.
+                                        else {
+                                            addHeight = Math.min(distance, _this.viewer.camera.positionCartographic.height) / 7;
+                                        }
+                                    }
+                                    // Safety check.
+                                    if (!addHeight || addHeight <= 0) {
+                                        addHeight = 0.001;
                                     }
                                     lineEndPoint.height += addHeight;
                                     lineEndPos3d = Cartographic.toCartesian(lineEndPoint);
@@ -26503,7 +26543,7 @@ var ViewerUtils;
     ViewerUtils.AssertIonToken = AssertIonToken;
 })(ViewerUtils || (ViewerUtils = {}));
 
-var VERSION = "4.3.3";
+var VERSION = "4.3.5";
 
 export { VERSION, CesiumViewMonitor, ViewerUtils, MenuItemManager, EntityRenderEngine, MenuItemCreator, VisualsRegister, RenderManager, EntitiesIdsRenderManager, 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, WidgetSearchBar, VIEWER_LEFT_PANEL_WIDGET_KEY, VIEWER_LEFT_PANEL_CSS_VAR_LEFT, WidgetLeftPanel, WidgetLeftPanelTab, WidgetLeftPanelTabBookmarks };
 //# sourceMappingURL=bruce-cesium.es5.js.map