bruce-cesium 5.6.9 → 5.7.1

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
 import { BruceEvent, Cartes, Entity as Entity$1, ProjectViewTile, Carto, Geometry, MathUtils, LRUCache, Api, Calculator, ClientFile, EntityTag, EntityType, ObjectUtils, Style, DelayQueue, EntityLod, Bounds, ZoomControl, EntityRelationType, ENVIRONMENT, EntityHistoricData, Tileset, EntityCoords, DataLab, EntitySource, MenuItem, EntityRelation, ProgramKey, ProjectView, ProjectViewBookmark, Camera, ProjectViewLegacyTile, EntityAttachment, EntityAttachmentType, EntityAttribute, AbstractApi, Session } from 'bruce-models';
 import * as Cesium from 'cesium';
-import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, Entity, DistanceDisplayCondition, ClassificationType, ArcType, CornerType, ShadowMode, ConstantProperty, ConstantPositionProperty, PolygonHierarchy, PolylineGraphics, ColorMaterialProperty, HorizontalOrigin, VerticalOrigin, ColorBlendMode, HeadingPitchRoll, Transforms, Model, Primitive, Cesium3DTileFeature, SceneMode, GeoJsonDataSource, Cesium3DTileStyle, Cesium3DTileColorBlendMode, HeadingPitchRange, Ion, KmlDataSource, Quaternion, Matrix3, Matrix4, OrthographicFrustum, EasingFunction, NearFarScalar, SceneTransforms, Cesium3DTileset, IonResource, EllipsoidTerrainProvider, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, CesiumInspector, defined, ClockRange, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, BoundingSphere, GeometryInstance, ScreenSpaceEventHandler, ScreenSpaceEventType, CzmlDataSource, Intersect, Fullscreen } from 'cesium';
+import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, Entity, DistanceDisplayCondition, HorizontalOrigin, VerticalOrigin, ConstantProperty, ClassificationType, ConstantPositionProperty, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, ColorMaterialProperty, ColorBlendMode, HeadingPitchRoll, Transforms, Model, Primitive, Cesium3DTileFeature, SceneMode, GeoJsonDataSource, Cesium3DTileStyle, Cesium3DTileColorBlendMode, HeadingPitchRange, Ion, KmlDataSource, Quaternion, Matrix3, Matrix4, SceneTransforms, OrthographicFrustum, EasingFunction, NearFarScalar, EllipsoidTerrainProvider, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, IonResource, Cesium3DTileset, CesiumInspector, defined, ClockRange, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, BoundingSphere, GeometryInstance, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, ScreenSpaceEventHandler, ScreenSpaceEventType, CzmlDataSource, Intersect, Fullscreen } from 'cesium';
 
 const TIME_LAG = 300;
 const POSITION_CHECK_TIMER = 950;
@@ -25420,6 +25420,50 @@ function newIteration$1(viewer) {
 function assertIteration$1(viewer, iteration) {
     return viewer[ITERATION_KEY$1] == iteration;
 }
+function modelSpaceToPosition(point) {
+    let lat = 0;
+    let lon = 0;
+    let alt = 0;
+    {
+        if (point) {
+            if (isNaN(point.x) || point.x == null) {
+                point.x = 0;
+            }
+            if (isNaN(point.y) || point.y == null) {
+                point.y = 0;
+            }
+            if (isNaN(point.z) || point.z == null) {
+                point.z = 0;
+            }
+        }
+        if (point && (point.x !== 0 || point.y !== 0 || point.z !== 0)) {
+            try {
+                // Create a reference position at 0,0,0 - matching the origin used in PositionToModelSpace.
+                const originPosition = Cartesian3.fromDegrees(0, 0, 0);
+                // Get the east-north-up (ENU) reference frame at the origin.
+                const enuTransform = Transforms.eastNorthUpToFixedFrame(originPosition);
+                // Create the relative position.
+                const relativePosition = new Cartesian3(point.x, point.y, point.z);
+                // Transform the relative position to the model's lat/lon/alt.
+                const modelPosition = new Cartesian3();
+                Matrix4.multiplyByPoint(enuTransform, relativePosition, modelPosition);
+                // Convert the Cartesian3 position to lat/lon/alt.
+                const carto = Cartographic.fromCartesian(modelPosition);
+                lat = Math$1.toDegrees(carto.latitude);
+                lon = Math$1.toDegrees(carto.longitude);
+                alt = carto.height;
+            }
+            catch (e) {
+                console.error("Error converting model space to position:", e);
+            }
+        }
+    }
+    return {
+        latitude: lat,
+        longitude: lon,
+        altitude: alt
+    };
+}
 /**
  * Renders DATA_VERSION = 1 navigator.
  * param iteration
@@ -25610,16 +25654,32 @@ async function renderNavigator(iteration, params, bookmark, view, getters) {
         contentType = ProjectViewBookmark.EContentType.WEB_3D;
     }
     let camera = ((_d = bookmark === null || bookmark === void 0 ? void 0 : bookmark.Camera) !== null && _d !== void 0 ? _d : {});
-    if (!Carto.ValidateCarto(camera)) {
-        camera = {
-            ...camera,
-            altitude: (_e = defaults.camera) === null || _e === void 0 ? void 0 : _e.altitude,
-            latitude: (_f = defaults.camera) === null || _f === void 0 ? void 0 : _f.latitude,
-            longitude: (_g = defaults.camera) === null || _g === void 0 ? void 0 : _g.longitude,
-            heading: (_h = defaults.camera) === null || _h === void 0 ? void 0 : _h.heading,
-            pitch: (_j = defaults.camera) === null || _j === void 0 ? void 0 : _j.pitch,
-            roll: (_k = defaults.camera) === null || _k === void 0 ? void 0 : _k.roll
-        };
+    if (contentType == ProjectViewBookmark.EContentType.WEB_3D_MODEL_SPACE) {
+        if (!Cartes.ValidateCartes3(camera) && !Carto.ValidateCarto(camera)) {
+            camera = {
+                altitude: 500,
+                latitude: 0,
+                longitude: 0,
+                heading: 0,
+                pitch: -90,
+                roll: 0,
+                cameraFrustum: Camera.EFrustum.Perspective,
+                transition: 2000
+            };
+        }
+    }
+    else {
+        if (!Carto.ValidateCarto(camera)) {
+            camera = {
+                ...camera,
+                altitude: (_e = defaults.camera) === null || _e === void 0 ? void 0 : _e.altitude,
+                latitude: (_f = defaults.camera) === null || _f === void 0 ? void 0 : _f.latitude,
+                longitude: (_g = defaults.camera) === null || _g === void 0 ? void 0 : _g.longitude,
+                heading: (_h = defaults.camera) === null || _h === void 0 ? void 0 : _h.heading,
+                pitch: (_j = defaults.camera) === null || _j === void 0 ? void 0 : _j.pitch,
+                roll: (_k = defaults.camera) === null || _k === void 0 ? void 0 : _k.roll
+            };
+        }
     }
     let newLens = camera.cameraFrustum;
     if (newLens == null) {
@@ -25649,8 +25709,24 @@ async function renderNavigator(iteration, params, bookmark, view, getters) {
             // TODO: Need global default.
             transition = 2000;
         }
-        if (Carto.ValidateCarto(camera)) {
-            const pos = Cartesian3.fromDegrees(+camera.longitude, +camera.latitude, +camera.altitude);
+        let pos3d;
+        if (contentType == ProjectViewBookmark.EContentType.WEB_3D_MODEL_SPACE) {
+            if (Cartes.ValidateCartes3(camera)) {
+                const point = modelSpaceToPosition(camera);
+                if (point && Carto.ValidateCarto(point)) {
+                    pos3d = Cartesian3.fromDegrees(+point.longitude, +point.latitude, +point.altitude);
+                }
+            }
+            else if (Carto.ValidateCarto(camera)) {
+                pos3d = Cartesian3.fromDegrees(+camera.longitude, +camera.latitude, +camera.altitude);
+            }
+        }
+        else {
+            if (Carto.ValidateCarto(camera)) {
+                pos3d = Cartesian3.fromDegrees(+camera.longitude, +camera.latitude, +camera.altitude);
+            }
+        }
+        if (pos3d) {
             if (
             // Moving into model-space.
             (contentType == ProjectViewBookmark.EContentType.WEB_3D_MODEL_SPACE) ||
@@ -25661,12 +25737,12 @@ async function renderNavigator(iteration, params, bookmark, view, getters) {
                 if (!cameraPos3d || (cameraPos3d.x == 0 && cameraPos3d.y == 0 && cameraPos3d.z == 0)) {
                     transition = 0;
                 }
-                else if (Cartesian3.distance(cameraPos3d, pos) > 10000) {
+                else if (Cartesian3.distance(cameraPos3d, pos3d) > 10000) {
                     transition = 0;
                 }
             }
             scene.camera.flyTo({
-                destination: pos,
+                destination: pos3d,
                 orientation: {
                     heading: Math$1.toRadians(+camera.heading),
                     pitch: Math$1.toRadians(+camera.pitch),
@@ -26147,7 +26223,7 @@ var ViewRenderEngine;
      * @param params
      */
     async function FlyTo(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
         if (!params.manager && params.viewer) {
             params.manager = ViewerUtils.GetManager({
                 viewer: params.viewer,
@@ -26181,21 +26257,45 @@ var ViewRenderEngine;
         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 (!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
-            };
+        const bSettings = ((_b = bookmark === null || bookmark === void 0 ? void 0 : bookmark.Settings) !== null && _b !== void 0 ? _b : {});
+        let contentType = bSettings.contentType;
+        if (!contentType && ((_c = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _c === void 0 ? void 0 : _c.contentType)) {
+            contentType = defaults.settings.contentType;
+        }
+        if (contentType == null) {
+            contentType = ProjectViewBookmark.EContentType.WEB_3D;
+        }
+        let camera = ((_d = bookmark === null || bookmark === void 0 ? void 0 : bookmark.Camera) !== null && _d !== void 0 ? _d : {});
+        if (contentType == ProjectViewBookmark.EContentType.WEB_3D_MODEL_SPACE) {
+            if (!Cartes.ValidateCartes3(camera) && !Carto.ValidateCarto(camera)) {
+                camera = {
+                    altitude: 500,
+                    latitude: 0,
+                    longitude: 0,
+                    heading: 0,
+                    pitch: -90,
+                    roll: 0,
+                    cameraFrustum: Camera.EFrustum.Perspective,
+                    transition: 2000
+                };
+            }
+        }
+        else {
+            if (!Carto.ValidateCarto(camera)) {
+                camera = {
+                    ...camera,
+                    altitude: (_e = defaults.camera) === null || _e === void 0 ? void 0 : _e.altitude,
+                    latitude: (_f = defaults.camera) === null || _f === void 0 ? void 0 : _f.latitude,
+                    longitude: (_g = defaults.camera) === null || _g === void 0 ? void 0 : _g.longitude,
+                    heading: (_h = defaults.camera) === null || _h === void 0 ? void 0 : _h.heading,
+                    pitch: (_j = defaults.camera) === null || _j === void 0 ? void 0 : _j.pitch,
+                    roll: (_k = defaults.camera) === null || _k === void 0 ? void 0 : _k.roll
+                };
+            }
         }
         let newLens = camera.cameraFrustum;
         if (newLens == null) {
-            newLens = (_j = defaults.camera) === null || _j === void 0 ? void 0 : _j.cameraFrustum;
+            newLens = (_l = defaults.camera) === null || _l === void 0 ? void 0 : _l.cameraFrustum;
         }
         if (newLens == null) {
             // TODO: Need global default.
@@ -26214,16 +26314,46 @@ var ViewRenderEngine;
         }
         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;
+            transition = (_m = defaults.camera) === null || _m === void 0 ? void 0 : _m.transition;
         }
         if (transition == null) {
             // TODO: Need global default.
             transition = 2000;
         }
-        if (Carto.ValidateCarto(camera)) {
-            const pos = Cartesian3.fromDegrees(+camera.longitude, +camera.latitude, +camera.altitude);
+        let pos3d;
+        if (contentType == ProjectViewBookmark.EContentType.WEB_3D_MODEL_SPACE) {
+            if (Cartes.ValidateCartes3(camera)) {
+                const point = modelSpaceToPosition(camera);
+                if (point && Carto.ValidateCarto(point)) {
+                    pos3d = Cartesian3.fromDegrees(+point.longitude, +point.latitude, +point.altitude);
+                }
+            }
+            else if (Carto.ValidateCarto(camera)) {
+                pos3d = Cartesian3.fromDegrees(+camera.longitude, +camera.latitude, +camera.altitude);
+            }
+        }
+        else {
+            if (Carto.ValidateCarto(camera)) {
+                pos3d = Cartesian3.fromDegrees(+camera.longitude, +camera.latitude, +camera.altitude);
+            }
+        }
+        if (pos3d) {
+            if (
+            // Moving into model-space.
+            (contentType == ProjectViewBookmark.EContentType.WEB_3D_MODEL_SPACE) ||
+                // Moving away from model-space.
+                // @ts-expect-error
+                (contentType != ProjectViewBookmark.EContentType.WEB_3D_MODEL_SPACE && viewer[MODEL_SPACE_FLAG] == true)) {
+                const cameraPos3d = viewer.camera.position;
+                if (!cameraPos3d || (cameraPos3d.x == 0 && cameraPos3d.y == 0 && cameraPos3d.z == 0)) {
+                    transition = 0;
+                }
+                else if (Cartesian3.distance(cameraPos3d, pos3d) > 10000) {
+                    transition = 0;
+                }
+            }
             scene.camera.flyTo({
-                destination: pos,
+                destination: pos3d,
                 orientation: {
                     heading: Math$1.toRadians(+camera.heading),
                     pitch: Math$1.toRadians(+camera.pitch),
@@ -31964,7 +32094,7 @@ class WidgetViewBar extends Widget.AWidget {
     }
 }
 
-const VERSION = "5.6.9";
+const VERSION = "5.7.1";
 
 export { VERSION, CesiumViewMonitor, ViewerUtils, ViewerEventTracker, MenuItemManager, isOutlineChanged, EntityRenderEngine, EntityRenderEnginePoint, EntityRenderEnginePolyline, EntityRenderEnginePolygon, EntityRenderEngineModel3d, MenuItemCreator, VisualsRegister, RenderManager, EntitiesIdsRenderManager, DataLabRenderManager, EntitiesLoadedRenderManager, EntitiesRenderManager, EntityRenderManager, TilesetCadRenderManager, TilesetArbRenderManager, TilesetEntitiesRenderManager, TilesetOsmRenderManager, TilesetPointcloudRenderManager, TilesetGooglePhotosRenderManager, DataSourceStaticKmlManager, GoogleSearchRenderManager, AssemblyRenderManager, RelationsRenderManager, SharedGetters, CesiumParabola, EntityLabel, ViewRenderEngine, TileRenderEngine, TilesetRenderEngine, CESIUM_INSPECTOR_KEY, CESIUM_TIMELINE_KEY, CESIUM_TIMELINE_LIVE_KEY, CESIUM_TIMELINE_LIVE_PADDING_KEY, CESIUM_TIMELINE_INTERVAL_KEY, DEFAULT_LIVE_PADDING_SECONDS, ViewUtils, DrawingUtils, MeasureUtils, EntityUtils, CesiumEntityStyler, CesiumAnimatedProperty, CesiumAnimatedInOut, Draw3dPolygon, Draw3dPolyline, MeasureCreator, Walkthrough, Widget, VIEWER_BOOKMARKS_WIDGET_KEY, WidgetBookmarks, WidgetBranding, WidgetCursorBar, WidgetEmbeddedInfoView, WidgetInfoView, WidgetNavCompass$$1 as WidgetNavCompass, VIEWER_VIEW_BAR_WIDGET_KEY, WidgetViewBar, WidgetControlViewBar, WidgetControlViewBarSearch, VIEWER_LEFT_PANEL_WIDGET_KEY, VIEWER_LEFT_PANEL_CSS_VAR_LEFT, WidgetLeftPanel, WidgetLeftPanelTab, WidgetLeftPanelTabBookmarks };
 //# sourceMappingURL=bruce-cesium.es5.js.map