bruce-cesium 6.1.4 → 6.1.6

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
 import { BruceEvent, Cartes, Entity as Entity$1, ProjectViewTile, Carto, Geometry, MathUtils, LRUCache, Api, Calculator, ClientFile, EntityTag, EntityType, ObjectUtils, Style, DelayQueue, EntityLod, Bounds, ZoomControl, EntityRelationType, ENVIRONMENT, EntityHistoricData, Tileset, EntityCoords, DataLab, EntitySource, MenuItem, EntityRelation, ProgramKey, ProjectView, ProjectViewBookmark, Camera, ProjectViewLegacyTile, EntityAttachment, EntityAttachmentType, EntityAttribute, AbstractApi, Session } from 'bruce-models';
 import * as Cesium from 'cesium';
-import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, Entity, DistanceDisplayCondition, ClassificationType, ArcType, CornerType, ShadowMode, ConstantProperty, ConstantPositionProperty, PolygonHierarchy, PolylineGraphics, ColorMaterialProperty, HorizontalOrigin, VerticalOrigin, ColorBlendMode, HeadingPitchRoll, Transforms, Model, Primitive, Cesium3DTileFeature, SceneMode, GeoJsonDataSource, Cesium3DTileStyle, HeadingPitchRange, Ion, Cesium3DTileColorBlendMode, KmlDataSource, Quaternion, Matrix3, Matrix4, SceneTransforms, NearFarScalar, OrthographicFrustum, EasingFunction, EllipsoidTerrainProvider, CesiumInspector, defined, ClockRange, Cesium3DTileset, IonResource, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, ScreenSpaceEventHandler, ScreenSpaceEventType, BoundingSphere, GeometryInstance, CzmlDataSource, Intersect, Fullscreen } from 'cesium';
+import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, Entity, DistanceDisplayCondition, HorizontalOrigin, VerticalOrigin, ConstantProperty, ClassificationType, ConstantPositionProperty, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, ColorMaterialProperty, ColorBlendMode, HeadingPitchRoll, Transforms, Model, Primitive, Cesium3DTileFeature, SceneMode, GeoJsonDataSource, Cesium3DTileStyle, Cesium3DTileColorBlendMode, HeadingPitchRange, Ion, KmlDataSource, Quaternion, Matrix3, Matrix4, SceneTransforms, NearFarScalar, OrthographicFrustum, EasingFunction, EllipsoidTerrainProvider, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, IonResource, Cesium3DTileset, CesiumInspector, defined, ClockRange, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, BoundingSphere, GeometryInstance, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, ScreenSpaceEventHandler, ScreenSpaceEventType, CzmlDataSource, Intersect, Fullscreen } from 'cesium';
 
 const TIME_LAG = 300;
 const POSITION_CHECK_TIMER = 950;
@@ -7172,7 +7172,7 @@ var EntityRenderEngineModel3d;
      * @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 = [];
@@ -7364,6 +7364,8 @@ 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));
+            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;
@@ -7371,8 +7373,6 @@ var EntityRenderEngineModel3d;
                 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);
                 }
@@ -7395,8 +7395,6 @@ var EntityRenderEngineModel3d;
                     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 || !Cartesian3.equals(prevPos3d, pos3d);
                     if (posChanged) {
                         let posses = [];
@@ -7426,7 +7424,7 @@ var EntityRenderEngineModel3d;
                 }
             }
             // If we're animating position then we can animate orientation too based on the interpolated position.
-            if (animatePosition && animatePosition instanceof CesiumAnimatedProperty.AnimatePositionSeries && animatePosition.GetOrient) {
+            if (dateTime && animatePosition && animatePosition instanceof CesiumAnimatedProperty.AnimatePositionSeries && animatePosition.GetOrient) {
                 cEntity.orientation = new CallbackProperty(() => {
                     return animatePosition.GetOrient();
                 }, false);
@@ -7571,7 +7569,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 = (_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 ? 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;
@@ -32795,7 +32793,7 @@ function createDOMLabel(viewer, id, name, colorCss) {
     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;
@@ -32818,7 +32816,6 @@ function createDOMLabel(viewer, id, name, colorCss) {
     return label;
 }
 function updateDOMLabel(viewer, label, pos3d) {
-    var _a;
     if (!viewer || viewer.isDestroyed() || !label || !pos3d) {
         return;
     }
@@ -32841,11 +32838,11 @@ function updateDOMLabel(viewer, label, pos3d) {
         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;
@@ -32856,11 +32853,11 @@ function updateDOMLabel(viewer, label, pos3d) {
     label.style.left = `${leftPx}px`;
     label.style.top = `${topPx}px`;
     label.style.display = "block";
-    label.style.opacity = `${opacity}`;
+    label.style.opacity = "1";
 }
 var LiveCursor;
 (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");
         }
@@ -32875,6 +32872,9 @@ var LiveCursor;
                 labels[id].style.backgroundColor = colorCss;
             }
         }
+        if (typeof labelZIndex === "number") {
+            labels[id].style.zIndex = `${labelZIndex}`;
+        }
         positions[id] = pos3d;
         viewers[id] = viewer;
         // Manage Cesium entity
@@ -32935,7 +32935,17 @@ var LiveCursor;
         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;
                 }
@@ -33747,7 +33757,7 @@ class WidgetViewBar extends Widget.AWidget {
     }
 }
 
-const VERSION = "6.1.4";
+const VERSION = "6.1.6";
 
 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, LiveCursor, ViewRenderEngine, TileRenderEngine, TilesetRenderEngine, CESIUM_INSPECTOR_KEY, CESIUM_TIMELINE_KEY, CESIUM_TIMELINE_LIVE_KEY, CESIUM_TIMELINE_LIVE_PADDING_KEY, CESIUM_TIMELINE_INTERVAL_KEY, CESIUM_MODEL_SPACE_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