bruce-cesium 7.4.6 → 7.4.8

package/dist/bruce-cesium.umd.js

@@ -5814,6 +5814,9 @@
                 this.placementMemory = new PlacementMemory();
                 this.forwardingWheel = false;
                 this.pendingDrag = null;
+                // Null outside a 3D view.
+                this.horizon = null;
+                this.horizonScratch = new Cesium.Cartesian3();
                 this.TrackPointer = (event) => {
                     var _a, _b;
                     if (event.pointerType && event.pointerType !== "mouse" && event.pointerType !== "pen")
@@ -6001,9 +6004,45 @@
                     }
                 };
             }
+            /*
+             * Whether the globe hides a position; labels skip the depth test, so this is their only occluder.
+             */
+            IsBeyondHorizon(position) {
+                if (!this.horizon) {
+                    return false;
+                }
+                const { ellipsoid, camera, limbSquared } = this.horizon;
+                // Scaled space makes the ellipsoid a unit sphere.
+                const scaled = ellipsoid.transformPositionToScaledSpace(position, this.horizonScratch);
+                const magnitudeSquared = Cesium.Cartesian3.magnitudeSquared(scaled);
+                // Test sub-sea-level points from the surface.
+                if (magnitudeSquared > 0 && magnitudeSquared < 1) {
+                    Cesium.Cartesian3.normalize(scaled, scaled);
+                }
+                const toPoint = Cesium.Cartesian3.subtract(scaled, camera, scaled);
+                const along = -Cesium.Cartesian3.dot(toPoint, camera);
+                return along > limbSquared && along * along / Cesium.Cartesian3.magnitudeSquared(toPoint) > limbSquared;
+            }
+            UpdateHorizon() {
+                var _a, _b, _c;
+                const scene = this.viewer.scene;
+                const position = ((_a = scene === null || scene === void 0 ? void 0 : scene.camera) === null || _a === void 0 ? void 0 : _a.positionWC) || ((_b = scene === null || scene === void 0 ? void 0 : scene.camera) === null || _b === void 0 ? void 0 : _b.position);
+                this.horizon = null;
+                if ((scene === null || scene === void 0 ? void 0 : scene.mode) !== Cesium.SceneMode.SCENE3D || !Number.isFinite(position === null || position === void 0 ? void 0 : position.x)) {
+                    return;
+                }
+                const ellipsoid = ((_c = scene.globe) === null || _c === void 0 ? void 0 : _c.ellipsoid) || Cesium.Ellipsoid.WGS84;
+                const camera = ellipsoid.transformPositionToScaledSpace(position, new Cesium.Cartesian3());
+                const limbSquared = Cesium.Cartesian3.magnitudeSquared(camera) - 1;
+                // No horizon from underground.
+                if (limbSquared > 0) {
+                    this.horizon = { ellipsoid, camera, limbSquared };
+                }
+            }
             Update() {
                 var _a, _b;
                 this.coordinates = this.MeasureCoordinates();
+                this.UpdateHorizon();
                 const rect = (_b = (_a = this.viewer.canvas).getBoundingClientRect) === null || _b === void 0 ? void 0 : _b.call(_a);
                 const pointer = this.pointerClient;
                 this.pointer = pointer && (rect === null || rect === void 0 ? void 0 : rect.width) && (rect === null || rect === void 0 ? void 0 : rect.height) && pointer.x >= rect.left && pointer.x < rect.right && pointer.y >= rect.top && pointer.y < rect.bottom ?
@@ -6778,7 +6817,8 @@
                     // If we're labelling from a temp label (mouse hover) don't drive opacity by cam distance.
                     const hoverOnly = this.Transient && !this.Persistent;
                     if (!Number.isFinite(distance) || depth <= 0 || distance < ((_c = this.options.near) !== null && _c !== void 0 ? _c : 0) ||
-                        distance > ((_d = this.options.far) !== null && _d !== void 0 ? _d : Infinity) || (!this.prePositioned && !hoverOnly && distance >= MAX_DISTANCE)) {
+                        distance > ((_d = this.options.far) !== null && _d !== void 0 ? _d : Infinity) || (!this.prePositioned && !hoverOnly && distance >= MAX_DISTANCE) ||
+                        layer.IsBeyondHorizon(this._pos3d)) {
                         return null;
                     }
                     const transforms = Cesium.SceneTransforms;
@@ -31005,6 +31045,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;
@@ -31103,7 +31173,7 @@
                 if (this._viewId !== viewId) {
                     return;
                 }
-                this.bookmarks = data.bookmarks;
+                this.bookmarks = data.bookmarks.filter(exports.ViewRenderEngine.IsBookmarkSupported);
                 this.bookmarkGroups = groups;
             }
             catch (e) {
@@ -31225,6 +31295,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;
             }
@@ -31233,6 +31315,10 @@
                 filter: invert(1);
             }
 
+            .NextspaceLeftPanel >.NextspaceLeftPanelButton[is-enabled="true"] >.NextspaceLeftPanelButtonIcon >i {
+                color: #000;
+            }
+
             .NextspaceLeftPanel >.NextspaceLeftPanelButton[is-disabled="true"] {
                 opacity: .5;
                 pointer-events: none
@@ -31336,6 +31422,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";
@@ -31350,21 +31440,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 = () => {
@@ -34040,6 +34126,27 @@
         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;
         async function Render(params) {
             var _a, _b;
             if (!params.manager && params.viewer) {
@@ -34340,7 +34447,7 @@
                 if (counter != this.reloadCounter) {
                     return;
                 }
-                this.bookmarks = data.bookmarks;
+                this.bookmarks = data.bookmarks.filter(exports.ViewRenderEngine.IsBookmarkSupported);
             }
             catch (e) {
                 console.error(e);
@@ -50703,7 +50810,7 @@ void main() {
         StyleUtils.ApplyTypeStyle = ApplyTypeStyle;
     })(exports.StyleUtils || (exports.StyleUtils = {}));
 
-    const VERSION = "7.4.6";
+    const VERSION = "7.4.8";
     /**
      * 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.
@@ -50756,6 +50863,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;