From bd5c6a63768eaf9fb414b40fab47bb8db83039a4 Mon Sep 17 00:00:00 2001 From: kim Date: Thu, 2 Nov 2023 11:17:32 -0800 Subject: [PATCH 1/2] datasets now use SearchAPI dataset keyword for geo search --- .../results-menu/scene-files/scene-files.component.ts | 2 +- src/app/models/datasets/airsar.ts | 2 +- src/app/models/datasets/alos.ts | 2 +- src/app/models/datasets/avnir.ts | 2 +- src/app/models/datasets/beta.ts | 2 +- src/app/models/datasets/ers.ts | 2 +- src/app/models/datasets/jers_1.ts | 2 +- src/app/models/datasets/opera_s1.ts | 3 +-- src/app/models/datasets/radarsat_1.ts | 2 +- src/app/models/datasets/seasat.ts | 2 +- src/app/models/datasets/sentinel-1-burst.ts | 2 +- src/app/models/datasets/sentinel-1.ts | 2 +- src/app/models/datasets/sirc.ts | 2 +- src/app/models/datasets/smap.ts | 2 +- src/app/models/datasets/uavsar.ts | 2 +- 15 files changed, 15 insertions(+), 16 deletions(-) diff --git a/src/app/components/results-menu/scene-files/scene-files.component.ts b/src/app/components/results-menu/scene-files/scene-files.component.ts index 6579e860c..7a2b0332b 100644 --- a/src/app/components/results-menu/scene-files/scene-files.component.ts +++ b/src/app/components/results-menu/scene-files/scene-files.component.ts @@ -430,7 +430,7 @@ export class SceneFilesComponent implements OnInit, OnDestroy, AfterContentInit processinglevel : scene.metadata.productType + '-STATIC', start: scene.metadata.stopDate === null ? '' : moment.utc( scene.metadata.stopDate ).format(), operaburstid: scene.metadata?.opera?.operaBurstID, - collections: models.opera_s1.apiValue.collections, + datasets: models.opera_s1.apiValue.datasets, }; return this.asfApiService.query(queryParams).pipe( map(products => products.length > 0 ? this.productService.fromResponse(products).slice(0, 1) : []) diff --git a/src/app/models/datasets/airsar.ts b/src/app/models/datasets/airsar.ts index 922054e54..9a8efab1d 100644 --- a/src/app/models/datasets/airsar.ts +++ b/src/app/models/datasets/airsar.ts @@ -11,7 +11,7 @@ export const airsar = { Props.MISSION_NAME, Props.FARADAY_ROTATION, ], - apiValue: { platform: 'AIRSAR' }, + apiValue: { datasets: 'AIRSAR' }, date: { start: new Date('1990/03/02 00:00:00 UTC'), end: new Date('2004/12/03 23:59:59 UTC') diff --git a/src/app/models/datasets/alos.ts b/src/app/models/datasets/alos.ts index 4d32246b2..02b8446b0 100644 --- a/src/app/models/datasets/alos.ts +++ b/src/app/models/datasets/alos.ts @@ -18,7 +18,7 @@ export const alos = { Props.STACK_SIZE, Props.BASELINE_TOOL, ], - apiValue: { platform: 'ALOS', instrument: 'PALSAR' }, + apiValue: { datasets: 'ALOS PALSAR' }, date: { start: new Date('2006/05/16 03:36:51 UTC'), end: new Date('2011/04/21 20:23:36 UTC') diff --git a/src/app/models/datasets/avnir.ts b/src/app/models/datasets/avnir.ts index f7863f968..80e692af7 100644 --- a/src/app/models/datasets/avnir.ts +++ b/src/app/models/datasets/avnir.ts @@ -14,7 +14,7 @@ export const avnir = { Props.ABSOLUTE_ORBIT, Props.POINTING_ANGLE, ], - apiValue: { platform: 'ALOS', instrument: 'AVNIR-2' }, + apiValue: { datasets: 'ALOS AVNIR-2' }, date: { start: new Date('2006/05/16 03:36:51 UTC'), end: new Date('2011/04/21 20:23:36 UTC') diff --git a/src/app/models/datasets/beta.ts b/src/app/models/datasets/beta.ts index 17154a5f9..262a027e4 100644 --- a/src/app/models/datasets/beta.ts +++ b/src/app/models/datasets/beta.ts @@ -14,7 +14,7 @@ export const beta = { Props.MISSION_NAME, Props.ABSOLUTE_ORBIT, ], - apiValue: { asfplatform: 'SENTINEL-1 INTERFEROGRAM (BETA)' }, + apiValue: { datasets: 'ARIA S1 GUNW' }, date: { start: new Date(2014, 3, 25) }, infoUrl: 'https://asf.alaska.edu/data-sets/derived-data-sets/sentinel-1-interferograms/', citationUrl: 'https://asf.alaska.edu/data-sets/derived-data-sets/sentinel-1-interferograms/#citation', diff --git a/src/app/models/datasets/ers.ts b/src/app/models/datasets/ers.ts index 2ee5b1aca..7e5cca12e 100644 --- a/src/app/models/datasets/ers.ts +++ b/src/app/models/datasets/ers.ts @@ -16,7 +16,7 @@ export const ers = { Props.BASELINE_TOOL, Props.SUBTYPE, ], - apiValue: { platform: 'ERS' }, + apiValue: { datasets: 'ERS' }, date: { start: new Date('1991/08/08 03:18:11 UTC'), end: new Date('2011/07/03 00:23:48 UTC') diff --git a/src/app/models/datasets/jers_1.ts b/src/app/models/datasets/jers_1.ts index 24ea7fdcb..57d4891bf 100644 --- a/src/app/models/datasets/jers_1.ts +++ b/src/app/models/datasets/jers_1.ts @@ -15,7 +15,7 @@ export const jers_1 = { Props.ABSOLUTE_ORBIT, Props.BASELINE_TOOL, ], - apiValue: { platform: 'JERS-1' }, + apiValue: { datasets: 'JERS-1' }, date: { start: new Date('1992/05/20 18:16:38 UTC'), end: new Date('1998/10/10 00:57:08 UTC') diff --git a/src/app/models/datasets/opera_s1.ts b/src/app/models/datasets/opera_s1.ts index 1b300fca2..6538403ed 100644 --- a/src/app/models/datasets/opera_s1.ts +++ b/src/app/models/datasets/opera_s1.ts @@ -13,8 +13,7 @@ export const opera_s1 = { Props.ABSOLUTE_ORBIT ], apiValue: { - collections: - "C1259974840-ASF,C1259976861-ASF,C1259981910-ASF,C1259982010-ASF,C1259975087-ASFDEV,C1259976862-ASFDEV,C1259983643-ASFDEV,C1259983645-ASFDEV,C2777443834-ASF,C2777436413-ASF" }, + datasets: 'OPERA-S1' }, date: { start: new Date('2014/06/15 03:44:43 UTC') }, infoUrl: 'https://asf.alaska.edu/datasets/daac/opera/', citationUrl: 'https://asf.alaska.edu/datasets/daac/opera/', diff --git a/src/app/models/datasets/radarsat_1.ts b/src/app/models/datasets/radarsat_1.ts index c00267cc8..27ab91743 100644 --- a/src/app/models/datasets/radarsat_1.ts +++ b/src/app/models/datasets/radarsat_1.ts @@ -15,7 +15,7 @@ export const radarsat_1 = { Props.ABSOLUTE_ORBIT, Props.BASELINE_TOOL, ], - apiValue: { platform: 'RADARSAT-1' }, + apiValue: { datasets: 'RADARSAT-1' }, date: { start: new Date('1996/02/01 03:19:17 UTC'), end: new Date('2008/05/02 22:05:26 UTC') diff --git a/src/app/models/datasets/seasat.ts b/src/app/models/datasets/seasat.ts index af8b64ddf..0004f3936 100644 --- a/src/app/models/datasets/seasat.ts +++ b/src/app/models/datasets/seasat.ts @@ -14,7 +14,7 @@ export const seasat = { Props.POLARIZATION, Props.ABSOLUTE_ORBIT, ], - apiValue: { platform: 'SEASAT' }, + apiValue: { datasets: 'SEASAT' }, date: { start: new Date('1978/07/04 12:06:00 UTC'), end: new Date('1978/10/10 01:29:10 UTC') diff --git a/src/app/models/datasets/sentinel-1-burst.ts b/src/app/models/datasets/sentinel-1-burst.ts index bd040b48b..92572d322 100644 --- a/src/app/models/datasets/sentinel-1-burst.ts +++ b/src/app/models/datasets/sentinel-1-burst.ts @@ -14,7 +14,7 @@ export const sentinel_1_bursts = { Props.BASELINE_TOOL, Props.SUBTYPE, ], - apiValue: { platform: 'SENTINEL-1', instrument: 'C-SAR', processingLevel: 'BURST' }, + apiValue: { datasets: 'SLC-BURST' }, date: { start: new Date('2014/06/15 03:44:43 UTC') }, infoUrl: 'https://sentinels.copernicus.eu/web/sentinel/user-guides/sentinel-1-sar/acquisition-modes/interferometric-wide-swath', citationUrl: 'https://asf.alaska.edu/data-sets/sar-data-sets/sentinel-1/sentinel-1-how-to-cite/', diff --git a/src/app/models/datasets/sentinel-1.ts b/src/app/models/datasets/sentinel-1.ts index 53b7cccc9..ec4ae4fa9 100644 --- a/src/app/models/datasets/sentinel-1.ts +++ b/src/app/models/datasets/sentinel-1.ts @@ -16,7 +16,7 @@ export const sentinel_1 = { Props.BASELINE_TOOL, Props.SUBTYPE, ], - apiValue: { platform: 'SENTINEL-1', instrument: 'C-SAR' }, + apiValue: { datasets: 'SENTINEL-1' }, date: { start: new Date('2014/06/15 03:44:43 UTC') }, infoUrl: 'https://www.asf.alaska.edu/sar-data-sets/sentinel-1/', citationUrl: 'https://asf.alaska.edu/data-sets/sar-data-sets/sentinel-1/sentinel-1-how-to-cite/', diff --git a/src/app/models/datasets/sirc.ts b/src/app/models/datasets/sirc.ts index 49aafc7f4..b236997c9 100644 --- a/src/app/models/datasets/sirc.ts +++ b/src/app/models/datasets/sirc.ts @@ -14,7 +14,7 @@ export const sirc = { Props.ABSOLUTE_ORBIT, Props.SUBTYPE, ], - apiValue: { platform: 'SIR-C' }, + apiValue: { datasets: 'SIR-C' }, date: { start: new Date('1994/04/09 11:05:00 UTC'), end: new Date('1994/10/11 17:02:09 UTC') diff --git a/src/app/models/datasets/smap.ts b/src/app/models/datasets/smap.ts index a28ee3dbb..d08d064a9 100644 --- a/src/app/models/datasets/smap.ts +++ b/src/app/models/datasets/smap.ts @@ -11,7 +11,7 @@ export const smap = { Props.FLIGHT_DIRECTION, Props.ABSOLUTE_ORBIT, ], - apiValue: { platform: 'SMAP' }, + apiValue: { datasets: 'SMAP' }, date: { start: new Date('2015/04/13 17:57:07 UTC') }, infoUrl: 'https://www.asf.alaska.edu/sar-data-sets/soil-moisture-active-passive-smap-mission/', frequency: 'L-Band', diff --git a/src/app/models/datasets/uavsar.ts b/src/app/models/datasets/uavsar.ts index 0887853f1..75af3f90d 100644 --- a/src/app/models/datasets/uavsar.ts +++ b/src/app/models/datasets/uavsar.ts @@ -11,7 +11,7 @@ export const uavsar = { Props.POLARIZATION, Props.MISSION_NAME, ], - apiValue: { platform: 'UAVSAR' }, + apiValue: { datasets: 'UAVSAR' }, date: { start: new Date('2008/04/28 21:10:16 UTC') }, infoUrl: 'https://asf.alaska.edu/data-sets/sar-data-sets/uavsar/', citationUrl: 'https://asf.alaska.edu/data-sets/sar-data-sets/uavsar/#uavsar_cite', From a41d6f7be9d63590a39e47db26594f6635e5af3d Mon Sep 17 00:00:00 2001 From: kim Date: Wed, 8 Nov 2023 10:00:51 -0900 Subject: [PATCH 2/2] changes 'datasets' to 'dataset' --- .../results-menu/scene-files/scene-files.component.ts | 2 +- src/app/models/datasets/airsar.ts | 2 +- src/app/models/datasets/alos.ts | 2 +- src/app/models/datasets/avnir.ts | 2 +- src/app/models/datasets/beta.ts | 2 +- src/app/models/datasets/ers.ts | 2 +- src/app/models/datasets/jers_1.ts | 2 +- src/app/models/datasets/opera_s1.ts | 2 +- src/app/models/datasets/radarsat_1.ts | 2 +- src/app/models/datasets/seasat.ts | 2 +- src/app/models/datasets/sentinel-1-burst.ts | 2 +- src/app/models/datasets/sentinel-1.ts | 2 +- src/app/models/datasets/sirc.ts | 2 +- src/app/models/datasets/smap.ts | 2 +- src/app/models/datasets/uavsar.ts | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/app/components/results-menu/scene-files/scene-files.component.ts b/src/app/components/results-menu/scene-files/scene-files.component.ts index 7a2b0332b..627308105 100644 --- a/src/app/components/results-menu/scene-files/scene-files.component.ts +++ b/src/app/components/results-menu/scene-files/scene-files.component.ts @@ -430,7 +430,7 @@ export class SceneFilesComponent implements OnInit, OnDestroy, AfterContentInit processinglevel : scene.metadata.productType + '-STATIC', start: scene.metadata.stopDate === null ? '' : moment.utc( scene.metadata.stopDate ).format(), operaburstid: scene.metadata?.opera?.operaBurstID, - datasets: models.opera_s1.apiValue.datasets, + dataset: models.opera_s1.apiValue.dataset, }; return this.asfApiService.query(queryParams).pipe( map(products => products.length > 0 ? this.productService.fromResponse(products).slice(0, 1) : []) diff --git a/src/app/models/datasets/airsar.ts b/src/app/models/datasets/airsar.ts index 9a8efab1d..792d3ae75 100644 --- a/src/app/models/datasets/airsar.ts +++ b/src/app/models/datasets/airsar.ts @@ -11,7 +11,7 @@ export const airsar = { Props.MISSION_NAME, Props.FARADAY_ROTATION, ], - apiValue: { datasets: 'AIRSAR' }, + apiValue: { dataset: 'AIRSAR' }, date: { start: new Date('1990/03/02 00:00:00 UTC'), end: new Date('2004/12/03 23:59:59 UTC') diff --git a/src/app/models/datasets/alos.ts b/src/app/models/datasets/alos.ts index 02b8446b0..55fc1659d 100644 --- a/src/app/models/datasets/alos.ts +++ b/src/app/models/datasets/alos.ts @@ -18,7 +18,7 @@ export const alos = { Props.STACK_SIZE, Props.BASELINE_TOOL, ], - apiValue: { datasets: 'ALOS PALSAR' }, + apiValue: { dataset: 'ALOS PALSAR' }, date: { start: new Date('2006/05/16 03:36:51 UTC'), end: new Date('2011/04/21 20:23:36 UTC') diff --git a/src/app/models/datasets/avnir.ts b/src/app/models/datasets/avnir.ts index 80e692af7..4f547f227 100644 --- a/src/app/models/datasets/avnir.ts +++ b/src/app/models/datasets/avnir.ts @@ -14,7 +14,7 @@ export const avnir = { Props.ABSOLUTE_ORBIT, Props.POINTING_ANGLE, ], - apiValue: { datasets: 'ALOS AVNIR-2' }, + apiValue: { dataset: 'ALOS AVNIR-2' }, date: { start: new Date('2006/05/16 03:36:51 UTC'), end: new Date('2011/04/21 20:23:36 UTC') diff --git a/src/app/models/datasets/beta.ts b/src/app/models/datasets/beta.ts index 262a027e4..4ef12355c 100644 --- a/src/app/models/datasets/beta.ts +++ b/src/app/models/datasets/beta.ts @@ -14,7 +14,7 @@ export const beta = { Props.MISSION_NAME, Props.ABSOLUTE_ORBIT, ], - apiValue: { datasets: 'ARIA S1 GUNW' }, + apiValue: { dataset: 'ARIA S1 GUNW' }, date: { start: new Date(2014, 3, 25) }, infoUrl: 'https://asf.alaska.edu/data-sets/derived-data-sets/sentinel-1-interferograms/', citationUrl: 'https://asf.alaska.edu/data-sets/derived-data-sets/sentinel-1-interferograms/#citation', diff --git a/src/app/models/datasets/ers.ts b/src/app/models/datasets/ers.ts index 7e5cca12e..d1f2a35a4 100644 --- a/src/app/models/datasets/ers.ts +++ b/src/app/models/datasets/ers.ts @@ -16,7 +16,7 @@ export const ers = { Props.BASELINE_TOOL, Props.SUBTYPE, ], - apiValue: { datasets: 'ERS' }, + apiValue: { dataset: 'ERS' }, date: { start: new Date('1991/08/08 03:18:11 UTC'), end: new Date('2011/07/03 00:23:48 UTC') diff --git a/src/app/models/datasets/jers_1.ts b/src/app/models/datasets/jers_1.ts index 57d4891bf..ea8584262 100644 --- a/src/app/models/datasets/jers_1.ts +++ b/src/app/models/datasets/jers_1.ts @@ -15,7 +15,7 @@ export const jers_1 = { Props.ABSOLUTE_ORBIT, Props.BASELINE_TOOL, ], - apiValue: { datasets: 'JERS-1' }, + apiValue: { dataset: 'JERS-1' }, date: { start: new Date('1992/05/20 18:16:38 UTC'), end: new Date('1998/10/10 00:57:08 UTC') diff --git a/src/app/models/datasets/opera_s1.ts b/src/app/models/datasets/opera_s1.ts index 6538403ed..927a3bc44 100644 --- a/src/app/models/datasets/opera_s1.ts +++ b/src/app/models/datasets/opera_s1.ts @@ -13,7 +13,7 @@ export const opera_s1 = { Props.ABSOLUTE_ORBIT ], apiValue: { - datasets: 'OPERA-S1' }, + dataset: 'OPERA-S1' }, date: { start: new Date('2014/06/15 03:44:43 UTC') }, infoUrl: 'https://asf.alaska.edu/datasets/daac/opera/', citationUrl: 'https://asf.alaska.edu/datasets/daac/opera/', diff --git a/src/app/models/datasets/radarsat_1.ts b/src/app/models/datasets/radarsat_1.ts index 27ab91743..dc71dc390 100644 --- a/src/app/models/datasets/radarsat_1.ts +++ b/src/app/models/datasets/radarsat_1.ts @@ -15,7 +15,7 @@ export const radarsat_1 = { Props.ABSOLUTE_ORBIT, Props.BASELINE_TOOL, ], - apiValue: { datasets: 'RADARSAT-1' }, + apiValue: { dataset: 'RADARSAT-1' }, date: { start: new Date('1996/02/01 03:19:17 UTC'), end: new Date('2008/05/02 22:05:26 UTC') diff --git a/src/app/models/datasets/seasat.ts b/src/app/models/datasets/seasat.ts index 0004f3936..c213da10a 100644 --- a/src/app/models/datasets/seasat.ts +++ b/src/app/models/datasets/seasat.ts @@ -14,7 +14,7 @@ export const seasat = { Props.POLARIZATION, Props.ABSOLUTE_ORBIT, ], - apiValue: { datasets: 'SEASAT' }, + apiValue: { dataset: 'SEASAT' }, date: { start: new Date('1978/07/04 12:06:00 UTC'), end: new Date('1978/10/10 01:29:10 UTC') diff --git a/src/app/models/datasets/sentinel-1-burst.ts b/src/app/models/datasets/sentinel-1-burst.ts index 92572d322..8b7fad8f8 100644 --- a/src/app/models/datasets/sentinel-1-burst.ts +++ b/src/app/models/datasets/sentinel-1-burst.ts @@ -14,7 +14,7 @@ export const sentinel_1_bursts = { Props.BASELINE_TOOL, Props.SUBTYPE, ], - apiValue: { datasets: 'SLC-BURST' }, + apiValue: { dataset: 'SLC-BURST' }, date: { start: new Date('2014/06/15 03:44:43 UTC') }, infoUrl: 'https://sentinels.copernicus.eu/web/sentinel/user-guides/sentinel-1-sar/acquisition-modes/interferometric-wide-swath', citationUrl: 'https://asf.alaska.edu/data-sets/sar-data-sets/sentinel-1/sentinel-1-how-to-cite/', diff --git a/src/app/models/datasets/sentinel-1.ts b/src/app/models/datasets/sentinel-1.ts index ec4ae4fa9..4a7650369 100644 --- a/src/app/models/datasets/sentinel-1.ts +++ b/src/app/models/datasets/sentinel-1.ts @@ -16,7 +16,7 @@ export const sentinel_1 = { Props.BASELINE_TOOL, Props.SUBTYPE, ], - apiValue: { datasets: 'SENTINEL-1' }, + apiValue: { dataset: 'SENTINEL-1' }, date: { start: new Date('2014/06/15 03:44:43 UTC') }, infoUrl: 'https://www.asf.alaska.edu/sar-data-sets/sentinel-1/', citationUrl: 'https://asf.alaska.edu/data-sets/sar-data-sets/sentinel-1/sentinel-1-how-to-cite/', diff --git a/src/app/models/datasets/sirc.ts b/src/app/models/datasets/sirc.ts index b236997c9..c4ce95450 100644 --- a/src/app/models/datasets/sirc.ts +++ b/src/app/models/datasets/sirc.ts @@ -14,7 +14,7 @@ export const sirc = { Props.ABSOLUTE_ORBIT, Props.SUBTYPE, ], - apiValue: { datasets: 'SIR-C' }, + apiValue: { dataset: 'SIR-C' }, date: { start: new Date('1994/04/09 11:05:00 UTC'), end: new Date('1994/10/11 17:02:09 UTC') diff --git a/src/app/models/datasets/smap.ts b/src/app/models/datasets/smap.ts index d08d064a9..ac9e22542 100644 --- a/src/app/models/datasets/smap.ts +++ b/src/app/models/datasets/smap.ts @@ -11,7 +11,7 @@ export const smap = { Props.FLIGHT_DIRECTION, Props.ABSOLUTE_ORBIT, ], - apiValue: { datasets: 'SMAP' }, + apiValue: { dataset: 'SMAP' }, date: { start: new Date('2015/04/13 17:57:07 UTC') }, infoUrl: 'https://www.asf.alaska.edu/sar-data-sets/soil-moisture-active-passive-smap-mission/', frequency: 'L-Band', diff --git a/src/app/models/datasets/uavsar.ts b/src/app/models/datasets/uavsar.ts index 75af3f90d..c9286db51 100644 --- a/src/app/models/datasets/uavsar.ts +++ b/src/app/models/datasets/uavsar.ts @@ -11,7 +11,7 @@ export const uavsar = { Props.POLARIZATION, Props.MISSION_NAME, ], - apiValue: { datasets: 'UAVSAR' }, + apiValue: { dataset: 'UAVSAR' }, date: { start: new Date('2008/04/28 21:10:16 UTC') }, infoUrl: 'https://asf.alaska.edu/data-sets/sar-data-sets/uavsar/', citationUrl: 'https://asf.alaska.edu/data-sets/sar-data-sets/uavsar/#uavsar_cite',