bruce-cesium 4.3.3 → 4.3.5

package/dist/bruce-cesium.umd.js

@@ -2570,11 +2570,24 @@
                                                 });
                                             }); };
                                             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 = BModels.Entity.GetValue({
+                                                                entity: entity,
+                                                                path: ["Bruce", "AssemblyLocation"]
+                                                            });
+                                                            if (assemblyLocation && typeof assemblyLocation == "object" && BModels.Carto.ValidateCarto(assemblyLocation)) {
+                                                                latitude = EnsureNumber(assemblyLocation.latitude);
+                                                                longitude = EnsureNumber(assemblyLocation.longitude);
+                                                                // Disallowing exact 0.
+                                                                if (latitude || longitude) {
+                                                                    pos3d_3 = Cesium.Cartesian3.fromDegrees(longitude, latitude, EnsureNumber(assemblyLocation.altitude));
+                                                                    posses.push(pos3d_3);
+                                                                }
+                                                            }
                                                             location = BModels.Entity.GetValue({
                                                                 entity: entity,
                                                                 path: ["Bruce", "Location"]
@@ -2584,8 +2597,8 @@
                                                                 longitude = EnsureNumber(location.longitude);
                                                                 // Disallowing exact 0.
                                                                 if (latitude || longitude) {
-                                                                    pos3d_3 = Cesium.Cartesian3.fromDegrees(longitude, latitude, EnsureNumber(location.altitude));
-                                                                    posses.push(pos3d_3);
+                                                                    pos3d_4 = Cesium.Cartesian3.fromDegrees(longitude, latitude, EnsureNumber(location.altitude));
+                                                                    posses.push(pos3d_4);
                                                                 }
                                                             }
                                                             geometry = BModels.Entity.GetValue({
@@ -2600,8 +2613,8 @@
                                                                 points = BModels.Geometry.ParsePoints(pointStr);
                                                                 point = points.length > 0 ? points[0] : null;
                                                                 if (point && BModels.Carto.ValidateCarto(point)) {
-                                                                    pos3d_4 = Cesium.Cartesian3.fromDegrees(EnsureNumber(point.longitude), EnsureNumber(point.latitude), EnsureNumber(point.altitude));
-                                                                    posses.push(pos3d_4);
+                                                                    pos3d_5 = Cesium.Cartesian3.fromDegrees(EnsureNumber(point.longitude), EnsureNumber(point.latitude), EnsureNumber(point.altitude));
+                                                                    posses.push(pos3d_5);
                                                                 }
                                                             }
                                                             lineStr = geometry.LineString;
@@ -2947,9 +2960,9 @@
                 if ((rego === null || rego === void 0 ? void 0 : rego.visual) instanceof Cesium.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 = Cesium.HeightReference.RELATIVE_TO_GROUND;
                             if (visual.model) {
                                 visualHeightRef = GetValue(viewer, visual.model.heightReference);
@@ -2976,7 +2989,7 @@
                             return exports.DrawingUtils.EnsurePosHeight({
                                 desiredHeightRef: params.returnHeightRef,
                                 heightRef: visualHeightRef,
-                                pos3d: pos3d_5,
+                                pos3d: pos3d_6,
                                 viewer: viewer
                             });
                         }
@@ -2985,6 +2998,19 @@
                 return null;
             }
             function evaluateRecord() {
+                // Checking for a pre-calculated lat/lon for assembly entities.
+                var assemblyLocation = BModels.Entity.GetValue({
+                    entity: entity,
+                    path: ["Bruce", "AssemblyLocation"]
+                });
+                if (assemblyLocation && typeof assemblyLocation == "object" && BModels.Carto.ValidateCarto(assemblyLocation)) {
+                    var latitude = EnsureNumber(assemblyLocation.latitude);
+                    var longitude = EnsureNumber(assemblyLocation.longitude);
+                    // Disallowing exact 0.
+                    if (latitude || longitude) {
+                        return Cesium.Cartesian3.fromDegrees(longitude, latitude, EnsureNumber(assemblyLocation.altitude));
+                    }
+                }
                 var location = BModels.Entity.GetValue({
                     entity: entity,
                     path: ["Bruce", "Location"]
@@ -8742,14 +8768,28 @@
                                         // We get the pos3d and add 'n' to it, then turn it back into 2d.
                                         var lineEndPos3d = _this._pos3d.clone();
                                         var lineEndPoint = Cesium.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 = Cesium.Cartographic.toCartesian(lineEndPoint);
@@ -26426,7 +26466,7 @@
         ViewerUtils.AssertIonToken = AssertIonToken;
     })(exports.ViewerUtils || (exports.ViewerUtils = {}));
 
-    var VERSION = "4.3.3";
+    var VERSION = "4.3.5";
 
     exports.VERSION = VERSION;
     exports.CesiumParabola = CesiumParabola;