bruce-cesium 5.5.2 → 5.5.4

package/dist/bruce-cesium.umd.js

@@ -9713,7 +9713,9 @@
                         lineEle.style.display = "none";
                         return;
                     }
-                    const lineStartPos2d = Cesium.SceneTransforms.wgs84ToWindowCoordinates(this.viewer.scene, this._pos3d);
+                    const CESIUM = Cesium;
+                    const _3dTo2D = Cesium.SceneTransforms.hasOwnProperty("wgs84ToWindowCoordinates") ? CESIUM.SceneTransforms.wgs84ToWindowCoordinates : CESIUM.SceneTransforms.worldToWindowCoordinates;
+                    const lineStartPos2d = _3dTo2D(this.viewer.scene, this._pos3d);
                     // Invalid point.
                     if (isNaN(lineStartPos2d === null || lineStartPos2d === void 0 ? void 0 : lineStartPos2d.x)) {
                         ele.style.transform = "";
@@ -9767,7 +9769,9 @@
                         }
                         lineEndPoint.height += addHeight;
                         lineEndPos3d = Cesium.Cartographic.toCartesian(lineEndPoint);
-                        let lineEndPos2d = Cesium.SceneTransforms.wgs84ToWindowCoordinates(this.viewer.scene, lineEndPos3d);
+                        const CESIUM = Cesium;
+                        const _3dTo2D = Cesium.SceneTransforms.hasOwnProperty("wgs84ToWindowCoordinates") ? CESIUM.SceneTransforms.wgs84ToWindowCoordinates : CESIUM.SceneTransforms.worldToWindowCoordinates;
+                        let lineEndPos2d = _3dTo2D(this.viewer.scene, lineEndPos3d);
                         // Invalid point.
                         if (isNaN(lineEndPos2d === null || lineEndPos2d === void 0 ? void 0 : lineEndPos2d.x)) {
                             ele.style.transform = "";
@@ -24021,8 +24025,28 @@
                         }
                         else if (tileset.type === BModels.Tileset.EType.ExternalTerrain) {
                             const settings = tileset.settings;
-                            url = settings.url;
                             vertexes = settings.requestVertexNormals == null ? true : settings.requestVertexNormals;
+                            if (!settings.terrainType || settings.terrainType === "Default") {
+                                url = settings.url;
+                            }
+                            else if (settings.terrainType == "CesiumIon") {
+                                const ionId = settings.externalId;
+                                const key = settings.key ? settings.key : await findKey(params.apiGetter, params.apiGetter.accountId, BModels.ProgramKey.EProgramId.CesiumIon);
+                                const resource = Cesium.IonResource.fromAssetId(Number(ionId), {
+                                    accessToken: key
+                                });
+                                if (Cesium.CesiumTerrainProvider.hasOwnProperty("fromUrl")) {
+                                    provider = await CESIUM.CesiumTerrainProvider.fromUrl(resource, {
+                                        requestVertexNormals: vertexes
+                                    });
+                                }
+                                else {
+                                    provider = new CESIUM.CesiumTerrainProvider({
+                                        url: resource,
+                                        requestVertexNormals: vertexes
+                                    });
+                                }
+                            }
                         }
                         else {
                             console.error("Invalid tileset type.", tileset);
@@ -25369,6 +25393,304 @@
         ViewRenderEngine.FlyTo = FlyTo;
     })(exports.ViewRenderEngine || (exports.ViewRenderEngine = {}));
 
+    class WidgetLeftPanelTabUser extends exports.WidgetLeftPanelTab.ATab {
+        constructor(params) {
+            super(params);
+            this.STYLESHEET_ID = "nextspace-left-panel-tab-user-stylesheet";
+            this.loadedSessionId = null;
+            this.user = null;
+            this.loaded = false;
+            this.loggingOut = false;
+            this.loggingIn = false;
+            this.inputUsername = null;
+            this.inputPassword = null;
+            this._generateStyles();
+            this._generateElement();
+            // In case another widget messed with the panel width.
+            // Probably should just add a SetWidth method to avoid having plugins mess with the container CSS.
+            if (this.Container) {
+                this.Container.style.width = "300px";
+            }
+            this.loadUser();
+            this.paramsChangeRemoval = BModels.ENVIRONMENT.OnParamsChange.Subscribe(() => {
+                this.loadUser();
+            });
+        }
+        async loadUser() {
+            if (this.loadedSessionId === BModels.ENVIRONMENT.PARAMS.sessionId) {
+                return;
+            }
+            let loadingSessionId = BModels.ENVIRONMENT.PARAMS.sessionId;
+            try {
+                this.user = null;
+                if (BModels.ENVIRONMENT.PARAMS.sessionId && BModels.ENVIRONMENT.PARAMS.sessionId !== "anonymous") {
+                    const { session } = await BModels.Session.Get({
+                        accountId: BModels.ENVIRONMENT.PARAMS.accountId,
+                        sessionId: loadingSessionId
+                    });
+                    if (loadingSessionId !== BModels.ENVIRONMENT.PARAMS.sessionId) {
+                        return;
+                    }
+                    this.user = session === null || session === void 0 ? void 0 : session.User;
+                }
+            }
+            catch (e) {
+                console.error(e);
+            }
+            finally {
+                if (loadingSessionId === BModels.ENVIRONMENT.PARAMS.sessionId) {
+                    this.loaded = true;
+                    this._generateElement();
+                }
+            }
+        }
+        /**
+         * Returns if the user can logout.
+         * If the session is part of URL, we don't want to show the logout button.
+         * @returns {boolean}
+         */
+        canLogout() {
+            if (!this.user || this.user.ID === "anonymous") {
+                return false;
+            }
+            const url = new URL(window.location.href);
+            let sessionId = url.searchParams.get("sessionId");
+            if (!sessionId) {
+                sessionId = url.searchParams.get("ssid");
+            }
+            if (sessionId) {
+                return false;
+            }
+            return true;
+        }
+        async logout() {
+            if (this.loggingOut) {
+                return;
+            }
+            else if (!this.canLogout()) {
+                return;
+            }
+            try {
+                await BModels.Session.Logout({});
+                BModels.ENVIRONMENT.SetPageLoadSessionId(null);
+            }
+            catch (e) {
+                console.error(e);
+            }
+            window.location.reload();
+        }
+        Dispose() {
+            super.Dispose();
+            if (this.paramsChangeRemoval) {
+                this.paramsChangeRemoval();
+                this.paramsChangeRemoval = null;
+            }
+        }
+        _generateStyles() {
+            if (document.getElementById(this.STYLESHEET_ID)) {
+                return;
+            }
+            const style = document.createElement("style");
+            style.id = this.STYLESHEET_ID;
+            style.innerHTML = `
+            .NextspaceLeftPanelTabUser * {
+                box-sizing: border-box;
+                font-family: Arial;
+                font-size: 13px;
+            }
+
+            .NextspaceLeftPanelTabUser {
+                display: flex;
+                flex-direction: column;
+                flex-grow: 1;
+                flex-shrink: 1;
+                overflow: hidden;
+                width: 100%;
+                box-sizing: border-box;
+            }
+
+            .NextspaceLeftPanelTabUser >.NextspaceLeftPanelTabUserTitleBar {
+                align-items: center;
+                color: #fff;
+                display: flex;
+                font-size: 17px;
+                font-style: normal;
+                font-weight: 500;
+                justify-content: center;
+                letter-spacing: -.005em;
+                line-height: 20px;
+                margin-bottom: 15px;
+                font-family: Arial;
+            }
+
+            .NextspaceLeftPanelTabUser >.NextspaceLeftPanelTabUserTitleBreaker {
+                background-color: #000;
+                flex-shrink: 0;
+                height: 2px;
+                margin-bottom: 15px;
+            }
+
+            .NextspaceLeftPanelTabUser >.NextspaceLeftPanelTabUserInputRow {
+                display: flex;
+                flex-direction: row;
+                align-items: center;
+                margin-bottom: 8px;
+                width: 100%;
+            }
+
+            .NextspaceLeftPanelTabUser >.NextspaceLeftPanelTabUserInputRow >label {
+                width: 90px;
+                flex-shrink: 0;
+                margin-right: 8px;
+                color: white;
+            }
+
+            .NextspaceLeftPanelTabUser >.NextspaceLeftPanelTabUserInputRow >input {
+                flex-grow: 1;
+                max-width: 220px;
+
+                background-color: #121619;
+                border: 1px solid #ffffff36;
+                color: #fff;
+                flex-grow: 1;
+                flex-shrink: 1;
+                height: 30px;
+                text-align: left;
+                border-radius: .375rem;
+                outline: none;
+                padding: .5rem .75rem;
+                box-sizing: border-box;
+                width: 10px;
+            }
+
+            .NextspaceLeftPanelTabUser button {
+                cursor: pointer;
+                border-radius: .375rem;
+                padding: 4px 9px;
+                transition: opacity 0.3s ease;
+                width: 100px;
+                width: min-content;
+                height: min-content;
+                white-space: nowrap;
+                border: 1px solid grey;
+                color: black;
+                background-color: white;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                position: relative;
+                background-color: #0072c3;
+                border: 1px solid #0072c3;
+                color: white;
+
+                margin-left: auto;
+            }
+        `;
+            document.head.appendChild(style);
+        }
+        _generateElement() {
+            var _a, _b;
+            if ((_a = this._element) === null || _a === void 0 ? void 0 : _a.parentElement) {
+                this._element.parentElement.removeChild(this._element);
+            }
+            this._element = null;
+            const element = document.createElement("div");
+            element.className = "NextspaceLeftPanelTabUser";
+            const title = document.createElement("div");
+            title.className = "NextspaceLeftPanelTabUserTitleBar";
+            title.textContent = this.loaded ? (this.user ? ((_b = this.user.FullName) !== null && _b !== void 0 ? _b : "#" + this.user.ID) : "Guest") : "Loading..";
+            element.appendChild(title);
+            const breaker = document.createElement("div");
+            breaker.className = "NextspaceLeftPanelTabUserTitleBreaker";
+            element.appendChild(breaker);
+            if (!this.user || this.user.ID === "anonymous") {
+                {
+                    const inputRow = document.createElement("div");
+                    inputRow.className = "NextspaceLeftPanelTabUserInputRow";
+                    const label = document.createElement("label");
+                    label.textContent = "Username";
+                    inputRow.appendChild(label);
+                    const input = document.createElement("input");
+                    input.type = "text";
+                    input.placeholder = "...";
+                    this.inputUsername = input;
+                    inputRow.appendChild(this.inputUsername);
+                    element.appendChild(inputRow);
+                }
+                {
+                    const inputRow = document.createElement("div");
+                    inputRow.className = "NextspaceLeftPanelTabUserInputRow";
+                    const label = document.createElement("label");
+                    label.textContent = "Password";
+                    inputRow.appendChild(label);
+                    const input = document.createElement("input");
+                    input.type = "password";
+                    input.placeholder = "...";
+                    this.inputPassword = input;
+                    inputRow.appendChild(this.inputPassword);
+                    element.appendChild(inputRow);
+                }
+                {
+                    const button = document.createElement("button");
+                    button.textContent = "Login";
+                    button.onclick = async () => {
+                        var _a, _b, _c, _d, _e, _f;
+                        if (this.loggingIn) {
+                            return;
+                        }
+                        button.style.opacity = "0.7";
+                        this.loggingIn = true;
+                        try {
+                            const { session } = await BModels.Session.Login({
+                                accountId: BModels.ENVIRONMENT.PARAMS.accountId,
+                                username: (_b = (_a = this.inputUsername) === null || _a === void 0 ? void 0 : _a.value) !== null && _b !== void 0 ? _b : "",
+                                password: (_d = (_c = this.inputPassword) === null || _c === void 0 ? void 0 : _c.value) !== null && _d !== void 0 ? _d : ""
+                            });
+                            BModels.ENVIRONMENT.SetPageLoadSessionId((_e = session === null || session === void 0 ? void 0 : session.ID) !== null && _e !== void 0 ? _e : null);
+                            BModels.ENVIRONMENT.Reset({
+                                accountId: BModels.ENVIRONMENT.PARAMS.accountId,
+                                sessionId: (_f = (session === null || session === void 0 ? void 0 : session.ID)) !== null && _f !== void 0 ? _f : null,
+                            });
+                            window.location.reload();
+                        }
+                        catch (e) {
+                            console.error(e);
+                        }
+                        finally {
+                            this.loggingIn = false;
+                            button.style.opacity = "1";
+                        }
+                    };
+                    element.appendChild(button);
+                }
+            }
+            else {
+                if (this.canLogout()) {
+                    const button = document.createElement("button");
+                    button.textContent = "Logout";
+                    button.onclick = async () => {
+                        if (this.loggingOut) {
+                            return;
+                        }
+                        button.style.opacity = "0.7";
+                        try {
+                            this.logout();
+                        }
+                        catch (e) {
+                            console.error(e);
+                        }
+                        finally {
+                            button.style.opacity = "1";
+                        }
+                    };
+                    element.appendChild(button);
+                }
+            }
+            this.Container.appendChild(element);
+            this._element = element;
+        }
+    }
+
     const VIEWER_LEFT_PANEL_WIDGET_KEY = "_viewerLeftPanelWidget";
     const VIEWER_LEFT_PANEL_CSS_VAR_LEFT = "--nextspace-left-panel-width";
     class WidgetLeftPanel extends exports.Widget.AWidget {
@@ -25737,6 +26059,7 @@
             </svg>
         `;
             buttonBookmarksIcon.innerHTML = LOGGED_OUT_ICON;
+            buttonBookmarksIcon.style.cursor = "pointer";
             tabButton.appendChild(buttonBookmarksIcon);
             this._element.appendChild(tabButton);
             function getInitials(name) {
@@ -25794,6 +26117,16 @@
                     buttonBookmarksIcon.innerHTML = LOGGED_OUT_ICON;
                 }
             }
+            buttonBookmarksIcon.onclick = () => {
+                if (this._enabledPanelTab === "user") {
+                    this._enabledPanelTab = "";
+                }
+                else {
+                    this._enabledPanelTab = "user";
+                }
+                this._updatePanelContent();
+                this._updatePanelStyles();
+            };
             if (this.envSubRemoval) {
                 this.envSubRemoval();
                 this.envSubRemoval = null;
@@ -25843,6 +26176,12 @@
                             container: container
                         });
                         break;
+                    case "user":
+                        tabContent = new WidgetLeftPanelTabUser({
+                            widget: this,
+                            container: container
+                        });
+                        break;
                     default:
                         if (this.customTabs.has(this._enabledPanelTab) === false) {
                             console.error(`Tab ${this._enabledPanelTab} not found.`);
@@ -30782,7 +31121,7 @@
         }
     }
 
-    const VERSION = "5.5.2";
+    const VERSION = "5.5.4";
 
     exports.VERSION = VERSION;
     exports.isHistoricMetadataChanged = isHistoricMetadataChanged;