bruce-cesium 7.4.8 → 7.4.9

package/dist/bruce-cesium.umd.js

@@ -1464,6 +1464,48 @@
         ViewUtils.GetModelSpace = GetModelSpace;
     })(exports.ViewUtils || (exports.ViewUtils = {}));
 
+    // End time of the frames already being requested for a viewer, so overlapping animations share one loop.
+    const renderDriverEnds = new WeakMap();
+    // A browser frame where there is one, so the requests keep pace with Cesium's own loop.
+    function nextFrame(callback) {
+        if (typeof requestAnimationFrame === "function") {
+            requestAnimationFrame(callback);
+        }
+        else {
+            setTimeout(callback, 16);
+        }
+    }
+    /**
+     * Keeps frames coming until a time based animation has ended, then draws one more for its final value.
+     */
+    function requestRendersFor(viewer, durationMs) {
+        var _a;
+        const scene = viewer === null || viewer === void 0 ? void 0 : viewer.scene;
+        if (typeof (scene === null || scene === void 0 ? void 0 : scene.requestRender) !== "function" || ((_a = viewer.isDestroyed) === null || _a === void 0 ? void 0 : _a.call(viewer))) {
+            return;
+        }
+        scene.requestRender();
+        const endAt = Date.now() + Math.max(durationMs || 0, 0);
+        if (renderDriverEnds.has(viewer)) {
+            renderDriverEnds.set(viewer, Math.max(renderDriverEnds.get(viewer), endAt));
+            return;
+        }
+        renderDriverEnds.set(viewer, endAt);
+        const tick = () => {
+            var _a;
+            if ((_a = viewer.isDestroyed) === null || _a === void 0 ? void 0 : _a.call(viewer)) {
+                renderDriverEnds.delete(viewer);
+                return;
+            }
+            scene.requestRender();
+            if (Date.now() >= renderDriverEnds.get(viewer)) {
+                renderDriverEnds.delete(viewer);
+                return;
+            }
+            nextFrame(tick);
+        };
+        nextFrame(tick);
+    }
     function getColor(viewer, obj) {
         let value = null;
         if (obj === null || obj === void 0 ? void 0 : obj.getValue) {
@@ -1580,6 +1622,7 @@
                     this.durationMs = 0;
                 }
                 this.startTime = new Date();
+                requestRendersFor(this.viewer, this.durationMs);
             }
             IsDone() {
                 const now = new Date();
@@ -1631,12 +1674,14 @@
                 }
                 if (!this.paused) {
                     this.startTime = new Date();
+                    requestRendersFor(this.viewer, this.durationMs);
                 }
             }
             Play() {
                 if (this.paused) {
                     this.paused = false;
                     this.startTime = new Date();
+                    requestRendersFor(this.viewer, this.durationMs);
                 }
             }
             GetValue() {
@@ -1714,6 +1759,8 @@
             setMark(startColor, mark);
             setMark(color, mark);
             let startTime = new Date();
+            // A feature's colour change does not ask for a frame, the final one included.
+            requestRendersFor(viewer, durationMs);
             let removal = viewer.scene.postUpdate.addEventListener(() => {
                 if (!isFeatureAlive(viewer, feature)) {
                     removal === null || removal === void 0 ? void 0 : removal();
@@ -1785,6 +1832,7 @@
                     this.startPos3d = Cesium.Cartesian3.clone(this.targetPos3d);
                 }
                 this.startTime = new Date();
+                requestRendersFor(this.viewer, this.durationMs);
             }
             GetValue() {
                 const now = new Date();
@@ -1816,6 +1864,7 @@
                     this.startHeadingDeg = 0;
                 }
                 this.startTime = new Date();
+                requestRendersFor(this.viewer, this.durationMs);
             }
             IsDone() {
                 const now = new Date();
@@ -34147,6 +34196,18 @@
             return typeof ((_b = bSettings.camera) === null || _b === void 0 ? void 0 : _b.zoom) !== "number";
         }
         ViewRenderEngine.IsBookmarkSupported = IsBookmarkSupported;
+        /**
+         * Drops the view's default bookmark when it is not a Cesium scene, so the view renders without it.
+         * A bookmark the caller asked for by ID is kept.
+         */
+        function KeepDefaultBookmark(view, requestedId, bookmark) {
+            // Legacy views store a different bookmark shape.
+            if (requestedId || !bookmark || (view === null || view === void 0 ? void 0 : view.DataVersion) == 1) {
+                return bookmark;
+            }
+            return IsBookmarkSupported(bookmark) ? bookmark : null;
+        }
+        ViewRenderEngine.KeepDefaultBookmark = KeepDefaultBookmark;
         async function Render(params) {
             var _a, _b;
             if (!params.manager && params.viewer) {
@@ -34184,6 +34245,7 @@
                     viewId: params.viewId,
                     bookmarkId: bookmarkId
                 })).bookmark : null;
+                bookmark = KeepDefaultBookmark(view, params.bookmarkId, bookmark);
             }
             if (!assertIteration$1(params.viewer, iteration)) {
                 return;
@@ -34244,6 +34306,7 @@
                     viewId: params.viewId,
                     bookmarkId: bookmarkId
                 })).bookmark : null;
+                bookmark = KeepDefaultBookmark(view, params.bookmarkId, bookmark);
             }
             const viewer = params.manager.Viewer;
             const scene = viewer.scene;
@@ -50810,7 +50873,7 @@ void main() {
         StyleUtils.ApplyTypeStyle = ApplyTypeStyle;
     })(exports.StyleUtils || (exports.StyleUtils = {}));
 
-    const VERSION = "7.4.8";
+    const VERSION = "7.4.9";
     /**
      * Updates the environment instance used by bruce-cesium to one specified.
      * This can be used to ensure that the instance a parent is referencing is shared between bruce-cesium, bruce-models, and the parent app.