bruce-cesium 3.8.0 → 3.8.2

package/dist/lib/bruce-cesium.js

@@ -47,5 +47,5 @@ __exportStar(require("./utils/entity-utils"), exports);
 __exportStar(require("./utils/cesium-entity-styler"), exports);
 __exportStar(require("./widgets/common/draw-3d-polygon"), exports);
 __exportStar(require("./widgets/common/draw-3d-polyline"), exports);
-exports.VERSION = "3.8.0";
+exports.VERSION = "3.8.2";
 //# sourceMappingURL=bruce-cesium.js.map

package/dist/lib/rendering/cesium-animated-property.js

@@ -33,6 +33,20 @@ function getNumber(viewer, obj) {
     }
     return value;
 }
+function getPosition(viewer, obj) {
+    var value = null;
+    if (obj === null || obj === void 0 ? void 0 : obj.getValue) {
+        var date = viewer.scene.lastRenderTime;
+        if (!date) {
+            date = viewer.clock.currentTime;
+        }
+        value = obj.getValue(date);
+    }
+    else {
+        value = obj;
+    }
+    return value;
+}
 /**
  * Returns if a given visual is alive and in the scene.
  * @param viewer
@@ -87,7 +101,7 @@ var CesiumAnimatedProperty;
         function AnimateColor(params) {
             var _a;
             this.viewer = params.viewer;
-            this.color = params.color;
+            this.targetColor = params.targetColor;
             this.durationMs = params.durationMs;
             this.startColor = getColor(this.viewer, params.startColor);
             if ((_a = this.startColor) === null || _a === void 0 ? void 0 : _a.clone) {
@@ -108,18 +122,18 @@ var CesiumAnimatedProperty;
             var elapsedMs = now.getTime() - this.startTime.getTime();
             // Animation over.
             if (elapsedMs >= this.durationMs) {
-                return this.color;
+                return this.targetColor;
             }
             try {
                 var progress = elapsedMs / this.durationMs;
-                return Cesium.Color.lerp(this.startColor, this.color, progress, new Cesium.Color());
+                return Cesium.Color.lerp(this.startColor, this.targetColor, progress, new Cesium.Color());
             }
             catch (e) {
                 console.error(e);
             }
             // Failed to calculate color.
             // We'll just return the target color.
-            return this.color;
+            return this.targetColor;
         };
         /**
          * Returns the calculated color as a material property.
@@ -137,7 +151,7 @@ var CesiumAnimatedProperty;
             this.paused = false;
             this.paused = Boolean(params.startPaused);
             this.viewer = params.viewer;
-            this.value = params.value;
+            this.targetValue = params.targetValue;
             this.durationMs = params.durationMs;
             this.startValue = getNumber(this.viewer, params.startValue);
             if (!this.startValue) {
@@ -161,18 +175,18 @@ var CesiumAnimatedProperty;
             var elapsedMs = now.getTime() - this.startTime.getTime();
             // Animation over.
             if (elapsedMs >= this.durationMs) {
-                return this.value;
+                return this.targetValue;
             }
             try {
                 var progress = elapsedMs / this.durationMs;
-                return Cesium.Math.lerp(this.startValue, this.value, progress);
+                return Cesium.Math.lerp(this.startValue, this.targetValue, progress);
             }
             catch (e) {
                 console.error(e);
             }
             // Failed to calculate value.
             // We'll just return the target value.
-            return this.value;
+            return this.targetValue;
         };
         return AnimateNumber;
     }());
@@ -195,7 +209,7 @@ var CesiumAnimatedProperty;
      * @returns
      */
     function AnimateTFeatureColor(params) {
-        var viewer = params.viewer, feature = params.feature, color = params.color, startColor = params.startColor, durationMs = params.durationMs;
+        var viewer = params.viewer, feature = params.feature, color = params.targetColor, startColor = params.startColor, durationMs = params.durationMs;
         ClearTFeatureColorAnimation(feature);
         if (!startColor) {
             if (feature.color) {
@@ -276,5 +290,74 @@ var CesiumAnimatedProperty;
         }
     }
     CesiumAnimatedProperty.ClearTFeatureColorAnimation = ClearTFeatureColorAnimation;
+    var AnimatePosition = /** @class */ (function () {
+        function AnimatePosition(params) {
+            this.viewer = params.viewer;
+            this.targetPos3d = params.targetPos3d;
+            this.durationMs = params.durationMs;
+            this.startPos3d = getPosition(this.viewer, params.startPos3d);
+            if (!this.startPos3d) {
+                this.startPos3d = Cesium.Cartesian3.clone(this.targetPos3d);
+            }
+            this.startTime = new Date();
+        }
+        AnimatePosition.prototype.GetValue = function () {
+            var now = new Date();
+            var elapsedMs = now.getTime() - this.startTime.getTime();
+            // Animation over.
+            if (elapsedMs >= this.durationMs) {
+                return this.targetPos3d;
+            }
+            try {
+                var progress = elapsedMs / this.durationMs;
+                return Cesium.Cartesian3.lerp(this.startPos3d, this.targetPos3d, progress, new Cesium.Cartesian3());
+            }
+            catch (e) {
+                console.error(e);
+            }
+            // Failed to calculate value.
+            // We'll just return the target value.
+            return this.targetPos3d;
+        };
+        return AnimatePosition;
+    }());
+    CesiumAnimatedProperty.AnimatePosition = AnimatePosition;
+    var AnimateHeading = /** @class */ (function () {
+        function AnimateHeading(params) {
+            this.viewer = params.viewer;
+            this.targetHeadingDeg = params.targetHeading;
+            this.durationMs = params.durationMs;
+            this.startHeadingDeg = getNumber(this.viewer, params.startHeading);
+            if (!this.startHeadingDeg) {
+                this.startHeadingDeg = 0;
+            }
+            this.startTime = new Date();
+        }
+        AnimateHeading.prototype.IsDone = function () {
+            var now = new Date();
+            var elapsedMs = now.getTime() - this.startTime.getTime();
+            return elapsedMs >= this.durationMs;
+        };
+        AnimateHeading.prototype.GetValue = function () {
+            var now = new Date();
+            var elapsedMs = now.getTime() - this.startTime.getTime();
+            // Animation over.
+            if (elapsedMs >= this.durationMs) {
+                return this.targetHeadingDeg;
+            }
+            try {
+                var progress = elapsedMs / this.durationMs;
+                return Cesium.Math.lerp(this.startHeadingDeg, this.targetHeadingDeg, progress);
+            }
+            catch (e) {
+                console.error(e);
+            }
+            // Failed to calculate value.
+            // We'll just return the target value.
+            return this.targetHeadingDeg;
+        };
+        return AnimateHeading;
+    }());
+    CesiumAnimatedProperty.AnimateHeading = AnimateHeading;
 })(CesiumAnimatedProperty = exports.CesiumAnimatedProperty || (exports.CesiumAnimatedProperty = {}));
 //# sourceMappingURL=cesium-animated-property.js.map

package/dist/lib/rendering/cesium-animated-property.js.map

@@ -1 +1 @@
-{"version":3,"file":"cesium-animated-property.js","sourceRoot":"","sources":["../../../src/rendering/cesium-animated-property.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cesium-animated-property.js","sourceRoot":"","sources":["../../../src/rendering/cesium-animated-property.ts"],"names":[],"mappings":"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"}

package/dist/lib/rendering/entity-render-engine.js

@@ -909,7 +909,7 @@ var EntityRenderEngine;
         function Render(params) {
             var _a, _b, _c, _d;
             return __awaiter(this, void 0, void 0, function () {
-                var entity, style, type, cEntity, siblings, prepareExistingGraphic, iconUrlRows, icon, iconUrl, metadata, api, image, e_5, iconScale, disableDepthTest, bColor, cColor_1, heightRef, currentImgKey, radius, bFill, cFill, outline, cOutline, outlineWidth, bOutline, heightRef, pos3d, extrusion, hasOutline, outlineExtrusion, outlineEntity, bColor, cColor, size, heightRef, circleBillboard, disableDepthTest, imgKey, currentImgKey;
+                var entity, style, type, cEntity, siblings, prepareExistingGraphic, iconUrlRows, icon, iconUrl, metadata, api, image, e_5, iconScale, disableDepthTest, bColor, cColor_1, heightRef_1, currentImgKey, pos3d, prevPos3d, animatePosition_1, radius, bFill, cFill, outline, cOutline, outlineWidth, bOutline, heightRef, pos3d, extrusion, hasOutline, outlineExtrusion, outlineEntity, bColor, cColor, size, heightRef_2, circleBillboard, disableDepthTest, imgKey, currentImgKey, pos3d, prevPos3d, animatePosition_2;
                 return __generator(this, function (_e) {
                     switch (_e.label) {
                         case 0:
@@ -1010,7 +1010,7 @@ var EntityRenderEngine;
                                 if (iconScale > 0) {
                                     bColor = style.iconTintColor ? bruce_models_1.Calculator.GetColor(style.iconTintColor, entity, params.tags) : null;
                                     cColor_1 = bColor ? colorToCColor(bColor) : undefined;
-                                    heightRef = getHeightRef(style);
+                                    heightRef_1 = getHeightRef(style);
                                     if (!params.rendered || !params.rendered.billboard) {
                                         cEntity = new Cesium.Entity({
                                             id: bruce_models_1.ObjectUtils.UId(10),
@@ -1026,12 +1026,12 @@ var EntityRenderEngine;
                                                 // Would be great once we have a setting for this.
                                                 // translucencyByDistance: getTranslucencyByDistance(params.minDistance, params.maxDistance),
                                             },
-                                            position: entity_utils_1.EntityUtils.GetPos({
+                                            position: new Cesium.CallbackProperty(function () { return entity_utils_1.EntityUtils.GetPos({
                                                 viewer: params.viewer,
                                                 entity: entity,
-                                                recordHeightRef: heightRef,
-                                                returnHeightRef: heightRef
-                                            }),
+                                                recordHeightRef: heightRef_1,
+                                                returnHeightRef: heightRef_1
+                                            }); }, true),
                                             show: true
                                         });
                                     }
@@ -1046,12 +1046,22 @@ var EntityRenderEngine;
                                         cEntity.billboard.heightReference = new Cesium.ConstantProperty(getHeightRef(style));
                                         cEntity.billboard.disableDepthTestDistance = new Cesium.ConstantProperty(disableDepthTest ? Number.POSITIVE_INFINITY : undefined);
                                         cEntity.billboard.distanceDisplayCondition = new Cesium.ConstantProperty(getDisplayCondition(params.minDistance, params.maxDistance));
-                                        cEntity.position = new Cesium.ConstantPositionProperty(entity_utils_1.EntityUtils.GetPos({
+                                        pos3d = entity_utils_1.EntityUtils.GetPos({
                                             viewer: params.viewer,
                                             entity: entity,
-                                            recordHeightRef: heightRef,
-                                            returnHeightRef: heightRef
-                                        }));
+                                            recordHeightRef: heightRef_1,
+                                            returnHeightRef: heightRef_1
+                                        });
+                                        prevPos3d = getValue(params.viewer, cEntity.position);
+                                        if (!prevPos3d || !Cesium.Cartesian3.equals(prevPos3d, pos3d)) {
+                                            animatePosition_1 = new cesium_animated_property_1.CesiumAnimatedProperty.AnimatePosition({
+                                                durationMs: 200,
+                                                targetPos3d: pos3d,
+                                                viewer: params.viewer,
+                                                startPos3d: prevPos3d
+                                            });
+                                            cEntity.position = new Cesium.CallbackProperty(function () { return animatePosition_1.GetValue(); }, false);
+                                        }
                                         // We'll use "SetDefaultColor" to updating the internal reference and to allow for an animation.
                                         cesium_entity_styler_1.CesiumEntityStyler.SetDefaultColor({
                                             color: cColor_1 ? cColor_1 : new Cesium.Color(),
@@ -1195,7 +1205,7 @@ var EntityRenderEngine;
                                 if (size <= 0) {
                                     return [2 /*return*/, null];
                                 }
-                                heightRef = getHeightRef(style);
+                                heightRef_2 = getHeightRef(style);
                                 circleBillboard = createCircleBillboard(size, cColor.toCssColorString());
                                 disableDepthTest = Boolean(style.renderOnTop);
                                 if (!params.rendered || !params.rendered.billboard) {
@@ -1215,16 +1225,16 @@ var EntityRenderEngine;
                                             width: circleBillboard.width,
                                             image: circleBillboard.canvasDataUri,
                                             color: new Cesium.CallbackProperty(function () { return undefined; }, true),
-                                            heightReference: heightRef,
+                                            heightReference: heightRef_2,
                                             distanceDisplayCondition: getDisplayCondition(params.minDistance, params.maxDistance),
                                             disableDepthTestDistance: disableDepthTest ? Number.POSITIVE_INFINITY : undefined
                                         },
-                                        position: entity_utils_1.EntityUtils.GetPos({
+                                        position: new Cesium.CallbackProperty(function () { return entity_utils_1.EntityUtils.GetPos({
                                             viewer: params.viewer,
                                             entity: entity,
-                                            recordHeightRef: heightRef,
-                                            returnHeightRef: heightRef
-                                        }),
+                                            recordHeightRef: heightRef_2,
+                                            returnHeightRef: heightRef_2
+                                        }); }, true),
                                         show: true
                                     });
                                 }
@@ -1238,15 +1248,25 @@ var EntityRenderEngine;
                                     }
                                     cEntity.billboard.height = new Cesium.ConstantProperty(circleBillboard.height);
                                     cEntity.billboard.width = new Cesium.ConstantProperty(circleBillboard.width);
-                                    cEntity.billboard.heightReference = new Cesium.ConstantProperty(heightRef);
+                                    cEntity.billboard.heightReference = new Cesium.ConstantProperty(heightRef_2);
                                     cEntity.billboard.distanceDisplayCondition = new Cesium.ConstantProperty(getDisplayCondition(params.minDistance, params.maxDistance));
                                     cEntity.billboard.disableDepthTestDistance = new Cesium.ConstantProperty(disableDepthTest ? Number.POSITIVE_INFINITY : undefined);
-                                    cEntity.position = new Cesium.ConstantPositionProperty(entity_utils_1.EntityUtils.GetPos({
+                                    pos3d = entity_utils_1.EntityUtils.GetPos({
                                         viewer: params.viewer,
                                         entity: entity,
-                                        recordHeightRef: heightRef,
-                                        returnHeightRef: heightRef
-                                    }));
+                                        recordHeightRef: heightRef_2,
+                                        returnHeightRef: heightRef_2
+                                    });
+                                    prevPos3d = getValue(params.viewer, cEntity.position);
+                                    if (!prevPos3d || !Cesium.Cartesian3.equals(prevPos3d, pos3d)) {
+                                        animatePosition_2 = new cesium_animated_property_1.CesiumAnimatedProperty.AnimatePosition({
+                                            durationMs: 200,
+                                            targetPos3d: pos3d,
+                                            viewer: params.viewer,
+                                            startPos3d: prevPos3d
+                                        });
+                                        cEntity.position = new Cesium.CallbackProperty(function () { return animatePosition_2.GetValue(); }, false);
+                                    }
                                     // We'll use "SetDefaultColor" to updating the internal reference and to allow for an animation.
                                     cesium_entity_styler_1.CesiumEntityStyler.SetDefaultColor({
                                         color: cColor,
@@ -1914,20 +1934,18 @@ var EntityRenderEngine;
             if (styleScale <= 0) {
                 styleScale = 1;
             }
-            var hpr = new Cesium.HeadingPitchRoll(Cesium.Math.toRadians(heading), Cesium.Math.toRadians(pitch), Cesium.Math.toRadians(roll));
             var heightRef = getHeightRef(style, Cesium.HeightReference.RELATIVE_TO_GROUND);
-            var pos = entity_utils_1.EntityUtils.GetPos({
+            var pos3d = entity_utils_1.EntityUtils.GetPos({
                 viewer: params.viewer,
                 entity: entity,
                 recordHeightRef: heightRef,
                 returnHeightRef: heightRef
             });
             if (heightRef == Cesium.HeightReference.CLAMP_TO_GROUND) {
-                var carto = Cesium.Cartographic.fromCartesian(pos);
-                pos = Cesium.Cartesian3.fromRadians((0, js_utils_1.EnsureNumber)(carto.longitude), (0, js_utils_1.EnsureNumber)(carto.latitude), 0);
+                var carto = Cesium.Cartographic.fromCartesian(pos3d);
+                pos3d = Cesium.Cartesian3.fromRadians((0, js_utils_1.EnsureNumber)(carto.longitude), (0, js_utils_1.EnsureNumber)(carto.latitude), 0);
                 heightRef = Cesium.HeightReference.RELATIVE_TO_GROUND;
             }
-            var orientation = Cesium.Transforms.headingPitchRollQuaternion(pos, hpr);
             var blendMode = null;
             var blendAmount = null;
             var color = null;
@@ -1968,6 +1986,8 @@ var EntityRenderEngine;
             var animateScale = null;
             var cEntity = params.rendered;
             if (!cEntity || !cEntity.model) {
+                var hpr = new Cesium.HeadingPitchRoll(Cesium.Math.toRadians(heading), Cesium.Math.toRadians(pitch), Cesium.Math.toRadians(roll));
+                var orientation_1 = Cesium.Transforms.headingPitchRollQuaternion(pos3d, hpr);
                 cEntity = new Cesium.Entity({
                     id: bruce_models_1.ObjectUtils.UId(10),
                     model: {
@@ -1980,8 +2000,8 @@ var EntityRenderEngine;
                         color: new Cesium.CallbackProperty(function () { return color; }, true),
                         distanceDisplayCondition: getDisplayCondition(params.minDistance, params.maxDistance)
                     },
-                    orientation: new Cesium.ConstantProperty(orientation),
-                    position: pos,
+                    orientation: new Cesium.CallbackProperty(function () { return orientation_1; }, true),
+                    position: new Cesium.CallbackProperty(function () { return pos3d; }, true),
                     show: true
                 });
                 cesium_entity_styler_1.CesiumEntityStyler.BakeDefaultColor({
@@ -2017,14 +2037,50 @@ var EntityRenderEngine;
                 cEntity.model.colorBlendAmount = new Cesium.ConstantProperty(blendAmount);
                 cEntity.model.colorBlendMode = new Cesium.ConstantProperty(blendMode);
                 cEntity.model.distanceDisplayCondition = new Cesium.ConstantProperty(getDisplayCondition(params.minDistance, params.maxDistance));
-                cEntity.orientation = new Cesium.ConstantProperty(orientation);
-                cEntity.position = new Cesium.ConstantPositionProperty(pos);
+                var prevPos3d = getValue(params.viewer, cEntity.position);
+                var posChanged = !prevPos3d || !Cesium.Cartesian3.equals(prevPos3d, pos3d);
+                var animatePosition_3 = null;
+                if (posChanged) {
+                    animatePosition_3 = new cesium_animated_property_1.CesiumAnimatedProperty.AnimatePosition({
+                        durationMs: 200,
+                        targetPos3d: pos3d,
+                        viewer: params.viewer,
+                        startPos3d: prevPos3d
+                    });
+                    cEntity.position = new Cesium.CallbackProperty(function () { return animatePosition_3.GetValue(); }, false);
+                }
+                // cEntity.orientation = new Cesium.ConstantProperty(orientation);
+                var prevHeading = cEntity.model._heading;
+                if (prevHeading == null || prevHeading == heading || isNaN(prevHeading)) {
+                    var hpr = new Cesium.HeadingPitchRoll(Cesium.Math.toRadians(heading), Cesium.Math.toRadians(pitch), Cesium.Math.toRadians(roll));
+                    var orient_1 = Cesium.Transforms.headingPitchRollQuaternion(pos3d, hpr);
+                    cEntity.orientation = new Cesium.CallbackProperty(function () { return orient_1; }, true);
+                }
+                // Animate orientation. We'll calculate the heading based on movement.
+                else {
+                    var animateHeading_1 = new cesium_animated_property_1.CesiumAnimatedProperty.AnimateHeading({
+                        durationMs: 200,
+                        targetHeading: heading,
+                        viewer: params.viewer,
+                        startHeading: prevHeading
+                    });
+                    cEntity.orientation = new Cesium.CallbackProperty(function () {
+                        var calcHeading = animateHeading_1.GetValue();
+                        var hpr = new Cesium.HeadingPitchRoll(Cesium.Math.toRadians(calcHeading), Cesium.Math.toRadians(pitch), Cesium.Math.toRadians(roll));
+                        var orient = Cesium.Transforms.headingPitchRollQuaternion(pos3d, hpr);
+                        // We'll stop the costly animation if it's done.
+                        if (animateHeading_1.IsDone()) {
+                            cEntity.orientation = new Cesium.ConstantProperty(orient);
+                        }
+                        return orient;
+                    }, false);
+                }
                 // Same file but different scale. We'll animate the scale.
                 var prevClientFileId = cEntity.model._clientFileId;
                 if (prevClientFileId == params.lodClientFileId) {
                     animateScale = new cesium_animated_property_1.CesiumAnimatedProperty.AnimateNumber({
                         durationMs: 200,
-                        value: scale * styleScale,
+                        targetValue: scale * styleScale,
                         viewer: params.viewer,
                         startValue: cEntity.model.scale,
                         startPaused: true
@@ -2135,6 +2191,7 @@ var EntityRenderEngine;
                 record: scale,
                 style: styleScale
             };
+            model._heading = heading;
             return cEntity;
         }
         Model3d.Render = Render;