bruce-cesium 5.8.7 → 5.8.9

package/dist/bruce-cesium.umd.js

@@ -3374,11 +3374,31 @@
         if (!worldPosition) {
             return null;
         }
-        let offset = new Cesium.Cartesian3(+worldPosition[0][3], +worldPosition[1][3], +worldPosition[2][3]);
+        let offset;
+        {
+            // Check if we have rotation/scale components (non-identity 3x3 upper-left matrix).
+            const hasRotationOrScale = Math.abs(+worldPosition[0][0] - 1) > 1e-6 || Math.abs(+worldPosition[0][1]) > 1e-6 || Math.abs(+worldPosition[0][2]) > 1e-6 ||
+                Math.abs(+worldPosition[1][0]) > 1e-6 || Math.abs(+worldPosition[1][1] - 1) > 1e-6 || Math.abs(+worldPosition[1][2]) > 1e-6 ||
+                Math.abs(+worldPosition[2][0]) > 1e-6 || Math.abs(+worldPosition[2][1]) > 1e-6 || Math.abs(+worldPosition[2][2] - 1) > 1e-6;
+            if (hasRotationOrScale) {
+                // Extract translation first.
+                const translation = new Cesium.Cartesian3(+worldPosition[0][3], +worldPosition[1][3], +worldPosition[2][3]);
+                // Extract rotation matrix.
+                const mawp = new Cesium.Matrix4(+worldPosition[0][0], +worldPosition[0][1], +worldPosition[0][2], +worldPosition[0][3], +worldPosition[1][0], +worldPosition[1][1], +worldPosition[1][2], +worldPosition[1][3], +worldPosition[2][0], +worldPosition[2][1], +worldPosition[2][2], +worldPosition[2][3], +worldPosition[3][0], +worldPosition[3][1], +worldPosition[3][2], +worldPosition[3][3]);
+                let rotmat = new Cesium.Matrix3();
+                rotmat = Cesium.Matrix4.getRotation(mawp, rotmat);
+                const inverseRotmat = Cesium.Matrix3.transpose(rotmat, new Cesium.Matrix3());
+                offset = Cesium.Matrix3.multiplyByVector(inverseRotmat, translation, new Cesium.Cartesian3());
+            }
+            // For translation-only matrices, extract translation directly.
+            else {
+                offset = new Cesium.Cartesian3(+worldPosition[0][3], +worldPosition[1][3], +worldPosition[2][3]);
+            }
+        }
         let heading = 0;
         let pitch = 0;
         let roll = 0;
-        {
+        if (!modelSpace) {
             const eTransform = entity.Bruce.Transform;
             if (eTransform) {
                 if (eTransform.heading) {
@@ -14861,6 +14881,14 @@
             get Disposed() {
                 return this.disposed;
             }
+            get EntityIds() {
+                var _a, _b;
+                return ((_b = (_a = this.item) === null || _a === void 0 ? void 0 : _a.BruceEntity) === null || _b === void 0 ? void 0 : _b.EntityIds) || [];
+            }
+            get ZoomControl() {
+                var _a;
+                return ((_a = this.item) === null || _a === void 0 ? void 0 : _a.CameraZoomSettings) || [];
+            }
             constructor(params) {
                 var _a;
                 this.getter = null;
@@ -14886,11 +14914,14 @@
                     this.clustering = new PointClustering(visualsManager, this.item.id, (_a = this.item) === null || _a === void 0 ? void 0 : _a.clustering);
                 }
             }
-            Init() {
+            Init(params) {
                 var _a, _b, _c;
                 if (this.disposed) {
                     throw (new Error("This item is disposed."));
                 }
+                if (params === null || params === void 0 ? void 0 : params.item) {
+                    this.item = params.item;
+                }
                 if (!((_a = this.item.CameraZoomSettings) === null || _a === void 0 ? void 0 : _a.length)) {
                     this.item.CameraZoomSettings = [
                         {
@@ -14907,19 +14938,19 @@
                 if (this.renderPriority == null) {
                     this.renderPriority = 2;
                 }
-                this.getter = new BatchedDataGetter.Getter(this.item.BruceEntity.EntityIds, this.monitor, BATCH_SIZE$2, 
-                // Don't emit the same Entity multiple times.
-                true);
-                this.getterSub = this.getter.OnUpdate.Subscribe((ids) => {
-                    this.onGetterUpdate(ids);
-                });
-                this.getter.Start();
+                if (!this.getter) {
+                    this.getter = new BatchedDataGetter.Getter(this.item.BruceEntity.EntityIds, this.monitor, BATCH_SIZE$2, 
+                    // Don't emit the same Entity multiple times.
+                    true);
+                    this.getterSub = this.getter.OnUpdate.Subscribe((ids) => {
+                        this.onGetterUpdate(ids);
+                    });
+                    this.getter.Start();
+                }
+                this.viewerDateTimeDispose();
                 if (((_b = this.item.BruceEntity) === null || _b === void 0 ? void 0 : _b.historic) || ((_c = this.item.BruceEntity) === null || _c === void 0 ? void 0 : _c.historicAttrKey)) {
                     this.viewerDateTimeSub();
                 }
-                else {
-                    this.viewerDateTimeDispose();
-                }
             }
             Dispose() {
                 if (this.disposed) {
@@ -16515,9 +16546,21 @@
             if (transform.scale <= 0) {
                 transform.scale = 0.000001;
             }
-            // If we're in model-space we'll just go at 0,0 lat/lon.
+            // If we're in model-space we'll just go at 0,0 lat/lon and no h/p/r from the coords.
             if (params.modelSpace) {
                 location = null;
+                transform = {
+                    heading: 0,
+                    pitch: 0,
+                    roll: 0,
+                    scale: EnsureNumber(transform.scale, 1),
+                    x: 0,
+                    y: 0,
+                    z: 0
+                };
+                if (transform.scale <= 0) {
+                    transform.scale = 0.000001;
+                }
             }
             /**
              * Very cursed.
@@ -19200,8 +19243,7 @@
     })(exports.DataLabRenderManager || (exports.DataLabRenderManager = {}));
 
     const MAX_BATCHES = 2;
-    const BATCH_SIZE_OLD_API = 30;
-    const BATCH_SIZE_NEW_API = 1000;
+    const BATCH_SIZE$3 = 1000;
     const BATCH_DELAY = 200;
     const MAX_RANGE = 3000;
     (function (TilesetOsmRenderManager) {
@@ -19215,6 +19257,12 @@
             get count() {
                 return ++this.counter;
             }
+            get SourceId() {
+                return this.sourceId;
+            }
+            get EntityTypeId() {
+                return this.entityTypeId;
+            }
             constructor(params) {
                 this.disposed = false;
                 this.cTileset = null;
@@ -19227,7 +19275,6 @@
                 this.queueCheckInterval = null;
                 this.processingQueue = 0;
                 this._osmIdToBruceId = {};
-                this.batchSize = BATCH_SIZE_OLD_API;
                 const { viewer, register: visualsManager, getters: apiGetter, monitor, item } = params;
                 this.viewer = viewer;
                 this.getters = apiGetter;
@@ -19259,12 +19306,22 @@
                 });
                 this.featureQueue = [];
             }
-            Init() {
+            Init(params) {
                 var _a, _b;
+                if (params === null || params === void 0 ? void 0 : params.item) {
+                    this.item = params.item;
+                }
                 const menuItem = this.item;
                 this.sourceId = EnsureNumber((_a = menuItem.BruceEntity) === null || _a === void 0 ? void 0 : _a.SourceId, 0);
                 this.entityTypeId = (_b = menuItem.BruceEntity) === null || _b === void 0 ? void 0 : _b["EntityType.ID"];
                 (async () => {
+                    if (this.disposed) {
+                        return;
+                    }
+                    else if (this.cTileset) {
+                        // Already exists, no need to re-initialize.
+                        return;
+                    }
                     const validToken = await exports.ViewerUtils.AssertIonToken(Cesium.Ion.defaultAccessToken);
                     if (!validToken) {
                         console.warn("'tileset-osm-render-manager.ts' could not locate a valid Cesium Ion token.");
@@ -19284,12 +19341,13 @@
                         console.warn("'tileset-osm-render-manager.ts' could not locate a create function for OSM buildings.");
                         return;
                     }
-                    // New API versions are way better at processing this request.
-                    const api = this.getters.GetBruceApi();
-                    await api.Loading;
-                    if (api.IsVersionAtLeast("1.0.5244")) {
-                        this.batchSize = BATCH_SIZE_NEW_API;
+                    // See if we already have a cTileset set.
+                    // Happens if we re-initialized in quick succession.
+                    if (this.cTileset) {
+                        cTileset.destroy();
+                        return;
                     }
+                    this.cTileset = cTileset;
                     if (this.disposed) {
                         if (this.cTileset && !this.cTileset.isDestroyed()) {
                             this.cTileset.destroy();
@@ -19297,7 +19355,6 @@
                         }
                         return;
                     }
-                    this.cTileset = cTileset;
                     if (this.sourceId) {
                         if (menuItem.ghostLoading == true) {
                             this.cTileset.style = new Cesium.Cesium3DTileStyle({
@@ -19401,7 +19458,7 @@
                                     const isClose = this.getIsVisualWithinRange(feature, MAX_RANGE);
                                     if (isClose) {
                                         batch.push(feature);
-                                        if (batch.length >= this.batchSize) {
+                                        if (batch.length >= BATCH_SIZE$3) {
                                             return batch;
                                         }
                                     }
@@ -19551,7 +19608,7 @@
                             delete this._loadedCesiumEntities[key];
                             this.totalLoaded -= 1;
                             removed += 1;
-                            if (removed >= this.batchSize) {
+                            if (removed >= BATCH_SIZE$3) {
                                 return true;
                             }
                         }
@@ -20823,9 +20880,33 @@
                     this.cTileset = null;
                 }
             }
-            Init() {
+            Init(params) {
+                if (this.disposed) {
+                    return;
+                }
+                if (params === null || params === void 0 ? void 0 : params.item) {
+                    this.item = params.item;
+                }
                 (async () => {
                     var _a;
+                    // If the tileset already exists then we just need to update the style.
+                    if (this.cTileset) {
+                        const colorCss = this.item.colorMask;
+                        if (colorCss) {
+                            this.cTileset.style = new Cesium.Cesium3DTileStyle({
+                                color: {
+                                    conditions: [
+                                        ["true", `color("${colorCss}")`]
+                                    ]
+                                }
+                            });
+                        }
+                        else {
+                            this.cTileset.style = undefined;
+                        }
+                        this.viewer.scene.requestRender();
+                        return;
+                    }
                     const CESIUM = Cesium;
                     if (!CESIUM.createGooglePhotorealistic3DTileset) {
                         console.warn("Cesium version does not support 'createGooglePhotorealistic3DTileset' so Google Photos tileset will not be rendered.");
@@ -22330,7 +22411,7 @@
                                     continue;
                                 }
                                 const pos3d = calcEntityLocation$1(entity, this.modelSpace);
-                                const orient = calcEntityOrientation(entity, pos3d);
+                                const orient = calcEntityOrientation(entity, pos3d, this.modelSpace);
                                 if (!pos3d || !orient) {
                                     continue;
                                 }
@@ -22348,9 +22429,15 @@
                                     position: pos3d,
                                     orientation: new Cesium.ConstantProperty(orient)
                                 });
+                                const geometryRadius = BModels.Entity.GetValue({
+                                    entity: entity,
+                                    path: ["Bruce", "GeometryRadius"]
+                                });
+                                cEntity.model["_radius"] = geometryRadius;
+                                cEntity.model["_radiusLoaded"] = true;
                                 this.visualsManager.AddRego({
                                     rego: {
-                                        canEdit: false,
+                                        canEdit: true,
                                         entityId: entity.Bruce.ID,
                                         menuItemId: this.item.id,
                                         menuItemType: this.item.Type,
@@ -22611,7 +22698,7 @@
         let heading = 0;
         let pitch = 0;
         let roll = 0;
-        {
+        if (!modelSpace) {
             const eTransform = entity.Bruce.Transform;
             if (eTransform) {
                 if (eTransform.heading) {
@@ -22633,12 +22720,29 @@
         pos3d = Cesium.Matrix4.multiplyByPoint(m1, transformedOffset, new Cesium.Cartesian3());
         return pos3d;
     }
-    function calcEntityOrientation(entity, pos3d) {
-        var _a, _b, _c;
+    function calcEntityOrientation(entity, pos3d, modelSpace) {
         if (!entity.Bruce || !pos3d) {
             return null;
         }
-        let hpr = Cesium.HeadingPitchRoll.fromDegrees(((_a = entity.Bruce.Transform) === null || _a === void 0 ? void 0 : _a.heading) || 90, ((_b = entity.Bruce.Transform) === null || _b === void 0 ? void 0 : _b.pitch) || 0, ((_c = entity.Bruce.Transform) === null || _c === void 0 ? void 0 : _c.roll) || 0);
+        // 0 or 90 for these?
+        let heading = 90;
+        let pitch = 0;
+        let roll = 0;
+        if (!modelSpace) {
+            const eTransform = entity.Bruce.Transform;
+            if (eTransform) {
+                if (eTransform.heading) {
+                    heading = eTransform.heading;
+                }
+                if (eTransform.pitch) {
+                    pitch = eTransform.pitch;
+                }
+                if (eTransform.roll) {
+                    roll = eTransform.roll;
+                }
+            }
+        }
+        let hpr = Cesium.HeadingPitchRoll.fromDegrees(EnsureNumber(heading), EnsureNumber(pitch), EnsureNumber(roll));
         let orientation = Cesium.Transforms.headingPitchRollQuaternion(pos3d, hpr);
         if (entity.Bruce.AssemblyWorldPosition) {
             // extract rot, scale
@@ -22727,7 +22831,7 @@
              * @returns
              */
             RenderItem(params) {
-                var _a, _b, _c, _d, _e;
+                var _a, _b, _c, _d, _e, _f, _g, _h;
                 if (this.viewer.isDestroyed()) {
                     return null;
                 }
@@ -22749,6 +22853,7 @@
                 }
                 let rItem = this.items.find(x => x.id == params.item.id);
                 let create = true;
+                // Item already exists so we'll check if we should re-create it.
                 if (rItem) {
                     // This means we're updating a tag menu item.
                     // Tag menu items have alternative states based on bookmark settings.
@@ -22797,18 +22902,76 @@
                             create = false;
                         }
                     }
+                    else if (rItem.type == BModels.MenuItem.EType.PointCloud && params.item.Type == BModels.MenuItem.EType.PointCloud) {
+                        if (rItem.renderManager) {
+                            create = false;
+                        }
+                    }
+                    else if (rItem.type == BModels.MenuItem.EType.ArbTileset && params.item.Type == BModels.MenuItem.EType.ArbTileset) {
+                        if (rItem.renderManager) {
+                            create = false;
+                        }
+                    }
+                    else if (rItem.type == BModels.MenuItem.EType.I3sTileset && params.item.Type == BModels.MenuItem.EType.I3sTileset) {
+                        if (rItem.renderManager) {
+                            create = false;
+                        }
+                    }
                     // Re-init in case model-space changed to geo-spatial or vice-versa.
                     else if (rItem.type == BModels.MenuItem.EType.Assembly && params.item.Type == BModels.MenuItem.EType.Assembly) {
                         if (rItem.renderManager && rItem.renderManager.ModelSpace == params.modelSpace) {
                             create = false;
                         }
                     }
+                    // Updating an existing Google photos tileset.
+                    // Eg: different color mask (opacity).
+                    else if (rItem.type == BModels.MenuItem.EType.GooglePhotoTileset && params.item.Type == BModels.MenuItem.EType.GooglePhotoTileset) {
+                        if (rItem.renderManager) {
+                            rItem.renderManager.Init({
+                                item: params.item
+                            });
+                            rItem.item = params.item;
+                            create = false;
+                        }
+                    }
+                    else if (rItem.type == BModels.MenuItem.EType.Osm && params.item.Type == BModels.MenuItem.EType.Osm) {
+                        // If the source is the same then we can re-use the render manager.
+                        const oRenderManager = rItem.renderManager;
+                        const oItem = params.item;
+                        if (oRenderManager && oItem) {
+                            if (+oRenderManager.SourceId == +((_b = oItem.BruceEntity) === null || _b === void 0 ? void 0 : _b.SourceId) && oRenderManager.EntityTypeId == ((_c = oItem.BruceEntity) === null || _c === void 0 ? void 0 : _c["EntityType.ID"])) {
+                                oRenderManager.Init({
+                                    item: oItem
+                                });
+                                rItem.item = params.item;
+                                create = false;
+                            }
+                        }
+                    }
+                    else if (rItem.type == BModels.MenuItem.EType.EntitiesIds && params.item.Type == BModels.MenuItem.EType.EntitiesIds) {
+                        // Checking for Entity IDs.
+                        const eIdsRenderManager = rItem.renderManager;
+                        const eIdsItem = params.item;
+                        if (eIdsRenderManager && eIdsItem) {
+                            const eEntityIds = eIdsRenderManager.EntityIds;
+                            const mEntityIds = (_d = eIdsItem.BruceEntity) === null || _d === void 0 ? void 0 : _d.EntityIds;
+                            const eEntityIdsStr = eEntityIds ? eEntityIds.join(",") : "";
+                            const mEntityIdsStr = mEntityIds ? mEntityIds.join(",") : "";
+                            if (eEntityIdsStr == mEntityIdsStr) {
+                                eIdsRenderManager.Init({
+                                    item: eIdsItem
+                                });
+                                rItem.item = params.item;
+                                create = false;
+                            }
+                        }
+                    }
                     else if (rItem.type != params.item.Type) {
                         create = true;
                     }
                     if (create) {
                         try {
-                            (_b = rItem.renderManager) === null || _b === void 0 ? void 0 : _b.Dispose();
+                            (_e = rItem.renderManager) === null || _e === void 0 ? void 0 : _e.Dispose();
                         }
                         catch (e) {
                             console.error(e);
@@ -22819,7 +22982,7 @@
                 if (create) {
                     if (!rItem) {
                         rItem = {
-                            id: (_c = params.item.id) !== null && _c !== void 0 ? _c : BModels.ObjectUtils.UId(),
+                            id: (_f = params.item.id) !== null && _f !== void 0 ? _f : BModels.ObjectUtils.UId(),
                             childIds: [],
                             item: params.item,
                             renderManager: null,
@@ -23018,8 +23181,8 @@
                         rItem.childIds.push(childId);
                     }
                 }
-                if (rItem.renderManager && !((_d = rItem.renderManager) === null || _d === void 0 ? void 0 : _d.Disposed)) {
-                    (_e = this.onUpdate) === null || _e === void 0 ? void 0 : _e.Trigger({ isEnabling: true, itemId: rItem.id });
+                if (rItem.renderManager && !((_g = rItem.renderManager) === null || _g === void 0 ? void 0 : _g.Disposed)) {
+                    (_h = this.onUpdate) === null || _h === void 0 ? void 0 : _h.Trigger({ isEnabling: true, itemId: rItem.id });
                 }
                 return rItem.id;
             }
@@ -30849,6 +31012,7 @@
         EMode["ShowAvailable"] = "AV";
         EMode["ShowImportantAndAvailable"] = "IMP_AV";
     })(EMode || (EMode = {}));
+    const DISPLAY_ASSEMBLY_INFO = false;
     const OPEN_STORAGE_KEY = "EntityViewSummary_open_";
     const EXCLUDED_PROPERTIES = ["Bruce", "geometry", "position", "boundaries"];
     function isAttributeImportant(mode, entity, path, field) {
@@ -31085,7 +31249,7 @@
                 flex-shrink: 1;
                 margin-top: 12px;
                 overflow: auto;
-                padding: 25px;
+                padding: 20px;
                 width: 100%;
             }
 
@@ -31096,32 +31260,42 @@
                 width: 100%;
             }
 
+            .NextspaceInfoViewLabel {
+                align-items: center;
+                column-gap: 8px;
+                display: flex;
+                flex-wrap: wrap;
+                margin-top: 12px;
+                max-width: 100%;
+                row-gap: 5px;
+                text-align: left;
+                white-space: nowrap;
+            }
+
             .NextspaceInfoViewName {
                 font-family: Arial;
                 font-style: normal;
                 font-weight: 400;
-                text-align: center;
-                width: 100%;
+                font-size: 12px;
+                letter-spacing: .05em;
                 color: #40c4ff;
-                font-size: 13px;
-                letter-spacing: .01em;
-                line-height: 16px;
-                margin-bottom: 5px;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                transition: .3s ease;
+                max-width: 100%;
+                width: 100%;
+                width: -webkit-max-content !important;
+                width: max-content !important;
             }
 
             .NextspaceInfoViewType {
                 font-family: Arial;
                 font-style: normal;
                 font-weight: 400;
-                text-align: center;
-                width: 100%;
-                color: #c1c7cd;
-                font-size: 10px;
+                font-size: 12px;
                 letter-spacing: .05em;
-                line-height: 10px;
-                margin-bottom: 12px;
-                -webkit-user-select: none;
-                user-select: none;
+                color: #fff;
+                opacity: .7;
             }
 
             .NextspaceInfoViewTitle {
@@ -31135,7 +31309,7 @@
                 -webkit-touch-callout: none;
                 -webkit-user-select: none;
                 user-select: none;
-                margin-top: 20px;
+                margin-top: 10px;
                 margin-bottom: 10px;
             }
 
@@ -31157,8 +31331,8 @@
 
             .NextspaceAttributesGroupToggle {
                 align-items: center;
-                background-color: #343a3f;
-                border: 1px solid #343a3f;
+                background-color: #293034;
+                border: 1px solid #494949;
                 border-radius: 5px;
                 cursor: pointer;
                 display: flex;
@@ -31177,13 +31351,11 @@
             .NextspaceAttributesGroupToggleIcon {
                 align-items: center;
                 display: flex;
-                height: 20px;
+                height: 15px;
                 justify-content: center;
-                margin-left: auto;
                 margin-right: 8px;
-                width: 20px;
-                cursor: pointer;
-                white-space: nowrap;
+                position: relative;
+                width: 15px;
             }
 
             .NextspaceAttributesGroup[is-opened="false"] .NextspaceAttributesGroupToggleIconOpened {
@@ -31279,6 +31451,40 @@
                 width: 100%;
                 user-select: none;
             }
+
+            .NextspaceInputRow {
+                display: flex;
+                flex-direction: row;
+                align-items: center;
+                margin-bottom: 4px;
+            }
+
+            .NextspaceInputRow > label {
+                flex-grow: 0;
+                flex-shrink: 0;
+                width: 120px;
+                margin-right: 5px;
+                color: #f2f4f8;
+                font-family: Arial;
+                font-size: 14px;
+                font-style: normal;
+                font-weight: 500;
+                line-height: 20px;
+            }
+
+            .NextspaceInputRow > input {
+                width: 100px;
+                flex-grow: 1;
+                flex-shrink: 1;
+                background-color: #121619;
+                border: 1px solid #434343;
+                border-radius: 5px;
+                display: flex;
+                height: 35px;
+                color: #fff;
+                font-size: 12px;
+                outline: none;
+            }
         `;
             document.head.appendChild(style);
         }
@@ -31317,13 +31523,16 @@
             const scrollBox = document.createElement("div");
             scrollBox.className = "NextspaceInfoViewScrollBox";
             content.appendChild(scrollBox);
+            const label = document.createElement("div");
+            label.className = "NextspaceInfoViewLabel";
+            scrollBox.appendChild(label);
             const name = document.createElement("div");
             name.className = "NextspaceInfoViewName";
-            scrollBox.appendChild(name);
+            label.appendChild(name);
             this._name = name;
             const type = document.createElement("div");
             type.className = "NextspaceInfoViewType";
-            scrollBox.appendChild(type);
+            label.appendChild(type);
             this._type = type;
             const imageContainer = document.createElement("div");
             imageContainer.className = "NextspaceDefaultImageContainer";
@@ -31333,11 +31542,6 @@
             scrollBox.appendChild(imageContainer);
             this._imageContainer = imageContainer;
             this._image = image;
-            const title = document.createElement("div");
-            title.className = "NextspaceInfoViewTitle";
-            title.innerText = "Details";
-            scrollBox.appendChild(title);
-            this._title = title;
             const summary = document.createElement("div");
             summary.className = "NextspaceInfoViewSummary";
             scrollBox.appendChild(summary);
@@ -31361,7 +31565,7 @@
             }
         }
         async _updateInfoView() {
-            var _a, _b, _c;
+            var _b, _c, _d;
             const selectedIds = this._manager.VisualsRegister.GetSelected();
             if (selectedIds.length <= 0) {
                 this._element.style.display = "none";
@@ -31377,9 +31581,8 @@
             }
             this._lastSelectedId = firstId;
             try {
-                this._title.style.display = "none";
                 this._flyTo.style.display = "none";
-                this._name.innerText = "Loading...";
+                this._name.innerText = "Loading..";
                 this._type.innerText = "";
                 this._summary.innerHTML = "";
                 this._imageContainer.style.display = "none";
@@ -31387,13 +31590,14 @@
                 const { entity } = await BModels.Entity.Get({
                     entityId: firstId,
                     api: api,
-                    migrated: true
+                    migrated: true,
+                    expandLocation: DISPLAY_ASSEMBLY_INFO
                 });
                 if (!entity) {
                     throw (new Error("Could not get entity."));
                 }
                 const { entityType } = await BModels.EntityType.Get({
-                    entityTypeId: (_a = entity.Bruce) === null || _a === void 0 ? void 0 : _a["EntityType.ID"],
+                    entityTypeId: (_b = entity.Bruce) === null || _b === void 0 ? void 0 : _b["EntityType.ID"],
                     api: api
                 });
                 let name = BModels.Entity.CalculateName({
@@ -31404,7 +31608,6 @@
                 if (!name) {
                     name = "Unnamed Entity";
                 }
-                this._title.style.display = "block";
                 this._flyTo.style.display = "flex";
                 this._name.innerText = name;
                 this._type.innerText = (entityType === null || entityType === void 0 ? void 0 : entityType.Name) ? entityType.Name : "Unknown type";
@@ -31424,9 +31627,13 @@
                     });
                     this._image.style.backgroundImage = `url(${url})`;
                 }
+                const detailsTitle = document.createElement("div");
+                detailsTitle.className = "NextspaceInfoViewTitle";
+                detailsTitle.innerText = "Details";
+                this._summary.appendChild(detailsTitle);
                 // TODO: Selection for what mode instead of always doing "all".
                 const attributes = gatherAttributes(EMode.ShowAll, entity, entityType);
-                const groups = groupAttributes(attributes, (_c = (_b = entityType.DataSchema) === null || _b === void 0 ? void 0 : _b.Structure) !== null && _c !== void 0 ? _c : []);
+                const groups = groupAttributes(attributes, (_d = (_c = entityType.DataSchema) === null || _c === void 0 ? void 0 : _c.Structure) !== null && _d !== void 0 ? _d : []);
                 for (const group of groups) {
                     this._generateAttrGroup(entityType, entity, group);
                 }
@@ -31434,7 +31641,7 @@
             catch (e) {
                 console.error(e);
                 this._name.innerText = "";
-                this._summary.innerHTML = "<p>Could not read entity information</p>";
+                this._summary.innerHTML = "<p>Could not read Entity information</p>";
             }
         }
         _generateAttrGroup(type, entity, group) {
@@ -31445,11 +31652,11 @@
                 const toggle = document.createElement("div");
                 toggle.className = "NextspaceAttributesGroupToggle";
                 toggle.innerHTML = `
-                ${group.group.Key}
                 <div class="NextspaceAttributesGroupToggleIcon">
                     <svg class="NextspaceAttributesGroupToggleIconOpened" width="16" height="9" viewBox="0 0 16 9" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M15 1L8 8L1 1" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"></path></svg>
-                    <svg class="NextspaceAttributesGroupToggleIconClosed" width="10" height="17" viewBox="0 0 10 17" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M8.5 15.5L1.5 8.5L8.5 1.5" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"></path></svg>
+                    <svg class="NextspaceAttributesGroupToggleIconClosed" width="10" height="17" viewBox="0 0 10 17" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M1.5 1.5L8.5 8.5L1.5 15.5" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"></path></svg>
                 </div>
+                ${group.group.Name ? group.group.Name : group.group.Key}
             `;
                 toggle.addEventListener("click", () => {
                     const isOpened = groupDiv.getAttribute("is-opened") == "true";
@@ -31459,17 +31666,24 @@
                 groupDiv.appendChild(toggle);
             }
             for (const attr of group.attributes) {
-                const attrDiv = this._generateAttr(groupDiv, type, entity, attr);
-                if (group.group.Key != "ROOT") {
-                    attrDiv.style.marginLeft = "12px";
-                }
+                this._generateAttr(groupDiv, type, entity, attr, group.group.Key != "ROOT");
             }
             this._summary.appendChild(groupDiv);
         }
-        _generateAttr(container, type, entity, path) {
+        _generateAttr(container, type, entity, path, nested) {
             var _a, _b, _c;
             const attrDiv = document.createElement("div");
             attrDiv.className = "NextspaceAttribute";
+            if (nested) {
+                const nestedIconStr = `
+                <svg width="11" height="13" viewBox="0 0 11 13" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M1 1V10C1 11.1046 1.89543 12 3 12H10" stroke="#4D5358" stroke-linecap="round" stroke-linejoin="round"></path></svg>
+            `;
+                const nestedIcon = document.createElement("div");
+                nestedIcon.style.marginLeft = "12px";
+                nestedIcon.style.marginRight = "5px";
+                nestedIcon.innerHTML = nestedIconStr;
+                attrDiv.appendChild(nestedIcon);
+            }
             const typeItem = digTypeItem(path, (_b = (_a = type.DataSchema) === null || _a === void 0 ? void 0 : _a.Structure) !== null && _b !== void 0 ? _b : []);
             const attrType = (_c = typeItem === null || typeItem === void 0 ? void 0 : typeItem.Type) !== null && _c !== void 0 ? _c : BModels.EntityAttribute.EType.String;
             const input = document.createElement("div");
@@ -32774,7 +32988,7 @@
         }
     }
 
-    const VERSION = "5.8.7";
+    const VERSION = "5.8.9";
 
     exports.VERSION = VERSION;
     exports.isOutlineChanged = isOutlineChanged;