bruce-cesium 5.7.2 → 5.7.4

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, HorizontalOrigin, VerticalOrigin, ColorBlendMode, HeadingPitchRoll, Transforms, Model, PolygonHierarchy, PolylineGraphics, ColorMaterialProperty, Primitive, Cesium3DTileFeature, SceneMode, GeoJsonDataSource, Cesium3DTileStyle, HeadingPitchRange, Cesium3DTileColorBlendMode, 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, HorizontalOrigin, VerticalOrigin, ConstantProperty, ClassificationType, ConstantPositionProperty, ArcType, CornerType, ShadowMode, ColorBlendMode, HeadingPitchRoll, Transforms, Model, PolygonHierarchy, PolylineGraphics, ColorMaterialProperty, SceneMode, Primitive, Cesium3DTileFeature, GeoJsonDataSource, Cesium3DTileStyle, HeadingPitchRange, Cesium3DTileColorBlendMode, Ion, KmlDataSource, Quaternion, Matrix3, Matrix4, OrthographicFrustum, EasingFunction, NearFarScalar, SceneTransforms, EllipsoidTerrainProvider, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, IonResource, CesiumInspector, defined, ClockRange, Cesium3DTileset, PolygonPipeline, EllipsoidGeodesic, sampleTerrainMostDetailed, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, BoundingSphere, GeometryInstance, ScreenSpaceEventHandler, ScreenSpaceEventType, CzmlDataSource, Intersect, Fullscreen } from 'cesium';
 
 const TIME_LAG = 300;
 const POSITION_CHECK_TIMER = 950;
@@ -6120,7 +6120,7 @@ async function getName(api, entity) {
 }
 async function getStyle(api, entity, styleId) {
     let style = null;
-    if (styleId) {
+    if (styleId && styleId != -1) {
         try {
             style = (await Style.Get({
                 api,
@@ -7405,7 +7405,7 @@ async function getName$1(api, entity) {
 }
 async function getStyle$1(api, entity, styleId) {
     let style = null;
-    if (styleId) {
+    if (styleId && styleId != -1) {
         try {
             style = (await Style.Get({
                 api,
@@ -7813,7 +7813,7 @@ async function getName$2(api, entity) {
 }
 async function getStyle$2(api, entity, styleId) {
     let style = null;
-    if (styleId) {
+    if (styleId && styleId != -1) {
         try {
             style = (await Style.Get({
                 api,
@@ -8282,7 +8282,7 @@ async function getName$3(api, entity) {
 }
 async function getStyle$3(api, entity, styleId) {
     let style = null;
-    if (styleId) {
+    if (styleId && styleId != -1) {
         try {
             style = (await Style.Get({
                 api,
@@ -9351,7 +9351,7 @@ function colorToCColor(color) {
 }
 async function getStyle$4(api, typeId, styleId) {
     let style = null;
-    if (styleId) {
+    if (styleId && styleId != -1) {
         try {
             style = (await Style.Get({
                 api,
@@ -13450,7 +13450,7 @@ var EntitiesRenderManager;
                 return;
             }
             let style = null;
-            if ((zoomItem === null || zoomItem === void 0 ? void 0 : zoomItem.StyleID) && (zoomItem === null || zoomItem === void 0 ? void 0 : zoomItem.StyleID) > -1) {
+            if ((zoomItem === null || zoomItem === void 0 ? void 0 : zoomItem.StyleID) && zoomItem.StyleID != -1) {
                 try {
                     style = (_a = (await Style.Get({
                         api: this.apiGetter.getApi(),
@@ -14359,7 +14359,7 @@ var EntitiesLoadedRenderManager;
                 return;
             }
             let style = null;
-            if ((zoomItem === null || zoomItem === void 0 ? void 0 : zoomItem.StyleID) && (zoomItem === null || zoomItem === void 0 ? void 0 : zoomItem.StyleID) > -1) {
+            if ((zoomItem === null || zoomItem === void 0 ? void 0 : zoomItem.StyleID) && zoomItem.StyleID != -1) {
                 try {
                     style = (_a = (await Style.Get({
                         api: this.apiGetter.getApi(),
@@ -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 };
@@ -15871,7 +15893,7 @@ class TilesetStyler {
                 }
             }
         }
-        if (!isNaN(params.fallbackStyleId) && params.fallbackStyleId != null) {
+        if (params.fallbackStyleId != null && params.fallbackStyleId != undefined && params.fallbackStyleId != "") {
             this.fallbackStyleId = params.fallbackStyleId;
         }
         if (params.fallbackStyle) {
@@ -15992,7 +16014,7 @@ class TilesetStyler {
         this.entityGatherer.Empty();
         this.entityGatherer.Init(this.historic, this.expandSources);
         let fallbackStyleId = this.fallbackStyleId;
-        if (fallbackStyleId && fallbackStyleId > 0) {
+        if (fallbackStyleId && fallbackStyleId != -1) {
             try {
                 let { style: data } = await Style.Get({
                     api: this.api,
@@ -16081,7 +16103,7 @@ class TilesetStyler {
                         console.error(e);
                     }
                 }
-                if (styleId) {
+                if (styleId && styleId != -1) {
                     try {
                         let { style: data } = await Style.Get({
                             api: this.api,
@@ -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;
@@ -18399,8 +18421,12 @@ var TilesetCadRenderManager;
                     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.
@@ -18591,7 +18617,7 @@ var TilesetCadRenderManager;
             this.viewer.scene.requestRender();
         }
     }
-    TilesetCadRenderManager$$1.Manager = Manager;
+    TilesetCadRenderManager.Manager = Manager;
 })(TilesetCadRenderManager || (TilesetCadRenderManager = {}));
 
 var DataLabRenderManager;
@@ -19224,7 +19250,7 @@ var TilesetEntitiesRenderManager;
                                     viewer: this.viewer,
                                     api: api,
                                     cTileset: this.cTileset,
-                                    fallbackStyleId: +this.item.styleId,
+                                    fallbackStyleId: this.item.styleId,
                                     styleMapping: [],
                                     expandSources: false,
                                     menuItemId: this.item.id,
@@ -32137,7 +32163,7 @@ class WidgetViewBar extends Widget.AWidget {
     }
 }
 
-const VERSION = "5.7.2";
+const VERSION = "5.7.4";
 
 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