bruce-cesium 3.8.0 → 3.8.2

package/dist/bruce-cesium.umd.js

@@ -930,6 +930,20 @@
         }
         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
@@ -984,7 +998,7 @@
             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) {
@@ -1005,18 +1019,18 @@
                 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.
@@ -1034,7 +1048,7 @@
                 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) {
@@ -1058,18 +1072,18 @@
                 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;
         }());
@@ -1092,7 +1106,7 @@
          * @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) {
@@ -1173,6 +1187,75 @@
             }
         }
         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 || (CesiumAnimatedProperty = {}));
 
     /**
@@ -1372,7 +1455,7 @@
                 }
                 else {
                     CesiumAnimatedProperty.AnimateTFeatureColor({
-                        color: color.clone(),
+                        targetColor: color.clone(),
                         durationMs: animateMs,
                         feature: graphic,
                         viewer: viewer,
@@ -1383,7 +1466,7 @@
             else if (graphic instanceof Cesium.ModelGraphics) {
                 // graphic.color = new Cesium.ConstantProperty(color);
                 var animateColor_1 = new CesiumAnimatedProperty.AnimateColor({
-                    color: color,
+                    targetColor: color,
                     durationMs: animateMs,
                     viewer: viewer,
                     startColor: graphic.color
@@ -1407,7 +1490,7 @@
             else if (graphic instanceof Cesium.PointGraphics) {
                 // graphic.color = new Cesium.ConstantProperty(color);
                 var animateColor_2 = new CesiumAnimatedProperty.AnimateColor({
-                    color: color,
+                    targetColor: color,
                     durationMs: animateMs,
                     viewer: viewer,
                     startColor: graphic.color
@@ -1422,7 +1505,7 @@
             else if (graphic instanceof Cesium.BillboardGraphics) {
                 // graphic.color = new Cesium.ConstantProperty(color);
                 var animateColor_3 = new CesiumAnimatedProperty.AnimateColor({
-                    color: color,
+                    targetColor: color,
                     durationMs: animateMs,
                     viewer: viewer,
                     startColor: graphic.color
@@ -2112,6 +2195,9 @@
                             if (!paddingAlt) {
                                 paddingAlt = 0;
                             }
+                            if (!Array.isArray(samples)) {
+                                samples = [samples];
+                            }
                             MAX_DISTANCE_BETWEEN_SAMPLES = 5000;
                             MAX_TERRAIN_SAMPLES = 25;
                             terrainSamples = 0;
@@ -5088,7 +5174,7 @@
             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:
@@ -5189,7 +5275,7 @@
                                     if (iconScale > 0) {
                                         bColor = style.iconTintColor ? bruceModels.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: bruceModels.ObjectUtils.UId(10),
@@ -5205,12 +5291,12 @@
                                                     // Would be great once we have a setting for this.
                                                     // translucencyByDistance: getTranslucencyByDistance(params.minDistance, params.maxDistance),
                                                 },
-                                                position: exports.EntityUtils.GetPos({
+                                                position: new Cesium.CallbackProperty(function () { return exports.EntityUtils.GetPos({
                                                     viewer: params.viewer,
                                                     entity: entity,
-                                                    recordHeightRef: heightRef,
-                                                    returnHeightRef: heightRef
-                                                }),
+                                                    recordHeightRef: heightRef_1,
+                                                    returnHeightRef: heightRef_1
+                                                }); }, true),
                                                 show: true
                                             });
                                         }
@@ -5225,12 +5311,22 @@
                                             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(exports.EntityUtils.GetPos({
+                                            pos3d = exports.EntityUtils.GetPos({
                                                 viewer: params.viewer,
                                                 entity: entity,
-                                                recordHeightRef: heightRef,
-                                                returnHeightRef: heightRef
-                                            }));
+                                                recordHeightRef: heightRef_1,
+                                                returnHeightRef: heightRef_1
+                                            });
+                                            prevPos3d = getValue$1(params.viewer, cEntity.position);
+                                            if (!prevPos3d || !Cesium.Cartesian3.equals(prevPos3d, pos3d)) {
+                                                animatePosition_1 = new 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.
                                             exports.CesiumEntityStyler.SetDefaultColor({
                                                 color: cColor_1 ? cColor_1 : new Cesium.Color(),
@@ -5374,7 +5470,7 @@
                                     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) {
@@ -5394,16 +5490,16 @@
                                                 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: exports.EntityUtils.GetPos({
+                                            position: new Cesium.CallbackProperty(function () { return exports.EntityUtils.GetPos({
                                                 viewer: params.viewer,
                                                 entity: entity,
-                                                recordHeightRef: heightRef,
-                                                returnHeightRef: heightRef
-                                            }),
+                                                recordHeightRef: heightRef_2,
+                                                returnHeightRef: heightRef_2
+                                            }); }, true),
                                             show: true
                                         });
                                     }
@@ -5417,15 +5513,25 @@
                                         }
                                         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(exports.EntityUtils.GetPos({
+                                        pos3d = exports.EntityUtils.GetPos({
                                             viewer: params.viewer,
                                             entity: entity,
-                                            recordHeightRef: heightRef,
-                                            returnHeightRef: heightRef
-                                        }));
+                                            recordHeightRef: heightRef_2,
+                                            returnHeightRef: heightRef_2
+                                        });
+                                        prevPos3d = getValue$1(params.viewer, cEntity.position);
+                                        if (!prevPos3d || !Cesium.Cartesian3.equals(prevPos3d, pos3d)) {
+                                            animatePosition_2 = new 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.
                                         exports.CesiumEntityStyler.SetDefaultColor({
                                             color: cColor,
@@ -6093,20 +6199,18 @@
                 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 = exports.EntityUtils.GetPos({
+                var pos3d = exports.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(EnsureNumber(carto.longitude), EnsureNumber(carto.latitude), 0);
+                    var carto = Cesium.Cartographic.fromCartesian(pos3d);
+                    pos3d = Cesium.Cartesian3.fromRadians(EnsureNumber(carto.longitude), 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;
@@ -6147,6 +6251,8 @@
                 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: bruceModels.ObjectUtils.UId(10),
                         model: {
@@ -6159,8 +6265,8 @@
                             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
                     });
                     exports.CesiumEntityStyler.BakeDefaultColor({
@@ -6196,14 +6302,50 @@
                     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$1(params.viewer, cEntity.position);
+                    var posChanged = !prevPos3d || !Cesium.Cartesian3.equals(prevPos3d, pos3d);
+                    var animatePosition_3 = null;
+                    if (posChanged) {
+                        animatePosition_3 = new 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 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 CesiumAnimatedProperty.AnimateNumber({
                             durationMs: 200,
-                            value: scale * styleScale,
+                            targetValue: scale * styleScale,
                             viewer: params.viewer,
                             startValue: cEntity.model.scale,
                             startPaused: true
@@ -6314,6 +6456,7 @@
                     record: scale,
                     style: styleScale
                 };
+                model._heading = heading;
                 return cEntity;
             }
             Model3d.Render = Render;
@@ -13727,15 +13870,30 @@
              */
             Getter.prototype.viewerDateTimeSub = function () {
                 var _this = this;
-                this.viewerDateTimeDispose();
-                if (!this.historicAttrKey) {
+                if (!this.historicAttrKey || this.viewerDateTimeChangeRemoval) {
                     return;
                 }
+                // This is multiplied by the speed of animation to figure
+                // out how many animation "ticks" before we allow an update.
+                var INTERVAL_WHILE_ANIMATING = 2.5 * 1000;
+                var lastUpdateTime = null;
                 var delayQueue = new bruceModels.DelayQueue(function () {
-                    var current = _this.historicAttrDateTime;
-                    _this.updateHistoricDateTime();
-                    if (current != _this.historicAttrDateTime) {
-                        _this.updateState();
+                    try {
+                        // If the timeline is animating then we'll wait longer to update.
+                        if (_this.viewer.clock.shouldAnimate && lastUpdateTime) {
+                            if (Math.abs(new Date().getTime() - lastUpdateTime) < INTERVAL_WHILE_ANIMATING) {
+                                return;
+                            }
+                        }
+                        lastUpdateTime = new Date().getTime();
+                        var current = _this.historicAttrDateTime;
+                        _this.updateHistoricDateTime();
+                        if (current != _this.historicAttrDateTime) {
+                            _this.updateState();
+                        }
+                    }
+                    catch (e) {
+                        console.error(e);
                     }
                 }, 250);
                 var postUpdateRemoval = this.viewer.scene.postUpdate.addEventListener(function () {
@@ -13842,6 +14000,7 @@
                 else {
                     this.getterLoopId += 1;
                     this.viewAreaDispose();
+                    this.viewerDateTimeDispose();
                 }
             };
             Getter.prototype.postStatus = function (status) {
@@ -23439,7 +23598,7 @@
         ViewRenderEngine.Render = Render;
     })(exports.ViewRenderEngine || (exports.ViewRenderEngine = {}));
 
-    var VERSION = "3.8.0";
+    var VERSION = "3.8.2";
 
     exports.VERSION = VERSION;
     exports.CesiumParabola = CesiumParabola;