bruce-cesium 6.5.4 → 6.5.6

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
-import { Cartes, Entity as Entity$1, Calculator, EntityRelationType, EntityType, Style, ENVIRONMENT, ProjectViewTile, DelayQueue, LRUCache, BruceEvent, ObjectUtils, Geometry, EntityHistoricData, EntityLod, ZoomControl, EntityTag, Tileset, Api, EntityCoords, DataLab, EntitySource, ClientFile, MenuItem, EntityRelation, ProgramKey, Bounds, Carto, ProjectView, ProjectViewBookmark, ProjectViewLegacyTile, Camera, AbstractApi, EntityAttachment, EntityAttachmentType, EntityAttribute, MathUtils, Session } from 'bruce-models';
+import { Cartes, Entity as Entity$1, Calculator, EntityRelationType, EntityType, Style, ENVIRONMENT, ProjectViewTile, DelayQueue, LRUCache, BruceEvent, ObjectUtils, Geometry, EntityHistoricData, EntityLod, ZoomControl, EntityTag, Tileset, Api, EntityCoords, DataLab, EntitySource, ClientFile, MenuItem, EntityRelation, ProgramKey, Bounds, Carto, ProjectView, ProjectViewBookmark, Camera, ProjectViewLegacyTile, AbstractApi, EntityAttachment, EntityAttachmentType, EntityAttribute, MathUtils, Session } from 'bruce-models';
 import * as Cesium from 'cesium';
-import { Cartographic, ColorMaterialProperty, Color, Math as Math$1, Cartesian3, JulianDate, Quaternion, Transforms, HeadingPitchRoll, Matrix4, Entity, DistanceDisplayCondition, ConstantProperty, CallbackProperty, Primitive, Cesium3DTileFeature, HeightReference, ColorBlendMode, ShadowMode, ClassificationType, Model, PolygonHierarchy, ConstantPositionProperty, PolylineGraphics, ArcType, CornerType, HorizontalOrigin, VerticalOrigin, Cartesian2, SceneTransforms, NearFarScalar, Matrix3, KmlDataSource, Rectangle, GeoJsonDataSource, SceneMode, Cesium3DTileStyle, HeadingPitchRange, Cesium3DTileColorBlendMode, Ion, Cesium3DTileset, IonResource, EllipsoidTerrainProvider, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, OrthographicFrustum, EasingFunction, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, BoundingSphere, GeometryInstance, PolygonPipeline, CesiumInspector, ClockRange, ScreenSpaceEventHandler, ScreenSpaceEventType, Intersect, CzmlDataSource, Fullscreen } from 'cesium';
+import { Cartographic, ColorMaterialProperty, Entity, Color, ConstantProperty, CallbackProperty, Primitive, Cesium3DTileFeature, Math as Math$1, Cartesian3, JulianDate, Quaternion, Transforms, HeadingPitchRoll, Matrix4, DistanceDisplayCondition, HeightReference, ClassificationType, PolygonHierarchy, ShadowMode, ConstantPositionProperty, PolylineGraphics, ArcType, CornerType, HorizontalOrigin, VerticalOrigin, ColorBlendMode, Model, Cartesian2, SceneTransforms, Rectangle, NearFarScalar, Matrix3, KmlDataSource, GeoJsonDataSource, SceneMode, Cesium3DTileStyle, HeadingPitchRange, Ion, Cesium3DTileColorBlendMode, Cesium3DTileset, IonResource, OrthographicFrustum, EasingFunction, EllipsoidTerrainProvider, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, BoundingSphere, GeometryInstance, PolygonPipeline, CesiumInspector, ClockRange, ScreenSpaceEventHandler, ScreenSpaceEventType, Intersect, CzmlDataSource, Fullscreen } from 'cesium';
 
 /**
  * Ensures a number is returned from a given value.
@@ -8640,6 +8640,7 @@ var EntitiesRenderManager;
                                 historicPoint: this.viewer.clock.currentTime.toString(),
                                 schemaId: (_e = this.item.BruceEntity) === null || _e === void 0 ? void 0 : _e.schemaId,
                                 expandSources: true,
+                                expandLocation: true,
                                 scenario: this.scenario,
                                 migrated: true,
                                 maxSearchTimeSec: 60 * 2
@@ -8748,6 +8749,7 @@ var EntitiesRenderManager;
                             schemaId: (_c = this.item.BruceEntity) === null || _c === void 0 ? void 0 : _c.schemaId,
                             scenario: this.scenario,
                             expandSources: true,
+                            expandLocation: true,
                             migrated: true,
                             maxSearchTimeSec: 60 * 2
                         });
@@ -9680,6 +9682,7 @@ var EntitiesLoadedRenderManager;
                             api,
                             entityIds,
                             expandSources: true,
+                            expandLocation: true,
                             migrated: true,
                             maxSearchTimeSec: 60 * 2
                         });
@@ -10342,6 +10345,7 @@ var EntitiesIdsRenderManager;
                     historicPoint: newDateTime,
                     historicKey: this.item.BruceEntity.historicAttrKey,
                     expandSources: true,
+                    expandLocation: true,
                     migrated: true,
                     // If we're taking 5+ minutes to make a query, it's a dud.
                     // This is a timeout imposed on our DB and not external sources.
@@ -13064,6 +13068,8 @@ var EntityFilterGetter;
                                     scenario: this.scenario,
                                     historicKey: this.historicAttrKey,
                                     historicPoint: (this.historicAttrKey || this.historic) ? this.historicAttrDateTime : null,
+                                    expandSources: true,
+                                    expandLocation: true,
                                     schemaId: this.schemaId,
                                     filter: {
                                         pageSize: PAGE_SIZE,
@@ -13233,6 +13239,8 @@ var EntityFilterGetter;
                                 scenario: this.scenario,
                                 historicKey: this.historicAttrKey,
                                 historicPoint: historicAttrDateTime,
+                                expandSources: true,
+                                expandLocation: true,
                                 schemaId: this.schemaId,
                                 filter: {
                                     pageSize: batch.length,
@@ -14952,6 +14960,27 @@ var ViewGroundArea;
         return `${bounds.west},${bounds.south} ${bounds.west},${bounds.north} ${bounds.east},${bounds.north} ${bounds.east},${bounds.south}`;
     }
     ViewGroundArea.ToBboxPolygon = ToBboxPolygon;
+    function NormalizeBounds(bounds, altitude) {
+        if (!bounds ||
+            !isDefined(bounds.east) ||
+            !isDefined(bounds.west) ||
+            !isDefined(bounds.north) ||
+            !isDefined(bounds.south)) {
+            return null;
+        }
+        const viewRect = { ...bounds };
+        const centerLong = (viewRect.east + viewRect.west) / 2;
+        const centerLat = (viewRect.north + viewRect.south) / 2;
+        viewRect.east = Math.max(viewRect.east, centerLong + (MINIMUM_VIEW_AREA_SIZE_DEGREES / 2));
+        viewRect.west = Math.min(viewRect.west, centerLong - (MINIMUM_VIEW_AREA_SIZE_DEGREES / 2));
+        viewRect.south = Math.min(viewRect.south, centerLat - (MINIMUM_VIEW_AREA_SIZE_DEGREES / 2));
+        viewRect.north = Math.max(viewRect.north, centerLat + (MINIMUM_VIEW_AREA_SIZE_DEGREES / 2));
+        if (isDefined(altitude)) {
+            viewRect.alt = altitude;
+        }
+        return viewRect;
+    }
+    ViewGroundArea.NormalizeBounds = NormalizeBounds;
     async function GetViewArea(viewer) {
         var _a, _b;
         if (!viewer || viewer.isDestroyed()) {
@@ -15017,15 +15046,7 @@ var ViewGroundArea;
                 }
             }
         }
-        if (viewRect) {
-            const centerLong = (viewRect.east + viewRect.west) / 2;
-            const centerLat = (viewRect.north + viewRect.south) / 2;
-            viewRect.east = Math.max(viewRect.east, centerLong + (MINIMUM_VIEW_AREA_SIZE_DEGREES / 2));
-            viewRect.west = Math.min(viewRect.west, centerLong - (MINIMUM_VIEW_AREA_SIZE_DEGREES / 2));
-            viewRect.south = Math.min(viewRect.south, centerLat - (MINIMUM_VIEW_AREA_SIZE_DEGREES / 2));
-            viewRect.north = Math.max(viewRect.north, centerLat + (MINIMUM_VIEW_AREA_SIZE_DEGREES / 2));
-            viewRect.alt = (_b = viewer.scene.camera.positionCartographic) === null || _b === void 0 ? void 0 : _b.height;
-        }
+        viewRect = NormalizeBounds(viewRect, (_b = viewer.scene.camera.positionCartographic) === null || _b === void 0 ? void 0 : _b.height);
         if (center && viewRect) {
             return {
                 bounds: viewRect,
@@ -18936,8 +18957,14 @@ var AssemblyRenderManager;
                         // Won't bother with vector data for this experiment.
                         continue;
                     }
-                    const pos3d = calcEntityLocation(entity, this.modelSpace);
-                    const orient = calcEntityOrientation(entity, pos3d, this.modelSpace);
+                    const pos3d = EntityUtils.GetPos({
+                        viewer: this.viewer,
+                        entity,
+                        recordHeightRef: HeightReference.NONE,
+                        returnHeightRef: HeightReference.NONE,
+                        allowRendered: false
+                    });
+                    const orient = EntityUtils.GetAssemblyOrientation(entity, pos3d);
                     if (!pos3d || !orient) {
                         continue;
                     }
@@ -19207,87 +19234,6 @@ var AssemblyRenderManager;
     }
     AssemblyRenderManager.Manager = Manager;
 })(AssemblyRenderManager || (AssemblyRenderManager = {}));
-const axis_shift = new Quaternion(0, 0, -Math.SQRT1_2, Math.SQRT1_2);
-function calcEntityLocation(entity, modelSpace) {
-    let aRootLocation = entity.Bruce.AssemblyRootLocation;
-    // If we're in model-space we cull location.
-    // This puts it at 0,0 lat/lon which we treat as 0,0,0 for model-space viewing.
-    if (modelSpace) {
-        aRootLocation = null;
-    }
-    const worldPosition = entity.Bruce.AssemblyWorldPosition;
-    if (!worldPosition) {
-        return null;
-    }
-    let 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) {
-                heading = eTransform.heading;
-            }
-            if (eTransform.pitch) {
-                pitch = eTransform.pitch;
-            }
-            if (eTransform.roll) {
-                roll = eTransform.roll;
-            }
-        }
-    }
-    let pos3d = Cartesian3.fromDegrees(EnsureNumber(aRootLocation === null || aRootLocation === void 0 ? void 0 : aRootLocation.longitude), EnsureNumber(aRootLocation === null || aRootLocation === void 0 ? void 0 : aRootLocation.latitude), EnsureNumber(aRootLocation === null || aRootLocation === void 0 ? void 0 : aRootLocation.altitude));
-    const m1 = Transforms.eastNorthUpToFixedFrame(pos3d);
-    const hpr = HeadingPitchRoll.fromDegrees(EnsureNumber(heading), EnsureNumber(pitch), EnsureNumber(roll), new HeadingPitchRoll());
-    const transform = Matrix3.fromHeadingPitchRoll(hpr);
-    const transformedOffset = Matrix3.multiplyByVector(transform, offset, new Cartesian3());
-    pos3d = Matrix4.multiplyByPoint(m1, transformedOffset, new Cartesian3());
-    return pos3d;
-}
-function calcEntityOrientation(entity, pos3d, modelSpace) {
-    if (!entity.Bruce || !pos3d) {
-        return null;
-    }
-    // 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
-        const awp = entity.Bruce.AssemblyWorldPosition;
-        const mawp = new Matrix4(+awp[0][0], +awp[0][1], +awp[0][2], +awp[0][3], +awp[1][0], +awp[1][1], +awp[1][2], +awp[1][3], +awp[2][0], +awp[2][1], +awp[2][2], +awp[2][3], +awp[3][0], +awp[3][1], +awp[3][2], +awp[3][3]);
-        let rotmat = new Matrix3();
-        rotmat = Matrix4.getRotation(mawp, rotmat);
-        // chuck on a heading rotation of +90
-        // according to docs, that is around -z
-        // https://cesium.com/learn/ion-sdk/ref-doc/HeadingPitchRoll.html
-        // see axis_shift quat defined above (could possibly be -ve z value)
-        const q = Quaternion.fromRotationMatrix(rotmat);
-        hpr = HeadingPitchRoll.fromQuaternion(q);
-        orientation = Transforms.headingPitchRollQuaternion(pos3d, hpr);
-        // add another h +90, quats multiply to concat rotations - but are not
-        // subject to order of rotation like HPR
-        orientation = Quaternion.multiply(orientation, axis_shift, new Quaternion());
-    }
-    return orientation;
-}
 
 /**
  * Utility to keep track of enabled menu items within a Cesium viewer.
@@ -28867,63 +28813,35 @@ const getLocationFromFeature = (feature) => {
     }
     return result;
 };
-function calcEntityLocation$1(entity, modelSpace) {
-    let aRootLocation = entity.Bruce.AssemblyRootLocation;
-    // If we're in model-space we cull location.
-    // This puts it at 0,0 lat/lon which we treat as 0,0,0 for model-space viewing.
-    if (modelSpace) {
-        aRootLocation = null;
-    }
-    const worldPosition = entity.Bruce.AssemblyWorldPosition;
+function calcEntityLocation(entity, modelSpace) {
+    var _a, _b;
+    const worldPosition = (_a = entity.Bruce) === null || _a === void 0 ? void 0 : _a.AssemblyWorldPosition;
     if (!worldPosition) {
         return null;
     }
-    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]);
-        }
+    // The translation column of AssemblyWorldPosition is in ENU space:
+    // [0][3] = East offset (m)
+    // [1][3] = North offset (m)
+    // [2][3] = Up/altitude offset (m)
+    // All relative to the Assembly root's world location.
+    // "Bruce.Location" stores the geometry-pivot centre instead of the Entity origin.
+    // So we compute directly from the matrix translation to get the model origin position.
+    const tx = +worldPosition[0][3];
+    const ty = +worldPosition[1][3];
+    const tz = +worldPosition[2][3];
+    let rootPos;
+    if (modelSpace) {
+        rootPos = Cartesian3.fromDegrees(0, 0, 0);
     }
-    let heading = 0;
-    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;
-            }
-        }
+    else {
+        const rootLoc = (_b = entity.Bruce) === null || _b === void 0 ? void 0 : _b.AssemblyRootLocation;
+        rootPos = Cartesian3.fromDegrees(EnsureNumber(rootLoc === null || rootLoc === void 0 ? void 0 : rootLoc.longitude), EnsureNumber(rootLoc === null || rootLoc === void 0 ? void 0 : rootLoc.latitude), EnsureNumber(rootLoc === null || rootLoc === void 0 ? void 0 : rootLoc.altitude));
     }
-    let pos3d = Cartesian3.fromDegrees(EnsureNumber(aRootLocation === null || aRootLocation === void 0 ? void 0 : aRootLocation.longitude), EnsureNumber(aRootLocation === null || aRootLocation === void 0 ? void 0 : aRootLocation.latitude), EnsureNumber(aRootLocation === null || aRootLocation === void 0 ? void 0 : aRootLocation.altitude));
-    const m1 = Transforms.eastNorthUpToFixedFrame(pos3d);
-    const hpr = HeadingPitchRoll.fromDegrees(EnsureNumber(heading), EnsureNumber(pitch), EnsureNumber(roll), new HeadingPitchRoll());
-    const transform = Matrix3.fromHeadingPitchRoll(hpr);
-    const transformedOffset = Matrix3.multiplyByVector(transform, offset, new Cartesian3());
-    pos3d = Matrix4.multiplyByPoint(m1, transformedOffset, new Cartesian3());
-    return pos3d;
+    const m1 = Transforms.eastNorthUpToFixedFrame(rootPos);
+    return Matrix4.multiplyByPoint(m1, new Cartesian3(tx, ty, tz), new Cartesian3());
 }
+// +90° rotation around Z: aligns GLTF Y-up forward with Cesium ENU North.
+const _assemblyAxisShift = new Quaternion(0, 0, -Math.SQRT1_2, Math.SQRT1_2);
 var EntityUtils;
 (function (EntityUtils) {
     /**
@@ -29389,7 +29307,7 @@ var EntityUtils;
                 }
                 let pos3d = null;
                 if (modelSpace) {
-                    pos3d = calcEntityLocation$1(entity, modelSpace);
+                    pos3d = calcEntityLocation(entity, modelSpace);
                 }
                 else {
                     const eLocation = Entity$1.GetValue({
@@ -29687,7 +29605,7 @@ var EntityUtils;
         }
         function evaluateRecord() {
             if (isAssemblyEntity) {
-                return calcEntityLocation$1(entity, isModelSpace);
+                return calcEntityLocation(entity, isModelSpace);
             }
             const location = Entity$1.GetValue({
                 entity: entity,
@@ -29780,6 +29698,26 @@ var EntityUtils;
         });
     }
     EntityUtils.GetPos = GetPos;
+    /**
+     * Returns the orientation quaternion for an assembly entity using its world position matrix.
+     * Uses the rotation component of AssemblyWorldPosition to match the tileset rendering.
+     */
+    function GetAssemblyOrientation(entity, pos3d) {
+        var _a;
+        const awp = (_a = entity === null || entity === void 0 ? void 0 : entity.Bruce) === null || _a === void 0 ? void 0 : _a.AssemblyWorldPosition;
+        if (!awp || !pos3d) {
+            return null;
+        }
+        const mawp = new Matrix4(+awp[0][0], +awp[0][1], +awp[0][2], +awp[0][3], +awp[1][0], +awp[1][1], +awp[1][2], +awp[1][3], +awp[2][0], +awp[2][1], +awp[2][2], +awp[2][3], +awp[3][0], +awp[3][1], +awp[3][2], +awp[3][3]);
+        let rotmat = new Matrix3();
+        rotmat = Matrix4.getRotation(mawp, rotmat);
+        const q = Quaternion.fromRotationMatrix(rotmat);
+        const hpr = HeadingPitchRoll.fromQuaternion(q);
+        const orientation = Transforms.headingPitchRollQuaternion(pos3d, hpr);
+        // Correct for GLTF Y-up vs Cesium ENU Z-up axis convention (+90° around Z).
+        return Quaternion.multiply(orientation, _assemblyAxisShift, new Quaternion());
+    }
+    EntityUtils.GetAssemblyOrientation = GetAssemblyOrientation;
     /**
      * Returns the position of the entity.
      * This is an async variant that checks for related assemblies.
@@ -31606,11 +31544,12 @@ var EntityRenderEngineModel3d;
      * @returns
      */
     function Render(params) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         const entity = params.entity;
         if (!params.entityHistoric) {
             params.entityHistoric = [];
         }
+        const hasAssemblyMatrix = !!((_a = entity === null || entity === void 0 ? void 0 : entity.Bruce) === null || _a === void 0 ? void 0 : _a.AssemblyWorldPosition);
         const transform = Entity$1.GetValue({
             entity: entity,
             path: ["Bruce", "Transform"]
@@ -31751,6 +31690,12 @@ var EntityRenderEngineModel3d;
                     return animatePosition.GetOrient();
                 }, false);
             }
+            else if (hasAssemblyMatrix) {
+                getOrient = new CallbackProperty(() => {
+                    const currentPos = position ? GetCValue(params.viewer, position) : pos3d;
+                    return EntityUtils.GetAssemblyOrientation(entity, currentPos || pos3d);
+                }, false);
+            }
             else {
                 const hpr = new HeadingPitchRoll(Math$1.toRadians(heading), Math$1.toRadians(pitch), Math$1.toRadians(roll));
                 getOrient = new CallbackProperty(() => {
@@ -31802,7 +31747,7 @@ var EntityRenderEngineModel3d;
             cEntity.model.colorBlendAmount = new ConstantProperty(blendAmount);
             cEntity.model.colorBlendMode = new ConstantProperty(blendMode);
             cEntity.model.distanceDisplayCondition = new ConstantProperty(EntityRenderEngine.GetDisplayCondition(params.minDistance, params.maxDistance));
-            let dateTimeStr = (_b = (_a = entity.Bruce.Outline) === null || _a === void 0 ? void 0 : _a.find(x => !!x.DateTime)) === null || _b === void 0 ? void 0 : _b.DateTime;
+            let dateTimeStr = (_c = (_b = entity.Bruce.Outline) === null || _b === void 0 ? void 0 : _b.find(x => !!x.DateTime)) === null || _c === void 0 ? void 0 : _c.DateTime;
             const isHistoric = Boolean(dateTimeStr);
             let dateTime = dateTimeStr ? new Date(dateTimeStr) : null;
             // Initial animation check to see if we're continuing an animation.
@@ -31915,7 +31860,13 @@ var EntityRenderEngineModel3d;
             const hasExplicitTransformHeading = (transform === null || transform === void 0 ? void 0 : transform.heading) != null && !isNaN(EnsureNumber(transform === null || transform === void 0 ? void 0 : transform.heading));
             const isDirectRealtimeUpdate = !isHistoric && !(params.entityHistoric && params.entityHistoric.length > 0);
             const preferTransformHeadingForRealtime = isDirectRealtimeUpdate && hasExplicitTransformHeading;
-            if (preferTransformHeadingForRealtime) {
+            if (hasAssemblyMatrix) {
+                cEntity.orientation = new CallbackProperty(() => {
+                    const currentPos = GetCValue(params.viewer, cEntity.position);
+                    return EntityUtils.GetAssemblyOrientation(entity, currentPos || pos3d);
+                }, false);
+            }
+            else if (preferTransformHeadingForRealtime) {
                 const hpr = new HeadingPitchRoll(Math$1.toRadians(heading), Math$1.toRadians(pitch), Math$1.toRadians(roll));
                 cEntity.orientation = new CallbackProperty(() => {
                     const currentPos = GetCValue(params.viewer, cEntity.position);
@@ -32073,7 +32024,7 @@ var EntityRenderEngineModel3d;
         // Generate a polyline 'track' for the historic data.
         // We do this for historic data that exists and is moving.
         if (shouldShowTrack && animatePosition && animatePosition instanceof CesiumAnimatedProperty.AnimatePositionSeries && animatePosition.GetSeries) {
-            const lStyle = (_d = (_c = params.fullStyle) === null || _c === void 0 ? void 0 : _c.polylineStyle) !== null && _d !== void 0 ? _d : {};
+            const lStyle = (_e = (_d = params.fullStyle) === null || _d === void 0 ? void 0 : _d.polylineStyle) !== null && _e !== void 0 ? _e : {};
             const bColor = lStyle.lineColor ? Calculator.GetColor(lStyle.lineColor, entity, params.tags) : null;
             const cColor = bColor ? ColorToCColor(bColor) : Color.fromCssColorString("rgba(255, 193, 7, 0.8)");
             let width = lStyle.lineWidth ? EnsureNumber(Calculator.GetNumber(lStyle.lineWidth, entity, params.tags)) : 2;
@@ -35313,7 +35264,7 @@ class WidgetViewBar extends Widget.AWidget {
     }
 }
 
-const VERSION = "6.5.4";
+const VERSION = "6.5.6";
 /**
  * Updates the environment instance used by bruce-cesium to one specified.
  * This can be used to ensure that the instance a parent is referencing is shared between bruce-cesium, bruce-models, and the parent app.