bruce-cesium 2.7.3 → 2.7.5

package/dist/bruce-cesium.umd.js

@@ -1764,7 +1764,7 @@
     }
     function getStyle(api, entity, styleId) {
         return __awaiter(this, void 0, void 0, function () {
-            var style, e_2, typeId, type, e_3;
+            var style, e_2, typeId, type, e_3, hideError, error, code;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -1807,7 +1807,18 @@
                         return [3 /*break*/, 9];
                     case 8:
                         e_3 = _a.sent();
-                        console.error(e_3);
+                        hideError = false;
+                        // TODO: we need a util for extracting code + message rather than writing all this every time.
+                        if (e_3 && typeof e_3 == "object" && e_3.ERROR) {
+                            error = e_3.ERROR;
+                            code = error && typeof error == "object" ? error.Code : "";
+                            // Avoiding logging a common error.
+                            // This happens when rendering entities that don't have records.
+                            hideError = String(code).toLowerCase() == "notfound";
+                        }
+                        if (!hideError) {
+                            console.error(e_3);
+                        }
                         return [3 /*break*/, 9];
                     case 9: return [2 /*return*/, style];
                 }
@@ -3063,6 +3074,7 @@
      */
     var CesiumParabola = /** @class */ (function () {
         function CesiumParabola(params) {
+            this.disposed = false;
             this.color = "white";
             this.width = 2;
             this.duration = 10;
@@ -3144,6 +3156,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 +3190,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 +3373,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 +3421,7 @@
         };
         CesiumParabola.prototype.Dispose = function () {
             var _this = this;
+            this.disposed = true;
             clearTimeout(this.retryTimeout);
             clearInterval(this.animateInterval);
             var cEntities = [
@@ -5461,16 +5517,14 @@
                     viewer: this.viewer,
                     // Unfortunately this searches as an "AND" rather than "OR" which does not meet our needs here.
                     // So for multiple tags we'll manually sort on UI end...
-                    tagIds: tagsToRender.length == 1 ? tagsToRender : [],
+                    tagIds: (tagsToRender === null || tagsToRender === void 0 ? void 0 : tagsToRender.length) ? tagsToRender : [],
                     debugShowBounds: Boolean(window === null || window === void 0 ? void 0 : window.ENTITIES_RENDER_MANAGER_SHOW_BOUNDS),
                     cdn: this.item.cdnEnabled
                 });
                 var minMax = exports.RenderManager.GetZoomMinMax({
                     zoomControl: this.item.CameraZoomSettings
                 });
-                // Unfortunately this searches as an "AND" rather than "OR" which does not meet our needs here.
-                // So for multiple tags we'll manually sort on UI end...
-                this.getter.IncludeMenuItem(this.item.id, tagsToRender.length == 1 ? tagsToRender : [], minMax[0], minMax[1]);
+                this.getter.IncludeMenuItem(this.item.id, (tagsToRender === null || tagsToRender === void 0 ? void 0 : tagsToRender.length) ? tagsToRender : [], minMax[0], minMax[1]);
                 this.getterSub = this.getter.OnUpdate.Subscribe(function (entities) {
                     if (isTagItem) {
                         _this.distributeForRender(entities.filter(function (entity) {
@@ -9074,6 +9128,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);
@@ -12332,71 +12392,43 @@
     })(exports.ViewRenderEngine || (exports.ViewRenderEngine = {}));
 
     var DEFAULT_SMOOTH_MULTIPLIER = 0;
-    function avgDistanceFromPointPair(refPoint, pos1, pos2) {
-        var carto1 = Cesium.Cartographic.fromCartesian(refPoint);
-        var carto2 = Cesium.Cartographic.fromCartesian(pos1);
-        var carto3 = Cesium.Cartographic.fromCartesian(pos2);
-        var x1 = carto1.longitude;
-        var y1 = carto1.latitude;
-        var x2 = carto2.longitude;
-        var y2 = carto2.latitude;
-        var x3 = carto3.longitude;
-        var y3 = carto3.latitude;
-        var A = x1 - x2;
-        var B = y1 - y2;
-        var C = x3 - x2;
-        var D = y3 - y2;
-        var dot = A * C + B * D;
-        var lenSq = C * C + D * D;
-        var param = dot / lenSq;
-        var xx;
-        var yy;
-        if (param < 0 || x2 == x3 && y2 == y3) {
-            xx = x2;
-            yy = y2;
-        }
-        else if (param > 1) {
-            xx = x3;
-            yy = y3;
+    function distanceToSegment$1(p, v, w) {
+        var l2 = Cesium.Cartesian3.distanceSquared(v, w);
+        if (l2 === 0) {
+            return Cesium.Cartesian3.distance(p, v);
         }
-        else {
-            xx = x2 + param * C;
-            yy = y2 + param * D;
+        var t = Cesium.Cartesian3.dot(Cesium.Cartesian3.subtract(p, v, new Cesium.Cartesian3()), Cesium.Cartesian3.subtract(w, v, new Cesium.Cartesian3())) / l2;
+        if (t < 0) {
+            return Cesium.Cartesian3.distance(p, v);
+        }
+        if (t > 1) {
+            return Cesium.Cartesian3.distance(p, w);
         }
-        var dx = x1 - xx;
-        var dy = y1 - yy;
-        return Math.sqrt(dx * dx + dy * dy);
+        var projection = Cesium.Cartesian3.add(v, Cesium.Cartesian3.multiplyByScalar(Cesium.Cartesian3.subtract(w, v, new Cesium.Cartesian3()), t, new Cesium.Cartesian3()), new Cesium.Cartesian3());
+        return Cesium.Cartesian3.distance(p, projection);
     }
+    /**
+     * Returns splice index into a list of positions to insert a new position.
+     * @param positions List of positions to insert into.
+     * @param pos3d New position to insert.
+     * @returns Index to insert at.
+     */
     function getInsertIndex(positions, pos3d) {
         if (positions.length < 2) {
             return 0;
         }
+        var minDistance = Infinity;
         var index = -1;
-        if (positions) {
-            var distance = void 0;
-            for (var j = 0; j < positions.length; j++) {
-                var pos1 = positions[j];
-                var pos2 = void 0;
-                var pos2Index = -1;
-                if (j >= positions.length - 1) {
-                    pos2 = positions[0];
-                    pos2Index = 0;
-                }
-                else {
-                    pos2 = positions[j + 1];
-                    pos2Index = j + 1;
-                }
-                if (bruceModels.Cartes.ValidateCartes3(pos1), bruceModels.Cartes.ValidateCartes3(pos2)) {
-                    var length_1 = avgDistanceFromPointPair(pos3d, pos1, pos2);
-                    if (index == -1 || length_1 < distance) {
-                        var insertIndex = pos2Index == 0 ? 0 : j > pos2Index ? j : pos2Index;
-                        index = insertIndex;
-                        distance = length_1;
-                    }
-                }
+        for (var i = 0; i < positions.length; i++) {
+            var pos1 = positions[i];
+            var pos2 = i < positions.length - 1 ? positions[i + 1] : positions[0];
+            var dist = distanceToSegment$1(pos3d, pos1, pos2);
+            if (dist < minDistance) {
+                minDistance = dist;
+                index = i + 1;
             }
         }
-        return index == -1 ? 0 : index;
+        return index;
     }
     var OUTLINE_COLOR = "rgba(51, 177, 255, 0.2)";
     var FILL_COLOR = "#33B1FF";
@@ -12799,71 +12831,61 @@
     }());
 
     var DEFAULT_SMOOTH_MULTIPLIER$1 = 0;
-    function avgDistanceFromPointPair$1(refPoint, pos1, pos2) {
-        var carto1 = Cesium.Cartographic.fromCartesian(refPoint);
-        var carto2 = Cesium.Cartographic.fromCartesian(pos1);
-        var carto3 = Cesium.Cartographic.fromCartesian(pos2);
-        var x1 = carto1.longitude;
-        var y1 = carto1.latitude;
-        var x2 = carto2.longitude;
-        var y2 = carto2.latitude;
-        var x3 = carto3.longitude;
-        var y3 = carto3.latitude;
-        var A = x1 - x2;
-        var B = y1 - y2;
-        var C = x3 - x2;
-        var D = y3 - y2;
-        var dot = A * C + B * D;
-        var lenSq = C * C + D * D;
-        var param = dot / lenSq;
-        var xx;
-        var yy;
-        if (param < 0 || x2 == x3 && y2 == y3) {
-            xx = x2;
-            yy = y2;
-        }
-        else if (param > 1) {
-            xx = x3;
-            yy = y3;
+    function distanceToSegment$2(p, v, w) {
+        var l2 = Cesium.Cartesian3.distanceSquared(v, w);
+        if (l2 === 0) {
+            return Cesium.Cartesian3.distance(p, v);
         }
-        else {
-            xx = x2 + param * C;
-            yy = y2 + param * D;
+        var t = Cesium.Cartesian3.dot(Cesium.Cartesian3.subtract(p, v, new Cesium.Cartesian3()), Cesium.Cartesian3.subtract(w, v, new Cesium.Cartesian3())) / l2;
+        if (t < 0) {
+            return Cesium.Cartesian3.distance(p, v);
+        }
+        if (t > 1) {
+            return Cesium.Cartesian3.distance(p, w);
         }
-        var dx = x1 - xx;
-        var dy = y1 - yy;
-        return Math.sqrt(dx * dx + dy * dy);
+        var projection = Cesium.Cartesian3.add(v, Cesium.Cartesian3.multiplyByScalar(Cesium.Cartesian3.subtract(w, v, new Cesium.Cartesian3()), t, new Cesium.Cartesian3()), new Cesium.Cartesian3());
+        return Cesium.Cartesian3.distance(p, projection);
     }
+    /**
+     * Returns splice index into a list of positions to insert a new position.
+     * @param positions List of positions to insert into.
+     * @param pos3d New position to insert.
+     * @returns Index to insert at.
+     */
     function getInsertIndex$1(positions, pos3d) {
         if (positions.length < 2) {
             return 0;
         }
-        var index = 0;
-        if (positions) {
-            var marginalShift = function (pos) {
-                var SHIFT = 0.001;
-                pos = pos.clone();
-                return new Cesium.Cartesian3(pos.x + SHIFT, pos.y + SHIFT, pos.z + SHIFT);
-            };
-            var distance = avgDistanceFromPointPair$1(pos3d, positions[0], marginalShift(positions[0]));
-            var endDistance = avgDistanceFromPointPair$1(pos3d, positions[positions.length - 1], marginalShift(positions[positions.length - 1]));
-            if (endDistance < distance) {
-                index = positions.length;
-                distance = endDistance;
-            }
-            for (var j = 0; j < positions.length; j++) {
-                var pos1 = positions[j];
-                var pos2 = positions[j + 1];
-                var pos2Index = j + 1;
-                if (bruceModels.Cartes.ValidateCartes3(pos1), bruceModels.Cartes.ValidateCartes3(pos2)) {
-                    var length_1 = avgDistanceFromPointPair$1(pos3d, pos1, pos2);
-                    if (length_1 < distance) {
-                        var insertIndex = pos2Index == 0 ? 0 : j > pos2Index ? j : pos2Index;
-                        index = insertIndex;
-                        distance = length_1;
-                    }
-                }
-            }
+        var minDistance = Infinity;
+        var index = -1;
+        // Check against segments
+        for (var i = 0; i < positions.length - 1; i++) {
+            var pos1 = positions[i];
+            var pos2 = positions[i + 1];
+            var dist = distanceToSegment$2(pos3d, pos1, pos2);
+            if (dist < minDistance) {
+                minDistance = dist;
+                index = i + 1;
+            }
+        }
+        // Check against start point
+        var startDist = Cesium.Cartesian3.distance(pos3d, positions[0]);
+        if (startDist <= minDistance) {
+            index = 0;
+            minDistance = startDist;
+            console.log("Insert at start");
+        }
+        else {
+            console.log("Start distance was longer than cur distance. ".concat(startDist, " > ").concat(minDistance));
+        }
+        // Check against end point
+        var endDist = Cesium.Cartesian3.distance(pos3d, positions[positions.length - 1]);
+        if (endDist <= minDistance) {
+            index = positions.length;
+            console.log("Insert at end");
+        }
+        else {
+            console.log("End distance was longer than cur distance. ".concat(endDist, " > ").concat(minDistance));
         }
         return index;
     }
@@ -15167,7 +15189,7 @@
         ViewerUtils.CreateWidgets = CreateWidgets;
     })(exports.ViewerUtils || (exports.ViewerUtils = {}));
 
-    var VERSION$1 = "2.7.3";
+    var VERSION$1 = "2.7.5";
 
     exports.VERSION = VERSION$1;
     exports.CesiumViewMonitor = CesiumViewMonitor;