bruce-cesium 5.2.1 → 5.2.3

package/dist/bruce-cesium.umd.js

@@ -12145,7 +12145,7 @@
                 const minMax = exports.RenderManager.GetZoomMinMax({
                     zoomControl: this.zoomControl
                 });
-                this.getter.IncludeMenuItem(this.item.id, (tagsToRender === null || tagsToRender === void 0 ? void 0 : tagsToRender.length) ? tagsToRender : [], minMax[0], minMax[1]);
+                this.getter.IncludeMenuItem(this.item.id, this.item.BruceEntity["EntityType.ID"], (tagsToRender === null || tagsToRender === void 0 ? void 0 : tagsToRender.length) ? tagsToRender : [], minMax[0], minMax[1]);
                 this.getterSub = this.getter.OnUpdate.Subscribe((entities) => {
                     if (isTagItem) {
                         this.distributeForRender(entities.filter((entity) => {
@@ -14580,7 +14580,8 @@
     const RETRY_DELAY_INCREMENT = 500;
     const REQUEST_PAGE_DELAY = 50;
     class regMenuItemGetter {
-        constructor(tagIds, minHeight, maxHeight) {
+        constructor(typeId, tagIds, minHeight, maxHeight) {
+            this.TypeId = typeId;
             this.TagIds = tagIds;
             this.MinHeight = minHeight;
             this.MaxHeight = maxHeight;
@@ -14624,6 +14625,9 @@
                 }
                 return this.onScanUpdate;
             }
+            get isLooping() {
+                return this.looping > 0;
+            }
             constructor(params) {
                 this.onUpdate = null;
                 this.LastStateUpdates = {};
@@ -14636,6 +14640,7 @@
                 this.registeredItems = {};
                 this.getterLoopId = 0;
                 this.getterLoopAbortControllers = {};
+                this.looping = 0;
                 this.tagIds = null;
                 this.minHeight = 0;
                 this.maxHeight = 100000;
@@ -14647,9 +14652,9 @@
                 // We use this for refreshing historic data without having to repeat geographic queries.
                 this.gatheredIntegrity = null;
                 this.gatheredEntityIds = [];
-                const { api, viewer, viewPort, typeId, schemaId, batchSize, attrFilter, historicAttrKey, historicInterpolation, historic, viaCdn, scenario } = params;
+                const { api, viewer, viewPort, typeIds, schemaId, batchSize, attrFilter, historicAttrKey, historicInterpolation, historic, viaCdn, scenario } = params;
                 this.api = api;
-                this.typeId = typeId;
+                this.typeIds = typeIds;
                 this.schemaId = schemaId;
                 this.historic = Boolean(historic);
                 this.historicAttrKey = historicAttrKey;
@@ -14679,6 +14684,9 @@
                 if (this.scenario) {
                     integrity += this.scenario;
                 }
+                if (this.typeIds) {
+                    integrity += this.typeIds.join();
+                }
                 return integrity;
             }
             viewAreaSub() {
@@ -14776,14 +14784,14 @@
             GetMenuItems() {
                 return Object.keys(this.registeredItems);
             }
-            IncludeMenuItem(menuItemId, layerIds, minHeight, maxHeight) {
-                this.registeredItems[menuItemId] = new regMenuItemGetter(layerIds, minHeight, maxHeight);
+            IncludeMenuItem(menuItemId, typeId, layerIds, minHeight, maxHeight) {
+                this.registeredItems[menuItemId] = new regMenuItemGetter(typeId, layerIds, minHeight, maxHeight);
                 this.updateState();
             }
             ExcludeMenuItem(menuItemId) {
                 this.registeredItems[menuItemId] = null;
                 delete this.registeredItems[menuItemId];
-                this.updateState();
+                this.updateState(true);
             }
             updateBounds() {
                 const viewRect = this.viewPort.GetBounds();
@@ -14799,8 +14807,9 @@
                     this.viewCenter = poi;
                 }
             }
-            updateState() {
+            updateState(onlyIfLooping = false) {
                 const tagIds = [];
+                const typeIds = [];
                 const menuItemIds = this.GetMenuItems();
                 let minHeight = null;
                 let maxHeight = null;
@@ -14822,12 +14831,19 @@
                                 }
                             }
                         }
+                        const itemTypeId = menuItem.TypeId;
+                        if (itemTypeId) {
+                            if (!typeIds.includes(itemTypeId)) {
+                                typeIds.push(itemTypeId);
+                            }
+                        }
                     }
                 }
-                if (menuItemIds.length > 0) {
+                if (menuItemIds.length > 0 && (!onlyIfLooping || this.isLooping)) {
                     // Reset cells so none are marked as fetched.
                     this.cells = new EntityGlobe.Grid();
                     this.tagIds = tagIds;
+                    this.typeIds = typeIds;
                     this.minHeight = minHeight;
                     this.maxHeight = maxHeight;
                     this.updateBounds();
@@ -14864,6 +14880,7 @@
                     this.getterLoopAbortControllers = newAbortControllers;
                 }
                 const abortController = this.getterLoopAbortControllers[abortId] = new AbortController();
+                this.looping += 1;
                 (async () => {
                     var _a, _b, _c, _d, _e, _f, _g, _h;
                     // Larger initial delay for the first loops because terrain is likely loading in.
@@ -14924,7 +14941,7 @@
                                 nextPage: false,
                                 nextPageUrl: null
                             };
-                            await exports.SharedGetters.Queue.Run("Loading Entities from Menu Item that loads Entity Type: " + this.typeId, async () => {
+                            await exports.SharedGetters.Queue.Run("Loading Entities from Menu Item that loads Entity Type: " + this.typeIds, async () => {
                                 var _a;
                                 if (abortController.signal.aborted || !((_a = this.GetMenuItems()) === null || _a === void 0 ? void 0 : _a.length)) {
                                     return;
@@ -14952,7 +14969,7 @@
                                         filter: {
                                             pageSize: PAGE_SIZE,
                                             pageIndex: curCell.FetchPageIndex,
-                                            entityTypeId: this.typeId,
+                                            entityTypeId: this.typeIds,
                                             layerIds: this.tagIds,
                                             // Any tag specified will be allowed.
                                             layerIdsOperator: "in",
@@ -15064,7 +15081,11 @@
                     if (postedScanning) {
                         this.postStatus({ msg: EStatus.Scanning, revoking: true });
                     }
-                })();
+                })().then(() => {
+                    this.looping -= 1;
+                }).catch(() => {
+                    this.looping -= 1;
+                });
             }
             /**
              * Gets the historic state of found Entities for the current date times and emits them.
@@ -15097,7 +15118,7 @@
                             // Controller we can use to abort the request when a new loop starts.
                             const controller = this.historicRefreshAbortController = new AbortController();
                             let entities = [];
-                            await exports.SharedGetters.Queue.Run("Refreshing historic data in Menu Item that loads Entity Type: " + this.typeId, async () => {
+                            await exports.SharedGetters.Queue.Run("Refreshing historic data in Menu Item that loads Entity Type: " + this.typeIds, async () => {
                                 var _a;
                                 if (controller.signal.aborted || !((_a = this.GetMenuItems()) === null || _a === void 0 ? void 0 : _a.length)) {
                                     return;
@@ -15111,7 +15132,7 @@
                                     filter: {
                                         pageSize: batch.length,
                                         pageIndex: 0,
-                                        entityTypeId: this.typeId,
+                                        entityTypeId: this.typeIds,
                                         layerIds: this.tagIds,
                                         layerIdsOperator: "in",
                                         sortOrder: BModels.Api.ESortOrder.Asc,
@@ -15167,7 +15188,9 @@
     function createFilterGetterCacheKey(params) {
         let cacheKey = "";
         cacheKey += params.api.GetBaseUrl();
-        cacheKey += params.typeId;
+        // Not including Type ID in the cache key now.
+        // This allows us to re-use the same getter between Entity Types.
+        // cacheKey += params.typeId;
         cacheKey += params.batchSize;
         cacheKey += String(params.cdn);
         cacheKey += params.schemaId ? params.schemaId : "";
@@ -15196,7 +15219,7 @@
                         api: params.api,
                         viewer: params.viewer,
                         viewPort: params.monitor,
-                        typeId: params.typeId,
+                        typeIds: !params.typeId ? null : typeof params.typeId == "string" ? [params.typeId] : params.typeId,
                         schemaId: params.schemaId,
                         batchSize: params.batchSize,
                         attrFilter: params.attrFilter,
@@ -29812,7 +29835,7 @@
         }
     }
 
-    const VERSION = "5.2.1";
+    const VERSION = "5.2.3";
 
     exports.VERSION = VERSION;
     exports.isHistoricMetadataChanged = isHistoricMetadataChanged;