bruce-cesium 5.7.3 → 5.7.5

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 { 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, AbstractApi, Session, EntityAttachment, EntityAttachmentType, EntityAttribute } from 'bruce-models';
 import * as Cesium 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, OrthographicFrustum, EasingFunction, NearFarScalar, 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';
+import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, Entity, DistanceDisplayCondition, ClassificationType, ArcType, CornerType, ShadowMode, ConstantProperty, ConstantPositionProperty, HorizontalOrigin, VerticalOrigin, PolygonHierarchy, PolylineGraphics, ColorMaterialProperty, ColorBlendMode, HeadingPitchRoll, Transforms, Model, SceneMode, Primitive, Cesium3DTileFeature, GeoJsonDataSource, HeadingPitchRange, Cesium3DTileStyle, KmlDataSource, Cesium3DTileColorBlendMode, Ion, Quaternion, Matrix3, Matrix4, OrthographicFrustum, EasingFunction, NearFarScalar, SceneTransforms, EllipsoidTerrainProvider, CesiumInspector, defined, ClockRange, PolygonPipeline, Cesium3DTileset, IonResource, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, BoundingSphere, GeometryInstance, EllipsoidGeodesic, sampleTerrainMostDetailed, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, ScreenSpaceEventHandler, ScreenSpaceEventType, CzmlDataSource, Intersect, Fullscreen } from 'cesium';
 
 const TIME_LAG = 300;
 const POSITION_CHECK_TIMER = 950;
@@ -15049,6 +15049,10 @@ var EntitiesIdsRenderManager;
             const maxDateTimeStr = this.viewer.clock.stopTime.toString();
             const minDateTime = new Date(minDateTimeStr).getTime();
             const maxDateTime = new Date(maxDateTimeStr).getTime();
+            const tDetails = ViewUtils.GetTimeDetails({
+                viewer: this.viewer,
+            });
+            const isLive = tDetails.isLive;
             let rangesToRequest = [{
                     start: minDateTime,
                     stop: maxDateTime
@@ -15080,10 +15084,14 @@ var EntitiesIdsRenderManager;
                 rangesToRequest = [];
                 // Check if we need data before our cached range.
                 if (foundMinDateTime != null && foundMinDateTime > minDateTime) {
-                    rangesToRequest.push({
-                        start: minDateTime,
-                        stop: new Date(foundMinDateTime).getTime()
-                    });
+                    // When live we focus on getting the next range rather than old data.
+                    // Ends up being one less request to perform every second.
+                    if (!isLive || foundMinDateTime == null) {
+                        rangesToRequest.push({
+                            start: minDateTime,
+                            stop: new Date(foundMinDateTime).getTime()
+                        });
+                    }
                 }
                 // Check if we need data after our cached range.
                 if (foundMaxDateTime != null && foundMaxDateTime < maxDateTime) {
@@ -15092,6 +15100,20 @@ var EntitiesIdsRenderManager;
                         stop: maxDateTime
                     });
                 }
+                // If the ranges to request are within a tolerance, combine them.
+                if (rangesToRequest.length > 1) {
+                    const TOLERANCE_MS = 60000; // 1 minute.
+                    let currentRange = rangesToRequest[0];
+                    for (let i = 1; i < rangesToRequest.length; i++) {
+                        const nextRange = rangesToRequest[i];
+                        if (nextRange.start - currentRange.stop <= TOLERANCE_MS) {
+                            currentRange.stop = nextRange.stop;
+                        }
+                        else {
+                            currentRange = nextRange;
+                        }
+                    }
+                }
             }
             const entityIds = entities.map(x => x.Bruce.ID);
             const combined = { ...this.entitiesHistoric };
@@ -17822,7 +17844,7 @@ var SharedGetters;
  * CAD tilesets are referred to as "MODEL" tilesets in some other areas of Bruce code.
  */
 var TilesetCadRenderManager;
-(function (TilesetCadRenderManager$$1) {
+(function (TilesetCadRenderManager) {
     class Manager {
         get Disposed() {
             return this.disposed;
@@ -17856,7 +17878,7 @@ var TilesetCadRenderManager;
             // Callback to dispose the link between scene time and the root's historic position.
             this.viewerDateTimeChangeRemoval = null;
             // Series of points to help interpolate movement when the timeline changes.
-            this.historicPosses = [];
+            this.historicPossesInitialLoaded = false;
             this.historicAnimation = null;
             this.historicPossesLoadingProm = null;
             const { viewer, register: visualsManager, getters, item, modelSpace } = params;
@@ -18392,15 +18414,19 @@ var TilesetCadRenderManager;
                 const foundMinDateTime = (range === null || range === void 0 ? void 0 : range.minDate) ? range.minDate.getTime() : null;
                 const foundMaxDateTime = (range === null || range === void 0 ? void 0 : range.maxDate) ? range.maxDate.getTime() : null;
                 // See if the current range is within the range we already have.
-                if (this.historicPosses.length > 0 &&
+                if (this.historicPossesInitialLoaded &&
                     foundMinDateTime &&
                     foundMaxDateTime &&
                     minDateTime >= foundMinDateTime &&
                     maxDateTime <= foundMaxDateTime) {
                     return;
                 }
+                const tDetails = ViewUtils.GetTimeDetails({
+                    viewer: this.viewer,
+                });
+                const isLive = tDetails.isLive;
                 // See if the requested range is before or after the range we have.
-                const fetchBefore = !foundMinDateTime || minDateTime < foundMinDateTime;
+                const fetchBefore = !foundMinDateTime || (!isLive && minDateTime < foundMinDateTime);
                 const fetchAfter = !foundMaxDateTime || maxDateTime > foundMaxDateTime;
                 if (!fetchBefore && !fetchAfter) {
                     // Already have the data we need.
@@ -18470,7 +18496,34 @@ var TilesetCadRenderManager;
                             res(false);
                             return;
                         }
-                        this.historicPosses = positions;
+                        // Also request the current position in case its not in the range.
+                        const { entity } = await Entity$1.Get({
+                            entityId: this.rootId,
+                            historicPoint: this.viewer.clock.currentTime.toString(),
+                            api: api
+                        });
+                        if (this.disposed || !entity) {
+                            res(false);
+                            return;
+                        }
+                        const historicDetails = entity.Bruce.Outline ? entity.Bruce.Outline.find(x => !!x.DateTime) : null;
+                        if (historicDetails) {
+                            const pos3d = EntityUtils.GetPos({
+                                entity: entity,
+                                viewer: this.viewer,
+                                recordHeightRef: HeightReference.NONE,
+                                returnHeightRef: HeightReference.CLAMP_TO_GROUND,
+                                allowRendered: false
+                            });
+                            if (pos3d && !isNaN(pos3d.x) && !isNaN(pos3d.y) && !isNaN(pos3d.z)) {
+                                positions.push({
+                                    dateTime: new Date(historicDetails.DateTime),
+                                    pos3d: pos3d,
+                                    heading: null
+                                });
+                            }
+                        }
+                        this.historicPossesInitialLoaded = true;
                         res(positions);
                     }
                     catch (e) {
@@ -18591,7 +18644,7 @@ var TilesetCadRenderManager;
             this.viewer.scene.requestRender();
         }
     }
-    TilesetCadRenderManager$$1.Manager = Manager;
+    TilesetCadRenderManager.Manager = Manager;
 })(TilesetCadRenderManager || (TilesetCadRenderManager = {}));
 
 var DataLabRenderManager;
@@ -32137,7 +32190,7 @@ class WidgetViewBar extends Widget.AWidget {
     }
 }
 
-const VERSION = "5.7.3";
+const VERSION = "5.7.5";
 
 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, ViewRenderEngine, TileRenderEngine, TilesetRenderEngine, CESIUM_INSPECTOR_KEY, CESIUM_TIMELINE_KEY, CESIUM_TIMELINE_LIVE_KEY, CESIUM_TIMELINE_LIVE_PADDING_KEY, CESIUM_TIMELINE_INTERVAL_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