bruce-models 2.1.2 → 2.1.3

package/dist/bruce-models.umd.js

@@ -7014,7 +7014,7 @@
             constructor() {
                 this.cells = {};
             }
-            GetCellsForView(viewRect) {
+            GetCellsForView(cameraPos, viewRect) {
                 const cells = [];
                 const minLat = viewRect.south;
                 const minLon = viewRect.west;
@@ -7024,31 +7024,35 @@
                 const cellDegreeSize = getCellSizeFromHeight(viewRect.alt);
                 const curMinLon = floorValueToCellSize(cellDegreeSize, minLon);
                 const curMinLat = floorValueToCellSize(cellDegreeSize, minLat);
-                const width = (maxLon - curMinLon) / cellDegreeSize;
-                const height = (maxLat - curMinLat) / cellDegreeSize;
-                const centerX = (minLon + maxLon) / 2;
-                const centerY = (minLat + maxLat) / 2;
+                let centerX = cameraPos === null || cameraPos === void 0 ? void 0 : cameraPos.longitude;
+                let centerY = cameraPos === null || cameraPos === void 0 ? void 0 : cameraPos.latitude;
+                if (isNaN(centerX) || isNaN(centerY)) {
+                    centerX = (minLon + maxLon) / 2;
+                    centerY = (minLat + maxLat) / 2;
+                }
+                const width = Math.ceil((maxLon - curMinLon) / cellDegreeSize);
+                const height = Math.ceil((maxLat - curMinLat) / cellDegreeSize);
+                const cellDistances = [];
                 for (let x = 0; x < width; x++) {
                     for (let y = 0; y < height; y++) {
                         const lon = x * cellDegreeSize + curMinLon;
                         const lat = y * cellDegreeSize + curMinLat;
-                        const [id, cell] = getOrCreateCell(this.cells, cellDegreeSize, lon, lon + cellDegreeSize, lat, lat + cellDegreeSize);
-                        cells.push(cell);
-                        if (cells.length > MAX_CELLS) {
-                            break;
-                        }
+                        const cellCenterX = lon + cellDegreeSize / 2;
+                        const cellCenterY = lat + cellDegreeSize / 2;
+                        const dist = Math.sqrt(Math.pow(cellCenterX - centerX, 2) + Math.pow(cellCenterY - centerY, 2));
+                        cellDistances.push({ x, y, dist });
+                    }
+                }
+                cellDistances.sort((a, b) => a.dist - b.dist);
+                for (const { x, y } of cellDistances) {
+                    const lon = x * cellDegreeSize + curMinLon;
+                    const lat = y * cellDegreeSize + curMinLat;
+                    const [id, cell] = getOrCreateCell(this.cells, cellDegreeSize, lon, lon + cellDegreeSize, lat, lat + cellDegreeSize);
+                    cells.push(cell);
+                    if (cells.length >= MAX_CELLS) {
+                        break;
                     }
                 }
-                // Sort cells so that the ones closest to the center are first
-                cells.sort((a, b) => {
-                    const aCenterX = (a.Boundaries.minLongitude + a.Boundaries.maxLongitude) / 2;
-                    const aCenterY = (a.Boundaries.minLatitude + a.Boundaries.maxLatitude) / 2;
-                    const bCenterX = (b.Boundaries.minLongitude + b.Boundaries.maxLongitude) / 2;
-                    const bCenterY = (b.Boundaries.minLatitude + b.Boundaries.maxLatitude) / 2;
-                    const aDist = Math.sqrt(Math.pow(aCenterX - centerX, 2) + Math.pow(aCenterY - centerY, 2));
-                    const bDist = Math.sqrt(Math.pow(bCenterX - centerX, 2) + Math.pow(bCenterY - centerY, 2));
-                    return aDist - bDist;
-                });
                 return cells;
             }
         }
@@ -7298,7 +7302,7 @@
                     if (alt > MAX_HEIGHT || (alt < MIN_HEIGHT && MIN_HEIGHT > 0)) {
                         return;
                     }
-                    const cells = this.cells.GetCellsForView(this.viewRect);
+                    const cells = this.cells.GetCellsForView(this.viewCenter, this.viewRect);
                     (_a = this.onScanUpdate) === null || _a === void 0 ? void 0 : _a.Trigger(cells);
                     let curCellIndex = cells.length > 0 ? 0 : null;
                     let postedScanning = false;