bruce-models 1.0.3 → 1.0.5

package/dist/bruce-models.umd.js

@@ -3172,92 +3172,41 @@
         EntityType.Update = Update;
     })(exports.EntityType || (exports.EntityType = {}));
 
-    class Cell {
-        constructor() {
-            this.Fetched = false;
-            this.IsFetched = null;
-            this.FetchPageIndex = 0;
-            this.Boundaries = null;
-        }
-        GetBounds() {
-            // Entity data works in -180 to 180 range.
-            function prepareRangeForBounds(range) {
-                if (range > 180) {
-                    return range - 360;
-                }
-                return range;
-            }
-            // Add minor decimal as API crashes when giving it whole numbers.
-            const maxLon = prepareRangeForBounds(this.Boundaries.maxLongitude) + 0.00001;
-            const minLon = prepareRangeForBounds(this.Boundaries.minLongitude) - 0.00001;
-            const maxLat = prepareRangeForBounds(this.Boundaries.maxLatitude) + 0.00001;
-            const minLat = prepareRangeForBounds(this.Boundaries.minLatitude) - 0.00001;
-            return {
-                east: maxLon,
-                north: maxLat,
-                south: minLat,
-                west: minLon
-            };
-        }
-    }
-    function floorValueToCellSize(size, value) {
-        return Math.floor(value / size) * size;
-    }
-    function getCellSizeFromHeight(height) {
-        if (height < 1000) {
-            return 0.01;
-        }
-        if (height < 5000) {
-            return 0.025;
-        }
-        else if (height < 10000) {
-            return 0.05;
-        }
-        else if (height < 30000) {
-            return 0.1;
-        }
-        else if (height < 70000) {
-            return 0.2;
-        }
-        else if (height < 100000) {
-            return 0.3;
-        }
-        else if (height < 150000) {
-            return 0.4;
-        }
-        else if (height < 200000) {
-            return 0.5;
-        }
-        else if (height < 300000) {
-            return 0.6;
-        }
-        else if (height < 500000) {
-            return 1;
-        }
-        return 1.5;
-    }
-    function isCellFetched(cell) {
-        if (cell.Fetched) {
-            return true;
-        }
-        return false;
-    }
-    function getOrCreateCell(cells, cellSize, lon, maxLon, lat, maxLat) {
-        const id = cellSize + "_" + lon + "_" + maxLon + "_" + lat + "_" + maxLat;
-        let cell = cells[id];
-        if (!cell) {
-            cell = cells[id] = new Cell();
-            cell.Boundaries = {
-                minLatitude: lat,
-                maxLatitude: maxLat,
-                minLongitude: lon,
-                maxLongitude: maxLon
-            };
-            cell.IsFetched = () => isCellFetched(cell);
-        }
-        return [id, cell];
-    }
+    /**
+     * This is a helper for making entity requests based on a grid area.
+     * It will return grid cells based on given view-area then will remember when stuff-
+     * was fully-fetched for those cells to avoid making duplicate requests.
+     */
     (function (EntityGlobe) {
+        class Cell {
+            constructor() {
+                this.Fetched = false;
+                this.IsFetched = null;
+                this.FetchPageIndex = 0;
+                this.Boundaries = null;
+            }
+            GetBounds() {
+                // Entity data works in -180 to 180 range.
+                function prepareRangeForBounds(range) {
+                    if (range > 180) {
+                        return range - 360;
+                    }
+                    return range;
+                }
+                // Add minor decimal as API crashes when giving it whole numbers.
+                const maxLon = prepareRangeForBounds(this.Boundaries.maxLongitude) + 0.00001;
+                const minLon = prepareRangeForBounds(this.Boundaries.minLongitude) - 0.00001;
+                const maxLat = prepareRangeForBounds(this.Boundaries.maxLatitude) + 0.00001;
+                const minLat = prepareRangeForBounds(this.Boundaries.minLatitude) - 0.00001;
+                return {
+                    east: maxLon,
+                    north: maxLat,
+                    south: minLat,
+                    west: minLon
+                };
+            }
+        }
+        EntityGlobe.Cell = Cell;
         class Grid {
             constructor() {
                 this.cells = {};
@@ -3369,6 +3318,63 @@
     function area(rect) {
         let { west: w, south: s, north: n, east: e } = rect;
         return Math.abs((e - w) * (n - s));
+    }
+    function floorValueToCellSize(size, value) {
+        return Math.floor(value / size) * size;
+    }
+    function getCellSizeFromHeight(height) {
+        if (height < 1000) {
+            return 0.01;
+        }
+        if (height < 5000) {
+            return 0.025;
+        }
+        else if (height < 10000) {
+            return 0.05;
+        }
+        else if (height < 30000) {
+            return 0.1;
+        }
+        else if (height < 70000) {
+            return 0.2;
+        }
+        else if (height < 100000) {
+            return 0.3;
+        }
+        else if (height < 150000) {
+            return 0.4;
+        }
+        else if (height < 200000) {
+            return 0.5;
+        }
+        else if (height < 300000) {
+            return 0.6;
+        }
+        else if (height < 500000) {
+            return 1;
+        }
+        return 1.5;
+    }
+    function isCellFetched(cell) {
+        if (cell.Fetched) {
+            return true;
+        }
+        return false;
+    }
+    function getOrCreateCell(cells, cellSize, lon, maxLon, lat, maxLat) {
+        const id = cellSize + "_" + lon + "_" + maxLon + "_" + lat + "_" + maxLat;
+        let cell = cells[id];
+        if (!cell) {
+            cell = cells[id] = new exports.EntityGlobe.Cell();
+            cell.Boundaries = {
+                minLatitude: lat,
+                maxLatitude: maxLat,
+                minLongitude: lon,
+                maxLongitude: maxLon
+            };
+            cell.IsFetched = () => isCellFetched(cell);
+        }
+        return [id, cell];
     }
 
     const MAX_AREA_IN_DEGREES = 90;
@@ -3402,6 +3408,7 @@
                 this.onUpdate = null;
                 this.LastStateUpdates = {};
                 this.onStateUpdate = null;
+                this.onScanUpdate = null;
                 this.viewPortChangeRemoval = null;
                 this.cells = null;
                 this.registeredItems = {};
@@ -3430,6 +3437,20 @@
                 }
                 return this.onStateUpdate;
             }
+            get OnScanUpdate() {
+                if (!this.onScanUpdate) {
+                    this.onScanUpdate = new BruceEvent();
+                }
+                return this.onScanUpdate;
+            }
+            /**
+             * Returns id that represents the combined menu item parameters.
+             * If integrity changes while a request is running, the request will not emit a response.
+             * @returns
+             */
+            getIntegrityId() {
+                return this.tagIds == null ? "" : this.tagIds.join();
+            }
             viewAreaSub() {
                 this.viewAreaDispose();
                 this.viewPortChangeRemoval = this.viewPort.Updated().Subscribe(() => {
@@ -3516,8 +3537,9 @@
                 // Increase id so that existing loops stop.
                 this.getterLoopId += 1;
                 const loopId = this.getterLoopId;
+                const loopIntegrity = this.getIntegrityId();
                 new Promise(() => __awaiter(this, void 0, void 0, function* () {
-                    var _a, _b, _c, _d, _e;
+                    var _a, _b, _c, _d, _e, _f, _g, _h;
                     // Minor delay to stop 50 menu items enabling doing their first request all together.
                     // This gives it time to recognize only 1 request is needed.
                     // Would be better to not use this delay but we're on a clock.
@@ -3540,6 +3562,7 @@
                         return;
                     }
                     const cells = this.cells.GetCellsForView(this.viewRect);
+                    (_a = this.onScanUpdate) === null || _a === void 0 ? void 0 : _a.Trigger(cells);
                     let curCellIndex = cells.length > 0 ? 0 : null;
                     let postedScanning = false;
                     let postedLoading = false;
@@ -3560,6 +3583,7 @@
                             if (!cells[curCellIndex]) {
                                 curCellIndex = null;
                             }
+                            (_b = this.onScanUpdate) === null || _b === void 0 ? void 0 : _b.Trigger(cells);
                             continue;
                         }
                         try {
@@ -3572,24 +3596,27 @@
                                 sortOrder: exports.Api.ESortOrder.Asc,
                                 entityTypeConditions: this.attrFilter
                             });
+                            const integrity = this.getIntegrityId();
+                            if (loopIntegrity == integrity && page) {
+                                (_c = this.onUpdate) === null || _c === void 0 ? void 0 : _c.Trigger(page);
+                            }
                             if (this.getterLoopId != loopId) {
                                 break;
                             }
-                            if (page) {
-                                (_a = this.onUpdate) === null || _a === void 0 ? void 0 : _a.Trigger(page);
-                            }
                             if (!postedLoading) {
                                 this.postStatus({ msg: EStatus.Loading, revoking: false });
                                 postedLoading = true;
                             }
+                            // Only mark as fetched when ALL pages are done.
                             if (page.length <= 0) {
-                                curCell.Fetched = true; // Only mark as fetched when ALL pages are done.
+                                curCell.Fetched = true;
+                                (_d = this.onScanUpdate) === null || _d === void 0 ? void 0 : _d.Trigger(cells);
                                 continue;
                             }
                             // Checking to make sure it's not just the same batch over and over again.
                             if (page.length > 0) {
-                                const first = (_c = (_b = page[0]) === null || _b === void 0 ? void 0 : _b.Bruce) === null || _c === void 0 ? void 0 : _c.ID;
-                                const last = (_e = (_d = page[page.length - 1]) === null || _d === void 0 ? void 0 : _d.Bruce) === null || _e === void 0 ? void 0 : _e.ID;
+                                const first = (_f = (_e = page[0]) === null || _e === void 0 ? void 0 : _e.Bruce) === null || _f === void 0 ? void 0 : _f.ID;
+                                const last = (_h = (_g = page[page.length - 1]) === null || _g === void 0 ? void 0 : _g.Bruce) === null || _h === void 0 ? void 0 : _h.ID;
                                 if (prevFirstId == first && prevLastId == last) {
                                     break;
                                 }