bruce-cesium 5.8.8 → 5.8.9

package/dist/bruce-cesium.es5.js

@@ -3382,11 +3382,31 @@ function calcEntityLocation(entity, modelSpace) {
     if (!worldPosition) {
         return null;
     }
-    let offset = new 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 Cartesian3(+worldPosition[0][3], +worldPosition[1][3], +worldPosition[2][3]);
+            // Extract rotation matrix.
+            const mawp = new 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 Matrix3();
+            rotmat = Matrix4.getRotation(mawp, rotmat);
+            const inverseRotmat = Matrix3.transpose(rotmat, new Matrix3());
+            offset = Matrix3.multiplyByVector(inverseRotmat, translation, new Cartesian3());
+        }
+        // For translation-only matrices, extract translation directly.
+        else {
+            offset = new 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) {
@@ -16580,9 +16600,21 @@ var TilesetRenderEngine;
         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.
@@ -22455,7 +22487,7 @@ var AssemblyRenderManager;
                                 continue;
                             }
                             const pos3d = calcEntityLocation$1(entity, this.modelSpace);
-                            const orient = calcEntityOrientation(entity, pos3d);
+                            const orient = calcEntityOrientation(entity, pos3d, this.modelSpace);
                             if (!pos3d || !orient) {
                                 continue;
                             }
@@ -22473,9 +22505,15 @@ var AssemblyRenderManager;
                                 position: pos3d,
                                 orientation: new ConstantProperty(orient)
                             });
+                            const geometryRadius = Entity$1.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,
@@ -22736,7 +22774,7 @@ function calcEntityLocation$1(entity, modelSpace) {
     let heading = 0;
     let pitch = 0;
     let roll = 0;
-    {
+    if (!modelSpace) {
         const eTransform = entity.Bruce.Transform;
         if (eTransform) {
             if (eTransform.heading) {
@@ -22758,12 +22796,29 @@ function calcEntityLocation$1(entity, modelSpace) {
     pos3d = Matrix4.multiplyByPoint(m1, transformedOffset, new Cartesian3());
     return pos3d;
 }
-function calcEntityOrientation(entity, pos3d) {
-    var _a, _b, _c;
+function calcEntityOrientation(entity, pos3d, modelSpace) {
     if (!entity.Bruce || !pos3d) {
         return null;
     }
-    let hpr = 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 = HeadingPitchRoll.fromDegrees(EnsureNumber(heading), EnsureNumber(pitch), EnsureNumber(roll));
     let orientation = Transforms.headingPitchRollQuaternion(pos3d, hpr);
     if (entity.Bruce.AssemblyWorldPosition) {
         // extract rot, scale
@@ -31059,6 +31114,7 @@ var EMode;
     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) {
@@ -31295,7 +31351,7 @@ class WidgetInfoView extends Widget.AWidget {
                 flex-shrink: 1;
                 margin-top: 12px;
                 overflow: auto;
-                padding: 25px;
+                padding: 20px;
                 width: 100%;
             }
 
@@ -31306,32 +31362,42 @@ class WidgetInfoView extends Widget.AWidget {
                 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 {
@@ -31345,7 +31411,7 @@ class WidgetInfoView extends Widget.AWidget {
                 -webkit-touch-callout: none;
                 -webkit-user-select: none;
                 user-select: none;
-                margin-top: 20px;
+                margin-top: 10px;
                 margin-bottom: 10px;
             }
 
@@ -31367,8 +31433,8 @@ class WidgetInfoView extends Widget.AWidget {
 
             .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;
@@ -31387,13 +31453,11 @@ class WidgetInfoView extends Widget.AWidget {
             .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 {
@@ -31489,6 +31553,40 @@ class WidgetInfoView extends Widget.AWidget {
                 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);
     }
@@ -31527,13 +31625,16 @@ class WidgetInfoView extends Widget.AWidget {
         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";
@@ -31543,11 +31644,6 @@ class WidgetInfoView extends Widget.AWidget {
         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);
@@ -31571,7 +31667,7 @@ class WidgetInfoView extends Widget.AWidget {
         }
     }
     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";
@@ -31587,9 +31683,8 @@ class WidgetInfoView extends Widget.AWidget {
         }
         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";
@@ -31597,13 +31692,14 @@ class WidgetInfoView extends Widget.AWidget {
             const { entity } = await Entity$1.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 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 = Entity$1.CalculateName({
@@ -31614,7 +31710,6 @@ class WidgetInfoView extends Widget.AWidget {
             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";
@@ -31634,9 +31729,13 @@ class WidgetInfoView extends Widget.AWidget {
                 });
                 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);
             }
@@ -31644,7 +31743,7 @@ class WidgetInfoView extends Widget.AWidget {
         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) {
@@ -31655,11 +31754,11 @@ class WidgetInfoView extends Widget.AWidget {
             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";
@@ -31669,17 +31768,24 @@ class WidgetInfoView extends Widget.AWidget {
             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 : EntityAttribute.EType.String;
         const input = document.createElement("div");
@@ -32986,7 +33092,7 @@ class WidgetViewBar extends Widget.AWidget {
     }
 }
 
-const VERSION = "5.8.8";
+const VERSION = "5.8.9";
 
 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