bruce-cesium 5.7.2 → 5.7.4

package/dist/bruce-cesium.umd.js

@@ -6106,7 +6106,7 @@
     }
     async function getStyle(api, entity, styleId) {
         let style = null;
-        if (styleId) {
+        if (styleId && styleId != -1) {
             try {
                 style = (await BModels.Style.Get({
                     api,
@@ -7387,7 +7387,7 @@
     }
     async function getStyle$1(api, entity, styleId) {
         let style = null;
-        if (styleId) {
+        if (styleId && styleId != -1) {
             try {
                 style = (await BModels.Style.Get({
                     api,
@@ -7791,7 +7791,7 @@
     }
     async function getStyle$2(api, entity, styleId) {
         let style = null;
-        if (styleId) {
+        if (styleId && styleId != -1) {
             try {
                 style = (await BModels.Style.Get({
                     api,
@@ -8259,7 +8259,7 @@
     }
     async function getStyle$3(api, entity, styleId) {
         let style = null;
-        if (styleId) {
+        if (styleId && styleId != -1) {
             try {
                 style = (await BModels.Style.Get({
                     api,
@@ -9327,7 +9327,7 @@
     }
     async function getStyle$4(api, typeId, styleId) {
         let style = null;
-        if (styleId) {
+        if (styleId && styleId != -1) {
             try {
                 style = (await BModels.Style.Get({
                     api,
@@ -13412,7 +13412,7 @@
                     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 BModels.Style.Get({
                             api: this.apiGetter.getApi(),
@@ -14315,7 +14315,7 @@
                     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 BModels.Style.Get({
                             api: this.apiGetter.getApi(),
@@ -15000,6 +15000,10 @@
                 const maxDateTimeStr = this.viewer.clock.stopTime.toString();
                 const minDateTime = new Date(minDateTimeStr).getTime();
                 const maxDateTime = new Date(maxDateTimeStr).getTime();
+                const tDetails = exports.ViewUtils.GetTimeDetails({
+                    viewer: this.viewer,
+                });
+                const isLive = tDetails.isLive;
                 let rangesToRequest = [{
                         start: minDateTime,
                         stop: maxDateTime
@@ -15031,10 +15035,14 @@
                     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) {
@@ -15043,6 +15051,20 @@
                             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 };
@@ -15818,7 +15840,7 @@
                     }
                 }
             }
-            if (!isNaN(params.fallbackStyleId) && params.fallbackStyleId != null) {
+            if (params.fallbackStyleId != null && params.fallbackStyleId != undefined && params.fallbackStyleId != "") {
                 this.fallbackStyleId = params.fallbackStyleId;
             }
             if (params.fallbackStyle) {
@@ -15939,7 +15961,7 @@
             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 BModels.Style.Get({
                         api: this.api,
@@ -16028,7 +16050,7 @@
                             console.error(e);
                         }
                     }
-                    if (styleId) {
+                    if (styleId && styleId != -1) {
                         try {
                             let { style: data } = await BModels.Style.Get({
                                 api: this.api,
@@ -18339,8 +18361,12 @@
                         maxDateTime <= foundMaxDateTime) {
                         return;
                     }
+                    const tDetails = exports.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.
@@ -19161,7 +19187,7 @@
                                         viewer: this.viewer,
                                         api: api,
                                         cTileset: this.cTileset,
-                                        fallbackStyleId: +this.item.styleId,
+                                        fallbackStyleId: this.item.styleId,
                                         styleMapping: [],
                                         expandSources: false,
                                         menuItemId: this.item.id,
@@ -32033,7 +32059,7 @@
         }
     }
 
-    const VERSION = "5.7.2";
+    const VERSION = "5.7.4";
 
     exports.VERSION = VERSION;
     exports.isOutlineChanged = isOutlineChanged;