Make findFlyovers() request its own tiles to make sure all are fetched

Author: sinergise-anze

README.md

@@ -142,7 +142,7 @@ We can always use layer to search for data availability:
   const maxCloudCoverPercent = 50;
   const layerS2L2A = new S2L2ALayer(instanceId, 'S2L2A', null, null, null, null, null, maxCloudCoverPercent);
   const { tiles, hasMore } = layerS2L2A.findTiles(bbox, fromDate, toDate, maxCount, offset);
-  const flyoversS2L2A = layerS2L2A.findFlyovers(bbox, tiles);
+  const flyoversS2L2A = layerS2L2A.findFlyovers(bbox, fromDate, toDate);
   const dates = layerS2L2A.findDatesUTC(bbox, fromDate, toDate);
 
   const layerS1 = new S1GRDAWSEULayer(
@@ -151,7 +151,7 @@ We can always use layer to search for data availability:
     true, BackscatterCoeff.GAMMA0_ELLIPSOID, OrbitDirection.ASCENDING
   );
   const { tiles: tilesS1 } = layerS1.findTiles(bbox, fromDate, toDate, maxCount, offset);
-  const flyoversS1 = layerS1.findFlyovers(bbox, tilesS1);
+  const flyoversS1 = layerS1.findFlyovers(bbox, fromDate, toDate);
 ```
 
 ## Backwards compatibility

example/node/index.js

@@ -116,25 +116,37 @@ async function run() {
     getMapParams.toTime,
     20,
     0,
-    100,
   );
   printOut('tiles for S2 L2A:', tilesS2L2A);
   printOut('hasMore:', hasMore);
-  const flyoversS2L2A = layerS2L2A.findFlyovers(bbox, tilesS2L2A);
+
+  const flyoversS2L2A = await layerS2L2A.findFlyovers(
+    getMapParams.bbox,
+    getMapParams.fromTime,
+    getMapParams.toTime,
+    10,
+    50,
+  );
   printOut('flyovers for S2 L2A:', flyoversS2L2A);
 
   // get tiles and flyover intervals for S1 GRD Layer
-  const { tiles: tilesS1GRD, hasMoreS1 } = await layerS1.findTiles(
+  const { tiles: tilesS1GRD, hasMore: hasMoreS1 } = await layerS1.findTiles(
     getMapParams.bbox,
     getMapParams.fromTime,
     getMapParams.toTime,
     10,
     0,
-    OrbitDirection.ASCENDING,
   );
   printOut('tiles for S1 GRD:', tilesS1GRD);
   printOut('hasMore for S1:', hasMoreS1);
-  const flyoversS1GRD = layerS1.findFlyovers(bbox, tilesS1GRD);
+
+  const flyoversS1GRD = await layerS1.findFlyovers(
+    getMapParams.bbox,
+    getMapParams.fromTime,
+    getMapParams.toTime,
+    10,
+    50,
+  );
   printOut('flyovers for S1 GRD:', flyoversS1GRD);
 
   // finally, display the image:

src/layer/AbstractLayer.ts

@@ -49,11 +49,37 @@ export class AbstractLayer {
     throw new Error('Not implemented yet');
   }
 
-  public findFlyovers(bbox: BBox, tiles: Tile[]): FlyoverInterval[] {
+  public async findFlyovers(
+    bbox: BBox,
+    fromTime: Date,
+    toTime: Date,
+    maxFindTilesRequests: number = 50,
+    tilesPerRequest: number = 50,
+  ): Promise<FlyoverInterval[]> {
     if (!this.dataset || !this.dataset.orbitTimeMinutes) {
       throw new Error('Orbit time is needed for grouping tiles into flyovers.');
     }
 
+    let tiles: Tile[] = [];
+    for (let i = 0; i < maxFindTilesRequests; i++) {
+      const { tiles: partialTiles, hasMore } = await this.findTiles(
+        bbox,
+        fromTime,
+        toTime,
+        tilesPerRequest,
+        i * tilesPerRequest,
+      );
+      tiles = tiles.concat(partialTiles);
+      if (!hasMore) {
+        break;
+      }
+      if (i + 1 === maxFindTilesRequests) {
+        throw new Error(
+          `Could not fetch all the tiles in [${maxFindTilesRequests}] requests for [${tilesPerRequest}] tiles`,
+        );
+      }
+    }
+
     tiles.sort((a, b) => a.sensingTime.getTime() - b.sensingTime.getTime());
     let orbitTimeMS = this.dataset.orbitTimeMinutes * 60 * 1000;
     let flyoverIntervals: FlyoverInterval[] = [];

stories/s1grdiw.stories.js

@@ -300,15 +300,13 @@ export const findFlyovers = () => {
     await setAuthTokenWithOAuthCredentials();
     const fromTime = new Date(Date.UTC(2020, 1 - 1, 15, 0, 0, 0));
     const toTime = new Date(Date.UTC(2020, 1 - 1, 15, 6, 59, 59));
-    const { tiles } = await layer.findTiles(
+    const flyovers = await layer.findFlyovers(
       bbox,
       fromTime,
       toTime,
+      20,
       50,
-      0,
     );
-
-    const flyovers = layer.findFlyovers(bbox, tiles);
     flyoversContainerEl.innerHTML = JSON.stringify(flyovers, null, true)
 
     // prepare an image to show that the number makes sense: