bruce-cesium 6.1.4 → 6.1.6

package/dist/bruce-cesium.umd.js

@@ -7154,7 +7154,7 @@
          * @returns
          */
         function Render(params) {
-            var _a, _b, _c, _d, _e, _f;
+            var _a, _b, _c, _d;
             const entity = params.entity;
             if (!params.entityHistoric) {
                 params.entityHistoric = [];
@@ -7346,6 +7346,8 @@
                 cEntity.model.colorBlendAmount = new Cesium.ConstantProperty(blendAmount);
                 cEntity.model.colorBlendMode = new Cesium.ConstantProperty(blendMode);
                 cEntity.model.distanceDisplayCondition = new Cesium.ConstantProperty(exports.EntityRenderEngine.GetDisplayCondition(params.minDistance, params.maxDistance));
+                const 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;
+                const dateTime = dateTimeStr ? new Date(dateTimeStr) : null;
                 if (cEntity.position && cEntity.position["CesiumAnimatedProperty.AnimatePositionSeries"]) {
                     animatePosition = cEntity.position["CesiumAnimatedProperty.AnimatePositionSeries"];
                     const animateSeries = animatePosition;
@@ -7353,8 +7355,6 @@
                     if (series.length) {
                         animateSeries.SupplementSeries(series);
                     }
-                    const 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;
-                    const dateTime = dateTimeStr ? new Date(dateTimeStr) : null;
                     if (dateTime) {
                         animateSeries.UpdatePositionForDateTime(pos3d, dateTime, !EnsureNumber(transform === null || transform === void 0 ? void 0 : transform.heading) ? null : heading);
                     }
@@ -7377,8 +7377,6 @@
                         cEntity.position["CesiumAnimatedProperty.AnimatePositionSeries"] = animatePosition;
                     }
                     else {
-                        const dateTimeStr = (_d = (_c = entity.Bruce.Outline) === null || _c === void 0 ? void 0 : _c.find(x => !!x.DateTime)) === null || _d === void 0 ? void 0 : _d.DateTime;
-                        const dateTime = dateTimeStr ? new Date(dateTimeStr) : null;
                         const posChanged = !prevPos3d || !Cesium.Cartesian3.equals(prevPos3d, pos3d);
                         if (posChanged) {
                             let posses = [];
@@ -7408,7 +7406,7 @@
                     }
                 }
                 // If we're animating position then we can animate orientation too based on the interpolated position.
-                if (animatePosition && animatePosition instanceof exports.CesiumAnimatedProperty.AnimatePositionSeries && animatePosition.GetOrient) {
+                if (dateTime && animatePosition && animatePosition instanceof exports.CesiumAnimatedProperty.AnimatePositionSeries && animatePosition.GetOrient) {
                     cEntity.orientation = new Cesium.CallbackProperty(() => {
                         return animatePosition.GetOrient();
                     }, false);
@@ -7553,7 +7551,7 @@
             // Generate a polyline 'track' for the historic data.
             // We do this for historic data that exists and is moving.
             if (shouldShowTrack && animatePosition && animatePosition instanceof exports.CesiumAnimatedProperty.AnimatePositionSeries && animatePosition.GetSeries) {
-                const lStyle = (_f = (_e = params.fullStyle) === null || _e === void 0 ? void 0 : _e.polylineStyle) !== null && _f !== void 0 ? _f : {};
+                const lStyle = (_d = (_c = params.fullStyle) === null || _c === void 0 ? void 0 : _c.polylineStyle) !== null && _d !== void 0 ? _d : {};
                 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)");
                 let width = lStyle.lineWidth ? EnsureNumber(BModels.Calculator.GetNumber(lStyle.lineWidth, entity, params.tags)) : 2;
@@ -32692,7 +32690,7 @@
         label.innerHTML = `<div style="margin-bottom:0px">${name !== null && name !== void 0 ? name : ""}</div>`;
         label.setAttribute("style", `
         position: absolute;
-        z-index: 1000;
+        z-index: 2; /* keep under app panels */
         display: none;
         pointer-events: none;
         padding: 6px 10px;
@@ -32715,7 +32713,6 @@
         return label;
     }
     function updateDOMLabel(viewer, label, pos3d) {
-        var _a;
         if (!viewer || viewer.isDestroyed() || !label || !pos3d) {
             return;
         }
@@ -32738,11 +32735,11 @@
             label.style.display = "none";
             return;
         }
-        const opacity = Math.max(0.2, 1 - (distance / maxDistance));
-        const camHeight = ((_a = viewer.camera.positionCartographic) === null || _a === void 0 ? void 0 : _a.height) || distance;
-        const driver = Math.min(distance, camHeight);
-        const offsetX = 14 + Math.min(driver / 80, 30); // px
-        const offsetY = 12 + Math.min(driver / 100, 24); // px
+        // Keep full opacity; no distance-based fading
+        // Keep the label close to the cursor regardless of zoom
+        // Use small, constant pixel offsets to bottom-right
+        const offsetX = 12; // px
+        const offsetY = 10; // px
         let leftPx = screenPos.x + offsetX;
         let topPx = screenPos.y + offsetY;
         const pad = 8;
@@ -32753,10 +32750,10 @@
         label.style.left = `${leftPx}px`;
         label.style.top = `${topPx}px`;
         label.style.display = "block";
-        label.style.opacity = `${opacity}`;
+        label.style.opacity = "1";
     }
     (function (LiveCursor) {
-        function Upsert({ viewer, id, name, colorCss, pos3d, entityId, image, showBillboard = true, showEllipse = true, billboardWidth = 30, billboardHeight = 30 }) {
+        function Upsert({ viewer, id, name, colorCss, pos3d, entityId, image, showBillboard = true, showEllipse = true, billboardWidth = 30, billboardHeight = 30, labelZIndex }) {
             if (!labels[id]) {
                 createDOMLabel(viewer, id, name !== null && name !== void 0 ? name : "", colorCss !== null && colorCss !== void 0 ? colorCss : "#3b82f6");
             }
@@ -32771,6 +32768,9 @@
                     labels[id].style.backgroundColor = colorCss;
                 }
             }
+            if (typeof labelZIndex === "number") {
+                labels[id].style.zIndex = `${labelZIndex}`;
+            }
             positions[id] = pos3d;
             viewers[id] = viewer;
             // Manage Cesium entity
@@ -32831,7 +32831,17 @@
             if (!updaters[id]) {
                 const remover = viewer.scene.postUpdate.addEventListener(() => {
                     const label = labels[id];
-                    const p = positions[id];
+                    let p = positions[id];
+                    // If we manage an entity with an animated position, follow its current value
+                    const ent = entities[id];
+                    if (ent === null || ent === void 0 ? void 0 : ent.position) {
+                        const posProp = ent.position;
+                        const date = viewer.scene.lastRenderTime || viewer.clock.currentTime;
+                        const val = (posProp === null || posProp === void 0 ? void 0 : posProp.getValue) ? posProp.getValue(date) : posProp;
+                        if (val && !isNaN(val.x)) {
+                            p = val;
+                        }
+                    }
                     if (!label || !p) {
                         return;
                     }
@@ -33642,7 +33652,7 @@
         }
     }
 
-    const VERSION = "6.1.4";
+    const VERSION = "6.1.6";
 
     exports.VERSION = VERSION;
     exports.isOutlineChanged = isOutlineChanged;