bruce-cesium 2.7.3 → 2.7.4

package/dist/bruce-cesium.umd.js

@@ -3063,6 +3063,7 @@
      */
     var CesiumParabola = /** @class */ (function () {
         function CesiumParabola(params) {
+            this.disposed = false;
             this.color = "white";
             this.width = 2;
             this.duration = 10;
@@ -3144,6 +3145,9 @@
         };
         CesiumParabola.prototype.Animate = function () {
             var _this = this;
+            if (this.disposed) {
+                return null;
+            }
             if (this.parabola && !this.viewer.entities.contains(this.parabola)) {
                 this.viewer.entities.add(this.parabola);
             }
@@ -3175,9 +3179,34 @@
             var RATE_PER_SECOND = 1000 / 40;
             var SEC_DURATION = this.duration;
             var HEIGHT_DISTANCE_RATIO = this.heightDistanceRatio;
-            var TOTAL_POINTS = Math.max(50, Math.min(1000, TOTAL_LENGTH * 0.1));
-            var POINT_LENGTH = TOTAL_LENGTH / TOTAL_POINTS;
-            var TICK_LENGTH_INC = SEC_DURATION == 0 ? TOTAL_LENGTH : TOTAL_POINTS / (RATE_PER_SECOND * SEC_DURATION);
+            var TOTAL_POINTS = null;
+            var POINT_LENGTH = null;
+            var TICK_LENGTH_INC = null;
+            // Updates TOTAL_POINTS, POINT_LENGTH, and TICK_LENGTH_INC based on current TOTAL_LENGTH and camera position.
+            // We want less points the further away the camera is.
+            var updateParams = function () {
+                var _a, _b;
+                // TODO: Do distance to parabola line instead.
+                var MIN_POINTS = 30;
+                var totalPoints = 80;
+                var cameraHeight = (_b = (_a = _this.viewer.camera) === null || _a === void 0 ? void 0 : _a.positionCartographic) === null || _b === void 0 ? void 0 : _b.height;
+                if (isNaN(cameraHeight) || cameraHeight >= 100000) {
+                    totalPoints = MIN_POINTS;
+                }
+                else if (cameraHeight >= 10000) {
+                    totalPoints = 50;
+                }
+                else if (cameraHeight >= 1000) {
+                    totalPoints = 80;
+                }
+                else if (cameraHeight >= 100) {
+                    totalPoints = 100;
+                }
+                TOTAL_POINTS = Math.max(MIN_POINTS, Math.min(totalPoints, TOTAL_LENGTH * 0.1));
+                POINT_LENGTH = TOTAL_LENGTH / TOTAL_POINTS;
+                TICK_LENGTH_INC = SEC_DURATION == 0 ? TOTAL_LENGTH : TOTAL_POINTS / (RATE_PER_SECOND * SEC_DURATION);
+            };
+            updateParams();
             var curPoint = 0;
             var quadraticKey = null;
             var quadratic = null;
@@ -3333,30 +3362,45 @@
                 for (var i = 0; i < totalCycles; i++) {
                     posses.push(getPosition(i));
                 }
-                posses.push(getPosition(increment + chips));
+                if (chips) {
+                    posses.push(getPosition(increment + chips));
+                }
                 if (posses.find(function (x) { return !x || !bruceModels.Cartes.ValidateCartes3(x); })) {
                     return;
                 }
                 _this.curPoints = posses;
             };
+            var lastTickDate = new Date();
+            var finished = false;
             var doTick = function () {
-                var p1 = _this.curPos1;
-                var p2 = _this.curPos2;
-                var newLength = p1 && p2 ? Cesium.Cartesian3.distance(p1, p2) : -1;
-                if (newLength > 0 && newLength != TOTAL_LENGTH) {
-                    TOTAL_LENGTH = newLength;
-                    TOTAL_POINTS = Math.max(50, Math.min(1000, TOTAL_LENGTH * 0.1));
-                    POINT_LENGTH = TOTAL_LENGTH / TOTAL_POINTS;
-                    TICK_LENGTH_INC = SEC_DURATION == 0 ? TOTAL_LENGTH : TOTAL_POINTS / (RATE_PER_SECOND * SEC_DURATION);
-                }
-                prepareQuadratic();
-                if (quadratic) {
-                    if (curPoint < TOTAL_POINTS) {
-                        curPoint += TICK_LENGTH_INC;
+                var curDate = new Date();
+                var seconds = (curDate.getTime() - lastTickDate.getTime()) / 1000;
+                var ticks = seconds * RATE_PER_SECOND;
+                if (!isNaN(ticks) && ticks >= 1) {
+                    lastTickDate = curDate;
+                    var p1 = _this.curPos1;
+                    var p2 = _this.curPos2;
+                    var newLength = p1 && p2 ? Cesium.Cartesian3.distance(p1, p2) : -1;
+                    if (newLength > 0 && newLength != TOTAL_LENGTH) {
+                        TOTAL_LENGTH = newLength;
+                        updateParams();
+                    }
+                    prepareQuadratic();
+                    if (quadratic) {
+                        if (curPoint < TOTAL_POINTS) {
+                            curPoint += (TICK_LENGTH_INC * ticks);
+                        }
+                        updatePoints();
+                    }
+                    _this.viewer.scene.requestRender();
+                    if (curPoint >= TOTAL_POINTS && !finished) {
+                        finished = true;
+                        // We can make the interval update super slow now.
+                        // We keep it updating in case the positions move.
+                        clearInterval(_this.animateInterval);
+                        _this.animateInterval = setInterval(doTick, 3000);
                     }
-                    updatePoints();
                 }
-                _this.viewer.scene.requestRender();
             };
             this.animateInterval = setInterval(doTick, RATE_PER_SECOND);
             return {
@@ -3366,6 +3410,7 @@
         };
         CesiumParabola.prototype.Dispose = function () {
             var _this = this;
+            this.disposed = true;
             clearTimeout(this.retryTimeout);
             clearInterval(this.animateInterval);
             var cEntities = [
@@ -9074,6 +9119,12 @@
                                     })];
                             case 1:
                                 cEntities = _c.sent();
+                                if (this.disposed) {
+                                    this.register.RemoveRegos({
+                                        menuItemId: this.item.id
+                                    });
+                                    return [2 /*return*/];
+                                }
                                 for (i = 0; i < relations.length; i++) {
                                     relation = relations[i];
                                     key = RelationRenderEngine.GetRenderGroupId(relation);
@@ -15167,7 +15218,7 @@
         ViewerUtils.CreateWidgets = CreateWidgets;
     })(exports.ViewerUtils || (exports.ViewerUtils = {}));
 
-    var VERSION$1 = "2.7.3";
+    var VERSION$1 = "2.7.4";
 
     exports.VERSION = VERSION$1;
     exports.CesiumViewMonitor = CesiumViewMonitor;