bruce-cesium 6.1.5 → 6.1.7

package/dist/bruce-cesium.umd.js

@@ -7154,7 +7154,7 @@
          * @returns
          */
         function Render(params) {
-            var _a, _b, _c, _d, _e, _f;
+            var _a, _b, _c, _d;
             const entity = params.entity;
             if (!params.entityHistoric) {
                 params.entityHistoric = [];
@@ -7346,6 +7346,8 @@
                 cEntity.model.colorBlendAmount = new Cesium.ConstantProperty(blendAmount);
                 cEntity.model.colorBlendMode = new Cesium.ConstantProperty(blendMode);
                 cEntity.model.distanceDisplayCondition = new Cesium.ConstantProperty(exports.EntityRenderEngine.GetDisplayCondition(params.minDistance, params.maxDistance));
+                const dateTimeStr = (_b = (_a = entity.Bruce.Outline) === null || _a === void 0 ? void 0 : _a.find(x => !!x.DateTime)) === null || _b === void 0 ? void 0 : _b.DateTime;
+                const dateTime = dateTimeStr ? new Date(dateTimeStr) : null;
                 if (cEntity.position && cEntity.position["CesiumAnimatedProperty.AnimatePositionSeries"]) {
                     animatePosition = cEntity.position["CesiumAnimatedProperty.AnimatePositionSeries"];
                     const animateSeries = animatePosition;
@@ -7353,8 +7355,6 @@
                     if (series.length) {
                         animateSeries.SupplementSeries(series);
                     }
-                    const dateTimeStr = (_b = (_a = entity.Bruce.Outline) === null || _a === void 0 ? void 0 : _a.find(x => !!x.DateTime)) === null || _b === void 0 ? void 0 : _b.DateTime;
-                    const dateTime = dateTimeStr ? new Date(dateTimeStr) : null;
                     if (dateTime) {
                         animateSeries.UpdatePositionForDateTime(pos3d, dateTime, !EnsureNumber(transform === null || transform === void 0 ? void 0 : transform.heading) ? null : heading);
                     }
@@ -7377,8 +7377,6 @@
                         cEntity.position["CesiumAnimatedProperty.AnimatePositionSeries"] = animatePosition;
                     }
                     else {
-                        const dateTimeStr = (_d = (_c = entity.Bruce.Outline) === null || _c === void 0 ? void 0 : _c.find(x => !!x.DateTime)) === null || _d === void 0 ? void 0 : _d.DateTime;
-                        const dateTime = dateTimeStr ? new Date(dateTimeStr) : null;
                         const posChanged = !prevPos3d || !Cesium.Cartesian3.equals(prevPos3d, pos3d);
                         if (posChanged) {
                             let posses = [];
@@ -7408,7 +7406,7 @@
                     }
                 }
                 // If we're animating position then we can animate orientation too based on the interpolated position.
-                if (animatePosition && animatePosition instanceof exports.CesiumAnimatedProperty.AnimatePositionSeries && animatePosition.GetOrient) {
+                if (dateTime && animatePosition && animatePosition instanceof exports.CesiumAnimatedProperty.AnimatePositionSeries && animatePosition.GetOrient) {
                     cEntity.orientation = new Cesium.CallbackProperty(() => {
                         return animatePosition.GetOrient();
                     }, false);
@@ -7553,7 +7551,7 @@
             // Generate a polyline 'track' for the historic data.
             // We do this for historic data that exists and is moving.
             if (shouldShowTrack && animatePosition && animatePosition instanceof exports.CesiumAnimatedProperty.AnimatePositionSeries && animatePosition.GetSeries) {
-                const lStyle = (_f = (_e = params.fullStyle) === null || _e === void 0 ? void 0 : _e.polylineStyle) !== null && _f !== void 0 ? _f : {};
+                const lStyle = (_d = (_c = params.fullStyle) === null || _c === void 0 ? void 0 : _c.polylineStyle) !== null && _d !== void 0 ? _d : {};
                 const bColor = lStyle.lineColor ? BModels.Calculator.GetColor(lStyle.lineColor, entity, params.tags) : null;
                 const cColor = bColor ? ColorToCColor(bColor) : Cesium.Color.fromCssColorString("rgba(255, 193, 7, 0.8)");
                 let width = lStyle.lineWidth ? EnsureNumber(BModels.Calculator.GetNumber(lStyle.lineWidth, entity, params.tags)) : 2;
@@ -16837,11 +16835,12 @@
         }
         TilesetRenderEngine.OnTilesetReady = OnTilesetReady;
         function ApplyPosition(params) {
-            var _a;
+            var _a, _b;
             const cTileset = params.cTileset;
             const root = cTileset.root;
             const position = params.position;
-            let location = ((_a = position.ucs) === null || _a === void 0 ? void 0 : _a.location) ? position.ucs.location : position.location;
+            const ucsTransform = ((_a = position.ucs) === null || _a === void 0 ? void 0 : _a.transform) || {};
+            let location = ((_b = position.ucs) === null || _b === void 0 ? void 0 : _b.location) ? position.ucs.location : position.location;
             let transform = position.transform;
             transform = {
                 heading: 0,
@@ -16854,24 +16853,33 @@
                 ...transform
             };
             transform.scale = EnsureNumber(transform.scale);
-            if (transform.scale <= 0) {
-                transform.scale = 0.000001;
-            }
-            // If we're in model-space we'll just go at 0,0 lat/lon and no h/p/r from the coords.
+            // In model-space we focus on the UCS.
+            // There's no location as we center the view around it.
+            // TODO: although we should render the model relative to the UCS.
             if (params.modelSpace) {
                 location = null;
                 transform = {
-                    heading: 0,
-                    pitch: 0,
-                    roll: 0,
-                    scale: EnsureNumber(transform.scale, 1),
-                    x: 0,
-                    y: 0,
-                    z: 0
+                    heading: EnsureNumber(ucsTransform.heading, 0),
+                    pitch: EnsureNumber(ucsTransform.pitch, 0),
+                    roll: EnsureNumber(ucsTransform.roll, 0),
+                    scale: EnsureNumber(ucsTransform.scale, 1),
+                    x: EnsureNumber(ucsTransform.x, 0),
+                    y: EnsureNumber(ucsTransform.y, 0),
+                    z: EnsureNumber(ucsTransform.z, 0)
                 };
-                if (transform.scale <= 0) {
-                    transform.scale = 0.000001;
-                }
+            }
+            // If not in model-space then scale/add UCS transform to the entity transform.
+            else {
+                transform.scale *= EnsureNumber(ucsTransform.scale, 1);
+                transform.heading += EnsureNumber(ucsTransform.heading, 0);
+                transform.pitch += EnsureNumber(ucsTransform.pitch, 0);
+                transform.roll += EnsureNumber(ucsTransform.roll, 0);
+                transform.x += EnsureNumber(ucsTransform.x, 0);
+                transform.y += EnsureNumber(ucsTransform.y, 0);
+                transform.z += EnsureNumber(ucsTransform.z, 0);
+            }
+            if (transform.scale <= 0) {
+                transform.scale = 0.000001;
             }
             /**
              * Very cursed.
@@ -33654,7 +33662,7 @@
         }
     }
 
-    const VERSION = "6.1.5";
+    const VERSION = "6.1.7";
 
     exports.VERSION = VERSION;
     exports.isOutlineChanged = isOutlineChanged;