bruce-cesium 5.3.2 → 5.3.4

package/dist/bruce-cesium.umd.js

@@ -1537,12 +1537,12 @@
                     storeColor(key, color, graphic);
                 }
             }
-            else if (key == "select") {
-                color = _selectColor;
-            }
             else if (key == "highlight") {
                 color = _highlightColor;
             }
+            else if (key == "select") {
+                color = _selectColor;
+            }
         }
         return color;
     }
@@ -1568,19 +1568,19 @@
         var _a, _b;
         // Calculate what color key we should apply.
         let key = "default";
-        if (getKeyState(graphic, "select")) {
-            key = "select";
-        }
-        else if (getKeyState(graphic, "highlight")) {
+        if (getKeyState(graphic, "highlight")) {
             key = "highlight";
         }
+        else if (getKeyState(graphic, "select")) {
+            key = "select";
+        }
         // This ensures that the default color is always stored prior to applying a new color.
         if (key != "default") {
             getColor$1(viewer, "default", graphic);
         }
         let color = (_a = getColor$1(viewer, key, graphic)) !== null && _a !== void 0 ? _a : Cesium.Color.WHITE;
-        // If we're highlighting and it's selected, don't change the color.
-        if (key != "highlight" || getKeyState(graphic, "select") == false) {
+        // If we're selecting and it's highlighted, don't change the color.
+        if (key != "select" || getKeyState(graphic, "highlight") == false) {
             let animateMs = key == "highlight" ? ANIMATE_COLOR_HIGHLIGHT_MS : ANIMATE_COLOR_MS;
             color = color.clone();
             // Multiply opacity if one is set.
@@ -1731,12 +1731,12 @@
     }
     (function (CesiumEntityStyler) {
         function UpdateColorSetting(key, color) {
-            if (key == "select") {
-                _selectColor = color.clone();
-            }
-            else if (key == "highlight") {
+            if (key == "highlight") {
                 _highlightColor = color.clone();
             }
+            else if (key == "select") {
+                _selectColor = color.clone();
+            }
         }
         CesiumEntityStyler.UpdateColorSetting = UpdateColorSetting;
         function Refresh(params) {
@@ -10667,18 +10667,7 @@
                 return state.isolated === true;
             }
             GetIsIsolatedAny() {
-                const entityIds = Object.keys(this.states);
-                for (let i = 0; i < entityIds.length; i++) {
-                    const state = this.states[entityIds[i]];
-                    const menuItemIds = state ? Object.keys(state) : [];
-                    for (let j = 0; j < menuItemIds.length; j++) {
-                        const menuItemId = menuItemIds[j];
-                        if (state[menuItemId].isolated) {
-                            return true;
-                        }
-                    }
-                }
-                return false;
+                return Object.values(this.states).some(state => state && Object.values(state).some(item => item.isolated));
             }
             /**
              * @deprecated Use GetStates() or GetState().
@@ -24495,6 +24484,100 @@
             }
         }
         ViewRenderEngine.Render = Render;
+        /**
+         * Moves the camera to a given view + bookmark.
+         * @param params
+         */
+        async function FlyTo(params) {
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+            if (!params.manager && params.viewer) {
+                params.manager = exports.ViewerUtils.GetManager({
+                    viewer: params.viewer,
+                    createIfMissing: true
+                });
+            }
+            else if (!params.viewer && params.manager) {
+                params.viewer = params.manager.Viewer;
+            }
+            if (!params.getters) {
+                params.getters = BModels.ENVIRONMENT.Api();
+            }
+            const api = params.getters.GetBruceApi();
+            const view = params.view ? params.view : (await BModels.ProjectView.Get({
+                api,
+                viewId: params.viewId
+            })).view;
+            let bookmark = params.bookmark;
+            if (!bookmark) {
+                let bookmarkId = params.bookmarkId;
+                if (!bookmarkId) {
+                    bookmarkId = view.DefaultUISlideID;
+                }
+                bookmark = bookmarkId ? (await BModels.ProjectViewBookmark.Get({
+                    api,
+                    viewId: params.viewId,
+                    bookmarkId: bookmarkId
+                })).bookmark : null;
+            }
+            const viewer = params.manager.Viewer;
+            const scene = viewer.scene;
+            const vSettings = view.Settings;
+            const defaults = (_a = vSettings.defaults) !== null && _a !== void 0 ? _a : {};
+            let camera = ((_b = bookmark === null || bookmark === void 0 ? void 0 : bookmark.Camera) !== null && _b !== void 0 ? _b : {});
+            if (!BModels.Carto.ValidateCarto(camera)) {
+                camera = {
+                    ...camera,
+                    altitude: (_c = defaults.camera) === null || _c === void 0 ? void 0 : _c.altitude,
+                    latitude: (_d = defaults.camera) === null || _d === void 0 ? void 0 : _d.latitude,
+                    longitude: (_e = defaults.camera) === null || _e === void 0 ? void 0 : _e.longitude,
+                    heading: (_f = defaults.camera) === null || _f === void 0 ? void 0 : _f.heading,
+                    pitch: (_g = defaults.camera) === null || _g === void 0 ? void 0 : _g.pitch,
+                    roll: (_h = defaults.camera) === null || _h === void 0 ? void 0 : _h.roll
+                };
+            }
+            let newLens = camera.cameraFrustum;
+            if (newLens == null) {
+                newLens = (_j = defaults.camera) === null || _j === void 0 ? void 0 : _j.cameraFrustum;
+            }
+            if (newLens == null) {
+                // TODO: Need global default.
+                newLens = BModels.Camera.EFrustum.Perspective;
+            }
+            const shouldBe2d = newLens == BModels.Camera.EFrustum.Orthographic;
+            const curIs2d = exports.ViewUtils.Get2dStatus({
+                viewer
+            });
+            if (shouldBe2d != curIs2d) {
+                exports.ViewUtils.Set2dStatus({
+                    status: shouldBe2d,
+                    viewer,
+                    moveCamera: false
+                });
+            }
+            let transition = params.skipTransition ? 0 : shouldBe2d === curIs2d ? camera.transition : 0;
+            if (transition == null) {
+                transition = (_k = defaults.camera) === null || _k === void 0 ? void 0 : _k.transition;
+            }
+            if (transition == null) {
+                // TODO: Need global default.
+                transition = 2000;
+            }
+            if (BModels.Carto.ValidateCarto(camera)) {
+                const pos = Cesium.Cartesian3.fromDegrees(+camera.longitude, +camera.latitude, +camera.altitude);
+                scene.camera.flyTo({
+                    destination: pos,
+                    orientation: {
+                        heading: Cesium.Math.toRadians(+camera.heading),
+                        pitch: Cesium.Math.toRadians(+camera.pitch),
+                        roll: Cesium.Math.toRadians(+camera.roll)
+                    },
+                    duration: transition != 0 ? transition / 1000 : 0,
+                    // Make it ease in and out.
+                    easingFunction: Cesium.EasingFunction.CUBIC_IN_OUT
+                });
+            }
+        }
+        ViewRenderEngine.FlyTo = FlyTo;
     })(exports.ViewRenderEngine || (exports.ViewRenderEngine = {}));
 
     const VIEWER_LEFT_PANEL_WIDGET_KEY = "_viewerLeftPanelWidget";
@@ -29910,7 +29993,7 @@
         }
     }
 
-    const VERSION = "5.3.2";
+    const VERSION = "5.3.4";
 
     exports.VERSION = VERSION;
     exports.isHistoricMetadataChanged = isHistoricMetadataChanged;