bruce-cesium 7.4.7 → 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();
@@ -31045,6 +31094,36 @@
 
     const VIEWER_LEFT_PANEL_WIDGET_KEY = "_viewerLeftPanelWidget";
     const VIEWER_LEFT_PANEL_CSS_VAR_LEFT = "--nextspace-left-panel-width";
+    // Size of a tab button's icon, and the drawing grid the built-in icons are authored on.
+    const TAB_ICON_SIZE = 32;
+    /**
+     * Builds a tab's svg icon, fitted to the button whatever grid it was drawn on.
+     */
+    function CreateTabIconSvg(icon) {
+        const SVG_NS = "http://www.w3.org/2000/svg";
+        const parsed = /<svg[\s>]/i.test(icon !== null && icon !== void 0 ? icon : "") ? new DOMParser().parseFromString(icon, "image/svg+xml") : null;
+        const root = parsed === null || parsed === void 0 ? void 0 : parsed.documentElement;
+        let svg;
+        if (root && root.localName === "svg" && !root.getElementsByTagName("parsererror").length) {
+            svg = document.importNode(root, true);
+            if (!svg.getAttribute("viewBox")) {
+                // Without one the drawing would not scale, so its own size becomes the grid.
+                const width = parseFloat(svg.getAttribute("width"));
+                const height = parseFloat(svg.getAttribute("height"));
+                if (width > 0 && height > 0) {
+                    svg.setAttribute("viewBox", `0 0 ${width} ${height}`);
+                }
+            }
+        }
+        else {
+            svg = document.createElementNS(SVG_NS, "svg");
+            svg.setAttribute("viewBox", `0 0 ${TAB_ICON_SIZE} ${TAB_ICON_SIZE}`);
+            svg.innerHTML = icon !== null && icon !== void 0 ? icon : "";
+        }
+        svg.setAttribute("width", String(TAB_ICON_SIZE));
+        svg.setAttribute("height", String(TAB_ICON_SIZE));
+        return svg;
+    }
     class WidgetLeftPanel extends exports.Widget.AWidget {
         get ViewId() {
             return this._viewId;
@@ -31143,7 +31222,7 @@
                 if (this._viewId !== viewId) {
                     return;
                 }
-                this.bookmarks = data.bookmarks;
+                this.bookmarks = data.bookmarks.filter(exports.ViewRenderEngine.IsBookmarkSupported);
                 this.bookmarkGroups = groups;
             }
             catch (e) {
@@ -31265,6 +31344,18 @@
                 cursor: pointer;
             }
 
+            .NextspaceLeftPanel >.NextspaceLeftPanelButton >.NextspaceLeftPanelButtonIcon >img {
+                display: block;
+                max-width: 100%;
+                max-height: 100%;
+                object-fit: contain;
+            }
+
+            .NextspaceLeftPanel >.NextspaceLeftPanelButton >.NextspaceLeftPanelButtonIcon >i {
+                color: #fff;
+                font-size: 18px;
+            }
+
             .NextspaceLeftPanel >.NextspaceLeftPanelButton[is-enabled="true"] >.NextspaceLeftPanelButtonIcon {
                 background-color: #fff;
             }
@@ -31273,6 +31364,10 @@
                 filter: invert(1);
             }
 
+            .NextspaceLeftPanel >.NextspaceLeftPanelButton[is-enabled="true"] >.NextspaceLeftPanelButtonIcon >i {
+                color: #000;
+            }
+
             .NextspaceLeftPanel >.NextspaceLeftPanelButton[is-disabled="true"] {
                 opacity: .5;
                 pointer-events: none
@@ -31376,6 +31471,10 @@
                 icon = params.iconImgUrl;
                 iconSource = "file-url";
             }
+            else if (params.iconFontClass) {
+                icon = params.iconFontClass;
+                iconSource = "font";
+            }
             else if (params.svgStr) {
                 icon = params.svgStr;
                 iconSource = "svg";
@@ -31390,21 +31489,17 @@
             const buttonBookmarksIcon = document.createElement("div");
             buttonBookmarksIcon.className = "NextspaceLeftPanelButtonIcon";
             if (iconSource == "svg") {
-                const buttonBookmarksIconSvg = document.createElementNS("http://www.w3.org/2000/svg", "svg");
-                buttonBookmarksIconSvg.setAttribute("viewBox", "0 0 32 32");
-                buttonBookmarksIconSvg.setAttribute("width", "32");
-                buttonBookmarksIconSvg.setAttribute("height", "32");
-                buttonBookmarksIconSvg.innerHTML = icon;
-                buttonBookmarksIcon.appendChild(buttonBookmarksIconSvg);
+                buttonBookmarksIcon.appendChild(CreateTabIconSvg(icon));
             }
             else if (iconSource == "file-url") {
                 const buttonBookmarksIconImg = document.createElement("img");
                 buttonBookmarksIconImg.src = icon;
                 buttonBookmarksIcon.appendChild(buttonBookmarksIconImg);
-                buttonBookmarksIcon.setAttribute("style", `
-                max-width: 32px;
-                max-height: 32px;
-            `);
+            }
+            else if (iconSource == "font") {
+                const buttonBookmarksIconFont = document.createElement("i");
+                buttonBookmarksIconFont.className = icon;
+                buttonBookmarksIcon.appendChild(buttonBookmarksIconFont);
             }
             tabButton.appendChild(buttonBookmarksIcon);
             tabButton.onclick = () => {
@@ -34080,6 +34175,39 @@
         scene.globe.depthTestAgainstTerrain = Boolean(gOcclusion);
     }
     (function (ViewRenderEngine) {
+        const SUPPORTED_CONTENT_TYPES = [
+            BModels.ProjectViewBookmark.EContentType.WEB_3D,
+            BModels.ProjectViewBookmark.EContentType.WEB_3D_MODEL_SPACE,
+            BModels.ProjectViewBookmark.EContentType.WEB_3D_SPLIT_PLUGIN
+        ];
+        /**
+         * Whether a bookmark is a Cesium scene this engine can render.
+         */
+        function IsBookmarkSupported(bookmark) {
+            var _a, _b;
+            if (!bookmark) {
+                return false;
+            }
+            const bSettings = ((_a = bookmark.Settings) !== null && _a !== void 0 ? _a : {});
+            if (bSettings.contentType) {
+                return SUPPORTED_CONTENT_TYPES.includes(bSettings.contentType);
+            }
+            // A bookmark ported from the 2D Navigator carries a zoom level rather than a 3D camera.
+            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) {
@@ -34117,6 +34245,7 @@
                     viewId: params.viewId,
                     bookmarkId: bookmarkId
                 })).bookmark : null;
+                bookmark = KeepDefaultBookmark(view, params.bookmarkId, bookmark);
             }
             if (!assertIteration$1(params.viewer, iteration)) {
                 return;
@@ -34177,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;
@@ -34380,7 +34510,7 @@
                 if (counter != this.reloadCounter) {
                     return;
                 }
-                this.bookmarks = data.bookmarks;
+                this.bookmarks = data.bookmarks.filter(exports.ViewRenderEngine.IsBookmarkSupported);
             }
             catch (e) {
                 console.error(e);
@@ -50743,7 +50873,7 @@ void main() {
         StyleUtils.ApplyTypeStyle = ApplyTypeStyle;
     })(exports.StyleUtils || (exports.StyleUtils = {}));
 
-    const VERSION = "7.4.7";
+    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.
@@ -50796,6 +50926,7 @@ void main() {
     exports.WidgetInfoView = WidgetInfoView;
     exports.VIEWER_LEFT_PANEL_WIDGET_KEY = VIEWER_LEFT_PANEL_WIDGET_KEY;
     exports.VIEWER_LEFT_PANEL_CSS_VAR_LEFT = VIEWER_LEFT_PANEL_CSS_VAR_LEFT;
+    exports.CreateTabIconSvg = CreateTabIconSvg;
     exports.WidgetLeftPanel = WidgetLeftPanel;
     exports.WidgetNavCompass = WidgetNavCompass$$1;
     exports.VIEWER_VIEW_BAR_WIDGET_KEY = VIEWER_VIEW_BAR_WIDGET_KEY;