bruce-cesium 5.4.2 → 5.4.4

package/dist/bruce-cesium.umd.js

@@ -1365,7 +1365,7 @@
             }
         }
         CesiumAnimatedProperty.AnimatePositionSeries = AnimatePositionSeries;
-        function GetSeriesPossesForHistoricEntity(viewer, heightRef, historic) {
+        function GetSeriesPossesForHistoricEntity(viewer, dataHeightRef, heightRef, historic) {
             if (!historic || !historic.length) {
                 return [];
             }
@@ -1388,7 +1388,7 @@
                 const pos3d = exports.EntityUtils.GetPos({
                     entity: data,
                     viewer: viewer,
-                    recordHeightRef: heightRef,
+                    recordHeightRef: dataHeightRef,
                     returnHeightRef: heightRef,
                     allowRendered: false
                 });
@@ -4397,7 +4397,7 @@
                         const bColor = lStyle.lineColor ? BModels.Calculator.GetColor(lStyle.lineColor, entity, params.tags) : null;
                         const cColor = bColor ? ColorToCColor(bColor) : Cesium.Color.fromCssColorString("rgba(255, 193, 7, 0.8)");
                         if (cColor.alpha > 0) {
-                            const seriesTrackPosses = exports.CesiumAnimatedProperty.GetSeriesPossesForHistoricEntity(params.viewer, heightRef, params.entityHistoric);
+                            const seriesTrackPosses = exports.CesiumAnimatedProperty.GetSeriesPossesForHistoricEntity(params.viewer, heightRef, heightRef, params.entityHistoric);
                             seriesTrackPosses.reverse();
                             let posses = seriesTrackPosses.map(x => x.pos3d);
                             posses = CullDuplicateCPosses(posses);
@@ -4478,7 +4478,7 @@
                             });
                             let position = null;
                             // If we have a series of time-based positions then we'll animate as time changes.
-                            const series = exports.CesiumAnimatedProperty.GetSeriesPossesForHistoricEntity(params.viewer, heightRef, params.entityHistoric);
+                            const series = exports.CesiumAnimatedProperty.GetSeriesPossesForHistoricEntity(params.viewer, heightRef, heightRef, params.entityHistoric);
                             if (series.length > 1) {
                                 animatePosition = new exports.CesiumAnimatedProperty.AnimatePositionSeries({
                                     posses: series,
@@ -4542,7 +4542,7 @@
                             cEntity.billboard.width = undefined;
                             cEntity.billboard.height = undefined;
                             // If we have a series of time-based positions then we'll animate as time changes.
-                            const series = exports.CesiumAnimatedProperty.GetSeriesPossesForHistoricEntity(params.viewer, heightRef, params.entityHistoric);
+                            const series = exports.CesiumAnimatedProperty.GetSeriesPossesForHistoricEntity(params.viewer, heightRef, heightRef, params.entityHistoric);
                             if (series.length > 1) {
                                 animatePosition = new exports.CesiumAnimatedProperty.AnimatePositionSeries({
                                     posses: series,
@@ -4796,7 +4796,7 @@
                     });
                     let position = null;
                     // If we have a series of time-based positions then we'll animate as time changes.
-                    const series = exports.CesiumAnimatedProperty.GetSeriesPossesForHistoricEntity(params.viewer, heightRef, params.entityHistoric);
+                    const series = exports.CesiumAnimatedProperty.GetSeriesPossesForHistoricEntity(params.viewer, heightRef, heightRef, params.entityHistoric);
                     if (series.length > 1) {
                         animatePosition = new exports.CesiumAnimatedProperty.AnimatePositionSeries({
                             posses: series,
@@ -4865,7 +4865,7 @@
                     cEntity.billboard.distanceDisplayCondition = new Cesium.ConstantProperty(exports.EntityRenderEngine.GetDisplayCondition(params.minDistance, params.maxDistance));
                     cEntity.billboard.disableDepthTestDistance = new Cesium.ConstantProperty(disableDepthTest ? Number.POSITIVE_INFINITY : undefined);
                     // If we have a series of time-based positions then we'll animate as time changes.
-                    const series = exports.CesiumAnimatedProperty.GetSeriesPossesForHistoricEntity(params.viewer, heightRef, params.entityHistoric);
+                    const series = exports.CesiumAnimatedProperty.GetSeriesPossesForHistoricEntity(params.viewer, heightRef, heightRef, params.entityHistoric);
                     if (series.length > 1) {
                         animatePosition = new exports.CesiumAnimatedProperty.AnimatePositionSeries({
                             posses: series,
@@ -6358,7 +6358,7 @@
                         const bColor = lStyle.lineColor ? BModels.Calculator.GetColor(lStyle.lineColor, entity, params.tags) : null;
                         const cColor = bColor ? ColorToCColor(bColor) : Cesium.Color.fromCssColorString("rgba(255, 193, 7, 0.8)");
                         if (cColor.alpha > 0) {
-                            const seriesTrackPosses = exports.CesiumAnimatedProperty.GetSeriesPossesForHistoricEntity(params.viewer, heightRef, params.entityHistoric);
+                            const seriesTrackPosses = exports.CesiumAnimatedProperty.GetSeriesPossesForHistoricEntity(params.viewer, heightRef, heightRef, params.entityHistoric);
                             seriesTrackPosses.reverse();
                             let posses = seriesTrackPosses.map(x => x.pos3d);
                             posses = CullDuplicateCPosses(posses);
@@ -6381,7 +6381,7 @@
                 });
                 let position = null;
                 // If we have a series of time-based positions then we'll animate as time changes.
-                const series = exports.CesiumAnimatedProperty.GetSeriesPossesForHistoricEntity(params.viewer, heightRef, params.entityHistoric);
+                const series = exports.CesiumAnimatedProperty.GetSeriesPossesForHistoricEntity(params.viewer, heightRef, heightRef, params.entityHistoric);
                 if (series.length > 1) {
                     animatePosition = new exports.CesiumAnimatedProperty.AnimatePositionSeries({
                         posses: series,
@@ -6457,7 +6457,7 @@
                 cEntity.model.colorBlendMode = new Cesium.ConstantProperty(blendMode);
                 cEntity.model.distanceDisplayCondition = new Cesium.ConstantProperty(exports.EntityRenderEngine.GetDisplayCondition(params.minDistance, params.maxDistance));
                 // If we have a series of time-based positions then we'll animate as time changes.
-                const series = exports.CesiumAnimatedProperty.GetSeriesPossesForHistoricEntity(params.viewer, heightRef, params.entityHistoric);
+                const series = exports.CesiumAnimatedProperty.GetSeriesPossesForHistoricEntity(params.viewer, heightRef, heightRef, params.entityHistoric);
                 if (series.length > 1) {
                     animatePosition = new exports.CesiumAnimatedProperty.AnimatePositionSeries({
                         posses: series,
@@ -9199,7 +9199,7 @@
                         const height = visual.billboard._billboardSize;
                         if (height) {
                             const scale = EnsureNumber(getValue$1(this.viewer, visual.billboard.scale), 1);
-                            pixelOffset.y = -(height * scale);
+                            pixelOffset.y = -((height * scale) / 2);
                             pixelOffset.y -= 5;
                         }
                     }
@@ -9489,6 +9489,9 @@
                         lineEle.style.display = "none";
                         return;
                     }
+                    // Offset start by the pixel offset.
+                    lineStartPos2d.x += pixelOffset.x;
+                    lineStartPos2d.y += pixelOffset.y;
                     ele.style.display = "block";
                     lineEle.style.display = "block";
                     // Calculate opacity to apply based on distance between camera and pos3d.
@@ -9540,6 +9543,9 @@
                             lineEle.style.display = "none";
                             return;
                         }
+                        // Offset end by the pixel offset.
+                        lineEndPos2d.x += pixelOffset.x;
+                        lineEndPos2d.y += pixelOffset.y;
                         // If out of the screen then we can hide it.
                         const startOutOfScreen = (lineStartPos2d.x < 0 || lineStartPos2d.x > this.viewer.canvas.clientWidth ||
                             lineStartPos2d.y < 0 || lineStartPos2d.y > this.viewer.canvas.clientHeight);
@@ -9552,10 +9558,8 @@
                             return;
                         }
                         // Position the label above the line end point.
-                        const labelLeft = lineEndPos2d.x + pixelOffset.x;
-                        const labelTop = lineEndPos2d.y + pixelOffset.y;
-                        this.label.style.left = `${labelLeft}px`;
-                        this.label.style.top = `${labelTop}px`;
+                        this.label.style.left = `${lineEndPos2d.x}px`;
+                        this.label.style.top = `${lineEndPos2d.y}px`;
                         // Update line position and size.
                         const dx = lineEndPos2d.x - lineStartPos2d.x;
                         const dy = lineEndPos2d.y - lineStartPos2d.y;
@@ -17592,7 +17596,7 @@
                                 entityIds: [this.rootId],
                                 api: api
                             });
-                            const posses = exports.CesiumAnimatedProperty.GetSeriesPossesForHistoricEntity(this.viewer, Cesium.HeightReference.NONE, historicData.recordsByIds[this.rootId]);
+                            const posses = exports.CesiumAnimatedProperty.GetSeriesPossesForHistoricEntity(this.viewer, Cesium.HeightReference.NONE, Cesium.HeightReference.CLAMP_TO_GROUND, historicData.recordsByIds[this.rootId]);
                             res(posses);
                         }
                         catch (e) {
@@ -30540,7 +30544,7 @@
         }
     }
 
-    const VERSION = "5.4.2";
+    const VERSION = "5.4.4";
 
     exports.VERSION = VERSION;
     exports.isHistoricMetadataChanged = isHistoricMetadataChanged;