bruce-cesium 5.6.8 → 5.7.0

package/dist/bruce-cesium.umd.js

@@ -13682,7 +13682,7 @@
              * @returns
              */
             async renderAsIndividuals(entities, force = false) {
-                var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+                var _a, _b, _c, _d, _e, _f, _g, _h;
                 // Entity ID -> historic records array.
                 // We load this as extra information when rendering historic records.
                 // This way we know what to animate towards as time changes.
@@ -13765,14 +13765,16 @@
                             entityId: id,
                             menuItemId: this.item.id
                         });
+                        // The baseline data source must be editable.
+                        const canEdit = !((_e = entity.Bruce.Outline) === null || _e === void 0 ? void 0 : _e.find(x => x.Baseline && !x.Editable));
                         const visual = rego === null || rego === void 0 ? void 0 : rego.visual;
                         if (!visual || visual != cEntity) {
                             const wasClustered = this.clustering ? this.clustering.AddEntity(id, cEntity, false) : false;
-                            const tagIds = (_e = entity.Bruce) === null || _e === void 0 ? void 0 : _e["Layer.ID"];
+                            const tagIds = entity.Bruce["Layer.ID"];
                             const rego = {
-                                canEdit: true,
+                                canEdit: canEdit,
                                 entityId: id,
-                                schema: (_f = entity.Bruce) === null || _f === void 0 ? void 0 : _f.Schema,
+                                schema: entity.Bruce.Schema,
                                 menuItemId: this.item.id,
                                 menuItemType: this.item.Type,
                                 visual: cEntity,
@@ -13783,7 +13785,7 @@
                                 overrideShow: wasClustered ? false : null,
                                 name: cEntity.name,
                                 cdn: this.item.cdnEnabled,
-                                outline: (_g = entity.Bruce) === null || _g === void 0 ? void 0 : _g.Outline
+                                outline: entity.Bruce.Outline
                             };
                             this.visualsManager.AddRego({
                                 rego,
@@ -13794,10 +13796,11 @@
                             rego.name = cEntity.name;
                             rego.visual = cEntity;
                             rego.entityTypeId = entity.Bruce["EntityType.ID"];
-                            rego.tagIds = ((_h = entity.Bruce) === null || _h === void 0 ? void 0 : _h["Layer.ID"]) ? [].concat(entity.Bruce["Layer.ID"]) : [];
-                            rego.outline = (_j = entity.Bruce) === null || _j === void 0 ? void 0 : _j.Outline;
+                            rego.tagIds = entity.Bruce["Layer.ID"] ? [].concat(entity.Bruce["Layer.ID"]) : [];
+                            rego.outline = (_f = entity.Bruce) === null || _f === void 0 ? void 0 : _f.Outline;
                             rego.cdn = this.item.cdnEnabled;
-                            rego.schema = (_k = entity.Bruce) === null || _k === void 0 ? void 0 : _k.Schema;
+                            rego.schema = (_g = entity.Bruce) === null || _g === void 0 ? void 0 : _g.Schema;
+                            rego.canEdit = canEdit;
                             // Marked as stale meaning some change was performed that requires a refresh.
                             // This usually means a new sibling was added that we need to update.
                             if (rego.stale) {
@@ -13827,7 +13830,7 @@
                             menuItemId: this.item.id,
                             requestRender: false
                         });
-                        (_l = this.clustering) === null || _l === void 0 ? void 0 : _l.RemoveEntity(id, false);
+                        (_h = this.clustering) === null || _h === void 0 ? void 0 : _h.RemoveEntity(id, false);
                     }
                 }
                 this.viewer.scene.requestRender();
@@ -25322,6 +25325,50 @@
     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 = Cesium.Cartesian3.fromDegrees(0, 0, 0);
+                    // Get the east-north-up (ENU) reference frame at the origin.
+                    const enuTransform = Cesium.Transforms.eastNorthUpToFixedFrame(originPosition);
+                    // Create the relative position.
+                    const relativePosition = new Cesium.Cartesian3(point.x, point.y, point.z);
+                    // Transform the relative position to the model's lat/lon/alt.
+                    const modelPosition = new Cesium.Cartesian3();
+                    Cesium.Matrix4.multiplyByPoint(enuTransform, relativePosition, modelPosition);
+                    // Convert the Cartesian3 position to lat/lon/alt.
+                    const carto = Cesium.Cartographic.fromCartesian(modelPosition);
+                    lat = Cesium.Math.toDegrees(carto.latitude);
+                    lon = Cesium.Math.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
@@ -25512,16 +25559,32 @@
             contentType = BModels.ProjectViewBookmark.EContentType.WEB_3D;
         }
         let camera = ((_d = bookmark === null || bookmark === void 0 ? void 0 : bookmark.Camera) !== null && _d !== void 0 ? _d : {});
-        if (!BModels.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 == BModels.ProjectViewBookmark.EContentType.WEB_3D_MODEL_SPACE) {
+            if (!BModels.Cartes.ValidateCartes3(camera)) {
+                camera = {
+                    altitude: 500,
+                    latitude: 0,
+                    longitude: 0,
+                    heading: 0,
+                    pitch: -90,
+                    roll: 0,
+                    cameraFrustum: BModels.Camera.EFrustum.Perspective,
+                    transition: 2000
+                };
+            }
+        }
+        else {
+            if (!BModels.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) {
@@ -25551,8 +25614,24 @@
                 // TODO: Need global default.
                 transition = 2000;
             }
-            if (BModels.Carto.ValidateCarto(camera)) {
-                const pos = Cesium.Cartesian3.fromDegrees(+camera.longitude, +camera.latitude, +camera.altitude);
+            let pos3d;
+            if (contentType == BModels.ProjectViewBookmark.EContentType.WEB_3D_MODEL_SPACE) {
+                if (BModels.Cartes.ValidateCartes3(camera)) {
+                    const point = modelSpaceToPosition(camera);
+                    if (point && BModels.Carto.ValidateCarto(point)) {
+                        pos3d = Cesium.Cartesian3.fromDegrees(+point.longitude, +point.latitude, +point.altitude);
+                    }
+                }
+                else if (BModels.Carto.ValidateCarto(camera)) {
+                    pos3d = Cesium.Cartesian3.fromDegrees(+camera.longitude, +camera.latitude, +camera.altitude);
+                }
+            }
+            else {
+                if (BModels.Carto.ValidateCarto(camera)) {
+                    pos3d = Cesium.Cartesian3.fromDegrees(+camera.longitude, +camera.latitude, +camera.altitude);
+                }
+            }
+            if (pos3d) {
                 if (
                 // Moving into model-space.
                 (contentType == BModels.ProjectViewBookmark.EContentType.WEB_3D_MODEL_SPACE) ||
@@ -25563,12 +25642,12 @@
                     if (!cameraPos3d || (cameraPos3d.x == 0 && cameraPos3d.y == 0 && cameraPos3d.z == 0)) {
                         transition = 0;
                     }
-                    else if (Cesium.Cartesian3.distance(cameraPos3d, pos) > 10000) {
+                    else if (Cesium.Cartesian3.distance(cameraPos3d, pos3d) > 10000) {
                         transition = 0;
                     }
                 }
                 scene.camera.flyTo({
-                    destination: pos,
+                    destination: pos3d,
                     orientation: {
                         heading: Cesium.Math.toRadians(+camera.heading),
                         pitch: Cesium.Math.toRadians(+camera.pitch),
@@ -26048,7 +26127,7 @@
          * @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 = exports.ViewerUtils.GetManager({
                     viewer: params.viewer,
@@ -26082,21 +26161,45 @@
             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
-                };
+            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 = BModels.ProjectViewBookmark.EContentType.WEB_3D;
+            }
+            let camera = ((_d = bookmark === null || bookmark === void 0 ? void 0 : bookmark.Camera) !== null && _d !== void 0 ? _d : {});
+            if (contentType == BModels.ProjectViewBookmark.EContentType.WEB_3D_MODEL_SPACE) {
+                if (!BModels.Cartes.ValidateCartes3(camera)) {
+                    camera = {
+                        altitude: 500,
+                        latitude: 0,
+                        longitude: 0,
+                        heading: 0,
+                        pitch: -90,
+                        roll: 0,
+                        cameraFrustum: BModels.Camera.EFrustum.Perspective,
+                        transition: 2000
+                    };
+                }
+            }
+            else {
+                if (!BModels.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.
@@ -26115,16 +26218,46 @@
             }
             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 (BModels.Carto.ValidateCarto(camera)) {
-                const pos = Cesium.Cartesian3.fromDegrees(+camera.longitude, +camera.latitude, +camera.altitude);
+            let pos3d;
+            if (contentType == BModels.ProjectViewBookmark.EContentType.WEB_3D_MODEL_SPACE) {
+                if (BModels.Cartes.ValidateCartes3(camera)) {
+                    const point = modelSpaceToPosition(camera);
+                    if (point && BModels.Carto.ValidateCarto(point)) {
+                        pos3d = Cesium.Cartesian3.fromDegrees(+point.longitude, +point.latitude, +point.altitude);
+                    }
+                }
+                else if (BModels.Carto.ValidateCarto(camera)) {
+                    pos3d = Cesium.Cartesian3.fromDegrees(+camera.longitude, +camera.latitude, +camera.altitude);
+                }
+            }
+            else {
+                if (BModels.Carto.ValidateCarto(camera)) {
+                    pos3d = Cesium.Cartesian3.fromDegrees(+camera.longitude, +camera.latitude, +camera.altitude);
+                }
+            }
+            if (pos3d) {
+                if (
+                // Moving into model-space.
+                (contentType == BModels.ProjectViewBookmark.EContentType.WEB_3D_MODEL_SPACE) ||
+                    // Moving away from model-space.
+                    // @ts-expect-error
+                    (contentType != BModels.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 (Cesium.Cartesian3.distance(cameraPos3d, pos3d) > 10000) {
+                        transition = 0;
+                    }
+                }
                 scene.camera.flyTo({
-                    destination: pos,
+                    destination: pos3d,
                     orientation: {
                         heading: Cesium.Math.toRadians(+camera.heading),
                         pitch: Cesium.Math.toRadians(+camera.pitch),
@@ -31857,7 +31990,7 @@
         }
     }
 
-    const VERSION = "5.6.8";
+    const VERSION = "5.7.0";
 
     exports.VERSION = VERSION;
     exports.isOutlineChanged = isOutlineChanged;