Merge pull request #34 from sentinel-hub/fix/flyovers-landsat8

Fix findTiles() for Landsat8 on AWS

Author: sinergise-anze

.env.example

@@ -12,6 +12,7 @@ S3OLCI_LAYER_ID=
 BYOC_LAYER_ID=
 BYOC_COLLECTION_ID=
 S5PL2_LAYER_ID=
+LANDSAT8_LAYER_ID=
 
 EOC_INSTANCE_ID=
 EOC_S1GRDIW_LAYER_ID=

src/layer/AbstractSentinelHubV3Layer.ts

@@ -2,7 +2,7 @@ import axios, { AxiosRequestConfig } from 'axios';
 
 import { getAuthToken, isAuthTokenSet } from 'src/auth';
 import { BBox } from 'src/bbox';
-import { GetMapParams, ApiType } from 'src/layer/const';
+import { GetMapParams, ApiType, PaginatedTiles } from 'src/layer/const';
 import { fetchCached } from 'src/layer/utils';
 import { wmsGetMapUrl } from 'src/layer/wms';
 import { processingGetMap, createProcessingPayload, ProcessingPayload } from 'src/layer/processing';
@@ -148,6 +148,24 @@ export class AbstractSentinelHubV3Layer extends AbstractLayer {
     return requestConfig;
   }
 
+  public async findTiles(
+    bbox: BBox,
+    fromTime: Date,
+    toTime: Date,
+    maxCount?: number,
+    offset?: number,
+  ): Promise<PaginatedTiles> {
+    const response = await this.fetchTiles(bbox, fromTime, toTime, maxCount, offset);
+    return {
+      tiles: response.data.tiles.map(tile => ({
+        geometry: tile.dataGeometry,
+        sensingTime: new Date(tile.sensingTime),
+        meta: {},
+      })),
+      hasMore: response.data.hasMore,
+    };
+  }
+
   protected fetchTiles(
     bbox: BBox,
     fromTime: Date,

src/layer/AbstractSentinelHubV3WithCCLayer.ts

@@ -0,0 +1,49 @@
+import { BBox } from 'src/bbox';
+import { PaginatedTiles } from 'src/layer/const';
+import { AbstractSentinelHubV3Layer } from './AbstractSentinelHubV3Layer';
+
+// same as AbstractSentinelHubV3Layer, but with maxCloudCoverPercent (for layers which support it)
+export class AbstractSentinelHubV3WithCCLayer extends AbstractSentinelHubV3Layer {
+  public maxCloudCoverPercent: number;
+
+  public constructor(
+    instanceId: string | null,
+    layerId: string | null = null,
+    evalscript: string | null = null,
+    evalscriptUrl: string | null = null,
+    dataProduct: string | null = null,
+    title: string | null = null,
+    description: string | null = null,
+    maxCloudCoverPercent: number | null = 100,
+  ) {
+    super(instanceId, layerId, evalscript, evalscriptUrl, dataProduct, title, description);
+    this.maxCloudCoverPercent = maxCloudCoverPercent;
+  }
+
+  public async findTiles(
+    bbox: BBox,
+    fromTime: Date,
+    toTime: Date,
+    maxCount?: number,
+    offset?: number,
+  ): Promise<PaginatedTiles> {
+    const response = await this.fetchTiles(
+      bbox,
+      fromTime,
+      toTime,
+      maxCount,
+      offset,
+      this.maxCloudCoverPercent,
+    );
+    return {
+      tiles: response.data.tiles.map(tile => ({
+        geometry: tile.dataGeometry,
+        sensingTime: new Date(tile.sensingTime),
+        meta: {
+          cloudCoverPercent: tile.cloudCoverPercentage,
+        },
+      })),
+      hasMore: response.data.hasMore,
+    };
+  }
+}

src/layer/Landsat8AWSLayer.ts

@@ -1,6 +1,6 @@
 import { DATASET_AWS_L8L1C } from 'src/layer/dataset';
-import { AbstractSentinelHubV3Layer } from 'src/layer/AbstractSentinelHubV3Layer';
+import { AbstractSentinelHubV3WithCCLayer } from './AbstractSentinelHubV3WithCCLayer';
 
-export class Landsat8AWSLayer extends AbstractSentinelHubV3Layer {
+export class Landsat8AWSLayer extends AbstractSentinelHubV3WithCCLayer {
   public readonly dataset = DATASET_AWS_L8L1C;
 }

src/layer/S2L1CLayer.ts

@@ -1,26 +1,9 @@
-import { BBox } from 'src/bbox';
-import { PaginatedTiles } from 'src/layer/const';
 import { DATASET_S2L1C } from 'src/layer/dataset';
-import { AbstractSentinelHubV3Layer } from 'src/layer/AbstractSentinelHubV3Layer';
+import { AbstractSentinelHubV3WithCCLayer } from './AbstractSentinelHubV3WithCCLayer';
 import { ProcessingPayload } from 'src/layer/processing';
 
-export class S2L1CLayer extends AbstractSentinelHubV3Layer {
+export class S2L1CLayer extends AbstractSentinelHubV3WithCCLayer {
   public readonly dataset = DATASET_S2L1C;
-  public maxCloudCoverPercent: number;
-
-  public constructor(
-    instanceId: string | null,
-    layerId: string | null = null,
-    evalscript: string | null = null,
-    evalscriptUrl: string | null = null,
-    dataProduct: string | null = null,
-    title: string | null = null,
-    description: string | null = null,
-    maxCloudCoverPercent: number | null = 100,
-  ) {
-    super(instanceId, layerId, evalscript, evalscriptUrl, dataProduct, title, description);
-    this.maxCloudCoverPercent = maxCloudCoverPercent;
-  }
 
   protected async updateProcessingGetMapPayload(payload: ProcessingPayload): Promise<ProcessingPayload> {
     payload.input.data[0].dataFilter.maxCloudCoverage = this.maxCloudCoverPercent;
@@ -32,31 +15,4 @@ export class S2L1CLayer extends AbstractSentinelHubV3Layer {
       maxcc: this.maxCloudCoverPercent,
     };
   }
-
-  public async findTiles(
-    bbox: BBox,
-    fromTime: Date,
-    toTime: Date,
-    maxCount?: number,
-    offset?: number,
-  ): Promise<PaginatedTiles> {
-    const response = await this.fetchTiles(
-      bbox,
-      fromTime,
-      toTime,
-      maxCount,
-      offset,
-      this.maxCloudCoverPercent,
-    );
-    return {
-      tiles: response.data.tiles.map(tile => ({
-        geometry: tile.dataGeometry,
-        sensingTime: new Date(tile.sensingTime),
-        meta: {
-          cloudCoverPercent: tile.cloudCoverPercentage,
-        },
-      })),
-      hasMore: response.data.hasMore,
-    };
-  }
 }

src/layer/S2L2ALayer.ts

@@ -1,26 +1,9 @@
-import { BBox } from 'src/bbox';
-import { PaginatedTiles } from 'src/layer/const';
 import { DATASET_S2L2A } from 'src/layer/dataset';
-import { AbstractSentinelHubV3Layer } from 'src/layer/AbstractSentinelHubV3Layer';
+import { AbstractSentinelHubV3WithCCLayer } from './AbstractSentinelHubV3WithCCLayer';
 import { ProcessingPayload } from 'src/layer/processing';
 
-export class S2L2ALayer extends AbstractSentinelHubV3Layer {
+export class S2L2ALayer extends AbstractSentinelHubV3WithCCLayer {
   public readonly dataset = DATASET_S2L2A;
-  public maxCloudCoverPercent: number;
-
-  public constructor(
-    instanceId: string | null,
-    layerId: string | null = null,
-    evalscript: string | null = null,
-    evalscriptUrl: string | null = null,
-    dataProduct: string | null = null,
-    title: string | null = null,
-    description: string | null = null,
-    maxCloudCoverPercent: number | null = 100,
-  ) {
-    super(instanceId, layerId, evalscript, evalscriptUrl, dataProduct, title, description);
-    this.maxCloudCoverPercent = maxCloudCoverPercent;
-  }
 
   protected async updateProcessingGetMapPayload(payload: ProcessingPayload): Promise<ProcessingPayload> {
     payload.input.data[0].dataFilter.maxCloudCoverage = this.maxCloudCoverPercent;
@@ -32,31 +15,4 @@ export class S2L2ALayer extends AbstractSentinelHubV3Layer {
       maxcc: this.maxCloudCoverPercent,
     };
   }
-
-  public async findTiles(
-    bbox: BBox,
-    fromTime: Date,
-    toTime: Date,
-    maxCount?: number,
-    offset?: number,
-  ): Promise<PaginatedTiles> {
-    const response = await this.fetchTiles(
-      bbox,
-      fromTime,
-      toTime,
-      maxCount,
-      offset,
-      this.maxCloudCoverPercent,
-    );
-    return {
-      tiles: response.data.tiles.map(tile => ({
-        geometry: tile.dataGeometry,
-        sensingTime: new Date(tile.sensingTime),
-        meta: {
-          cloudCoverPercent: tile.cloudCoverPercentage,
-        },
-      })),
-      hasMore: response.data.hasMore,
-    };
-  }
 }

stories/index.stories.js

@@ -244,6 +244,7 @@ export const S1GRDFindTiles = () => {
   wrapperEl.insertAdjacentElement("beforeend", containerEl);
 
   const perform = async () => {
+    await setAuthTokenWithOAuthCredentials();
     const data = await layerS1.findTiles(
       bbox,
       new Date(Date.UTC(2020, 1 - 1, 10, 0, 0, 0)),