bruce-cesium 5.4.3 → 5.4.5

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
-import { BruceEvent, Cartes, Entity as Entity$1, Carto, Geometry, MathUtils, LRUCache, Api, Calculator, ClientFile, EntityTag, EntityType, ObjectUtils, Style, ProjectViewTile, DelayQueue, EntityLod, Bounds, ZoomControl, EntityRelationType, ENVIRONMENT, EntityHistoricData, Tileset, EntityCoords, DataLab, EntitySource, MenuItem, EntityRelation, ProgramKey, ProjectView, ProjectViewBookmark, ProjectViewLegacyTile, Camera, EntityAttachment, EntityAttachmentType, EntityAttribute, AbstractApi, Session } from 'bruce-models';
+import { BruceEvent, Cartes, Entity as Entity$1, Carto, Geometry, MathUtils, LRUCache, Api, Calculator, ClientFile, EntityTag, EntityType, ObjectUtils, Style, ProjectViewTile, 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, SceneMode, Primitive, Cesium3DTileFeature, GeoJsonDataSource, Cesium3DTileStyle, Cesium3DTileColorBlendMode, HeadingPitchRange, Ion, KmlDataSource, SceneTransforms, EllipsoidTerrainProvider, CesiumInspector, OrthographicFrustum, defined, ClockRange, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, EasingFunction, NearFarScalar, PolygonPipeline, EllipsoidGeodesic, sampleTerrainMostDetailed, Cesium3DTileset, Matrix4, Matrix3, IonResource, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, BoundingSphere, GeometryInstance, Quaternion, ScreenSpaceEventHandler, ScreenSpaceEventType, 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, SceneMode, Primitive, Cesium3DTileFeature, GeoJsonDataSource, Cesium3DTileStyle, HeadingPitchRange, Cesium3DTileColorBlendMode, Ion, KmlDataSource, SceneTransforms, OrthographicFrustum, EasingFunction, NearFarScalar, EllipsoidTerrainProvider, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, CesiumInspector, defined, ClockRange, Cesium3DTileset, Matrix4, Matrix3, IonResource, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, BoundingSphere, GeometryInstance, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, ScreenSpaceEventHandler, ScreenSpaceEventType, Quaternion, CzmlDataSource, Intersect, Fullscreen } from 'cesium';
 
 const TIME_LAG = 300;
 const POSITION_CHECK_TIMER = 950;
@@ -2809,8 +2809,8 @@ var EntityUtils;
                         if (location) {
                             const latitude = EnsureNumber(location.latitude);
                             const longitude = EnsureNumber(location.longitude);
-                            // Disallowing exact 0.
-                            if (latitude || longitude) {
+                            // Disallowing 0.
+                            if (latitude && longitude) {
                                 const pos3d = Cartesian3.fromDegrees(longitude, latitude, EnsureNumber(location.altitude));
                                 const toAdjust = [pos3d];
                                 await ensureHeightRefs(toAdjust, sample);
@@ -2982,8 +2982,8 @@ var EntityUtils;
                 if (location && typeof location == "object" && Carto.ValidateCarto(location)) {
                     const latitude = EnsureNumber(location.latitude);
                     const longitude = EnsureNumber(location.longitude);
-                    // Disallowing exact 0.
-                    if (latitude || longitude) {
+                    // Disallowing 0.
+                    if (latitude && longitude) {
                         const pos3d = Cartesian3.fromDegrees(longitude, latitude, EnsureNumber(location.altitude));
                         posses.push(pos3d);
                     }
@@ -3034,8 +3034,8 @@ var EntityUtils;
                         longitude: (EnsureNumber(boundaries.minLongitude) + EnsureNumber(boundaries.maxLongitude)) / 2,
                         altitude: 0
                     };
-                    // Disallowing exact 0.
-                    if (point.latitude || point.longitude) {
+                    // Disallowing 0.
+                    if (point.latitude && point.longitude) {
                         const bPosses = [
                             Cartesian3.fromDegrees(EnsureNumber(boundaries.minLongitude), EnsureNumber(boundaries.minLatitude), EnsureNumber(boundaries.minAltitude)),
                             Cartesian3.fromDegrees(EnsureNumber(boundaries.maxLongitude), EnsureNumber(boundaries.maxLatitude), EnsureNumber(boundaries.maxAltitude))
@@ -3297,8 +3297,8 @@ var EntityUtils;
             if (location && typeof location == "object" && Carto.ValidateCarto(location)) {
                 const latitude = EnsureNumber(location.latitude);
                 const longitude = EnsureNumber(location.longitude);
-                // Disallowing exact 0.
-                if (latitude || longitude) {
+                // Disallowing 0.
+                if (latitude && longitude) {
                     return Cartesian3.fromDegrees(longitude, latitude, EnsureNumber(location.altitude));
                 }
             }
@@ -3360,8 +3360,8 @@ var EntityUtils;
                     longitude: (EnsureNumber(boundaries.minLongitude) + EnsureNumber(boundaries.maxLongitude)) / 2,
                     altitude: 0
                 };
-                // Disallowing exact 0.
-                if (point.latitude || point.longitude) {
+                // Disallowing 0.
+                if (point.latitude && point.longitude) {
                     if (Carto.ValidateCarto(point)) {
                         return Cartesian3.fromDegrees(point.longitude, point.latitude, point.altitude);
                     }
@@ -3417,7 +3417,7 @@ var EntityUtils;
             catch (e) {
                 console.error(e);
             }
-            if (entity && (isNaN(lat) || isNaN(lon) || (lat == 0 && lon == 0))) {
+            if (entity && (isNaN(lat) || isNaN(lon) || (lat == 0 || lon == 0))) {
                 try {
                     entity = (await Entity$1.Get({
                         api,
@@ -9227,7 +9227,7 @@ var EntityLabel;
                     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;
                     }
                 }
@@ -9517,6 +9517,9 @@ var EntityLabel;
                     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.
@@ -9568,6 +9571,9 @@ var EntityLabel;
                         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);
@@ -9580,10 +9586,8 @@ var EntityLabel;
                         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;
@@ -14310,8 +14314,11 @@ var EntitiesIdsRenderManager;
                 return;
             }
             let entitiesHistoric = {};
+            let changed = false;
             if ((this.item.BruceEntity.historic || this.item.BruceEntity.historicAttrKey) && entities.length) {
-                entitiesHistoric = await this.getHistoricInfo(entities);
+                const res = await this.getHistoricInfo(entities);
+                changed = res[0];
+                entitiesHistoric = res[1];
             }
             const { updated, entities: cEntities } = await EntityRenderEngine.Render({
                 viewer: this.viewer,
@@ -14322,7 +14329,7 @@ var EntitiesIdsRenderManager;
                 entitiesHistoric: entitiesHistoric,
                 entityHistoricDrawTrack: this.item.historicDrawTrack,
                 zoomControl: this.item.CameraZoomSettings,
-                force
+                force: force || changed
             });
             for (let i = 0; i < entities.length; i++) {
                 if (this.disposed) {
@@ -14402,7 +14409,7 @@ var EntitiesIdsRenderManager;
                 const newStop = stopTmp.getTime();
                 // Complete overlap - we already have all the data.
                 if (newStart >= cachedStart && newStop <= cachedStop) {
-                    return this.entitiesHistoric;
+                    return [false, this.entitiesHistoric];
                 }
                 // Calculate missing ranges.
                 rangesToRequest = [];
@@ -14477,7 +14484,7 @@ var EntitiesIdsRenderManager;
                 this.lastHistoricMax = stopTmp.toISOString();
                 this.entitiesHistoric = combined;
             }
-            return combined;
+            return [rangesToRequest.length > 0, combined];
         }
         viewerDateTimeSub() {
             var _a, _b;
@@ -30637,7 +30644,7 @@ class WidgetViewBar extends Widget.AWidget {
     }
 }
 
-const VERSION = "5.4.3";
+const VERSION = "5.4.5";
 
 export { VERSION, CesiumViewMonitor, ViewerUtils, ViewerEventTracker, MenuItemManager, isHistoricMetadataChanged, EntityRenderEngine, EntityRenderEnginePoint, EntityRenderEnginePolyline, EntityRenderEnginePolygon, EntityRenderEngineModel3d, MenuItemCreator, VisualsRegister, RenderManager, EntitiesIdsRenderManager, DataLabRenderManager, EntitiesLoadedRenderManager, EntitiesRenderManager, EntityRenderManager, TilesetCadRenderManager, TilesetArbRenderManager, TilesetEntitiesRenderManager, TilesetOsmRenderManager, TilesetPointcloudRenderManager, TilesetGooglePhotosRenderManager, DataSourceStaticKmlManager, GoogleSearchRenderManager, RelationsRenderManager, SharedGetters, CesiumParabola, EntityLabel, ViewRenderEngine, TileRenderEngine, TilesetRenderEngine, CESIUM_INSPECTOR_KEY, CESIUM_TIMELINE_KEY, CESIUM_TIMELINE_LIVE_KEY, CESIUM_TIMELINE_LIVE_PADDING_FORWARD_KEY, CESIUM_TIMELINE_LIVE_PADDING_BACKWARD_KEY, CESIUM_TIMELINE_INTERVAL_KEY, 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