From 1efe0c120f654f496b0718b01cebd0cd5d53b43c Mon Sep 17 00:00:00 2001 From: kim Date: Tue, 30 Jan 2024 15:51:50 -0900 Subject: [PATCH 01/10] chore: adds new opera static ids to collections dict --- asf_search/CMR/datasets.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/asf_search/CMR/datasets.py b/asf_search/CMR/datasets.py index d8415850..c767321c 100644 --- a/asf_search/CMR/datasets.py +++ b/asf_search/CMR/datasets.py @@ -897,12 +897,15 @@ "C1595765183-ASF", "C1225776659-ASF", ], - "CSLC-STATIC": ["C1259982010-ASF", "C1259982010-ASF"], + "CSLC-STATIC": [ + "C1259982010-ASF", + "C1259982010-ASF", + "C2795135668-ASF" + ], "RTC-STATIC": [ - "C1260726378-ASF", "C1259981910-ASF", "C1260726378-ASF", - "C1259981910-ASF", + "C2795135174-ASF" ], "GRD": [ "C1661710583-ASF", From cca423c25bc6a83ec8395a34c7390d44ae5178ae Mon Sep 17 00:00:00 2001 From: kim Date: Tue, 30 Jan 2024 15:52:54 -0900 Subject: [PATCH 02/10] fix: fix typo for CSLC_STATIC dataset constant variable name --- asf_search/constants/PRODUCT_TYPE.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/asf_search/constants/PRODUCT_TYPE.py b/asf_search/constants/PRODUCT_TYPE.py index 64c80125..b6156543 100644 --- a/asf_search/constants/PRODUCT_TYPE.py +++ b/asf_search/constants/PRODUCT_TYPE.py @@ -99,4 +99,4 @@ RTC = 'RTC' CSLC = 'CSLC' RTC_STATIC = 'RTC-STATIC' -CSLS_STATIC = 'CSLC-STATIC' \ No newline at end of file +CSLC_STATIC = 'CSLC-STATIC' \ No newline at end of file From d8793e714bfec51c3ca24d7036bd1606131cf14b Mon Sep 17 00:00:00 2001 From: kim Date: Tue, 30 Jan 2024 16:04:08 -0900 Subject: [PATCH 03/10] update changelog --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c0a0364..8bf586c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,14 @@ and uses [Semantic Versioning](https://semver.org/spec/v2.0.0.html). - --> +------ +## [v7.0.3](https://github.com/asfadmin/Discovery-asf_search/compare/v7.0.2...v7.0.3) +### Added +- Adds newer `CSLC-STATIC` and `RTC-STATIC` concept-ids to `collections_by_processing_level`. + +### Fixed +- Fixed typo for constant variable name `constants.PRODUCT_TYPE.CSLC_STATIC` + ------ ## [v7.0.2](https://github.com/asfadmin/Discovery-asf_search/compare/v7.0.1...v7.0.2) ### Added From 3d5230350f8b415a0b4a987bff3ebdc40d838a06 Mon Sep 17 00:00:00 2001 From: kim Date: Wed, 31 Jan 2024 11:43:16 -0900 Subject: [PATCH 04/10] cleans up opera s1 collections and adds to S1 platform alias lists, removes static calval concept ids completely --- asf_search/CMR/datasets.py | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/asf_search/CMR/datasets.py b/asf_search/CMR/datasets.py index c767321c..70ce993d 100644 --- a/asf_search/CMR/datasets.py +++ b/asf_search/CMR/datasets.py @@ -376,12 +376,13 @@ "C1260726384-ASF", "C1258354200-ASF", "C1259982010-ASF", + "C2795135668-ASF" "C1260721945-ASF", "C1257995185-ASF", "C1259976861-ASF", - "C1260726378-ASF", "C1258354201-ASF", "C1259981910-ASF", + "C2795135174-ASF", "C1260721853-ASF", "C1257995186-ASF", "C1259974840-ASF", @@ -462,12 +463,13 @@ "C1260726384-ASF", "C1258354200-ASF", "C1259982010-ASF", + "C2795135668-ASF", "C1260721945-ASF", "C1257995185-ASF", "C1259976861-ASF", - "C1260726378-ASF", "C1258354201-ASF", "C1259981910-ASF", + "C2795135174-ASF", "C1260721853-ASF", "C1257995186-ASF", "C1259974840-ASF", @@ -851,17 +853,11 @@ "C2777443834-ASF", "C1260721945-ASF", "C1259976861-ASF", - "C2777443834-ASF", - "C1260721945-ASF", - "C1259976861-ASF", ], "RTC": [ "C2777436413-ASF", "C1260721853-ASF", "C1259974840-ASF", - "C2777436413-ASF", - "C1260721853-ASF", - "C1259974840-ASF", ], "GRD_FD": ["C1214471197-ASF", "C1212200781-ASF"], "METADATA_GRD_FD": ["C1214471960-ASF", "C1212209075-ASF"], @@ -869,9 +865,6 @@ "C2709161906-ASF", "C1257024016-ASF", "C1257175154-ASFDEV", - "C2709161906-ASF", - "C1257024016-ASF", - "C1257175154-ASFDEV", ], "GUNW_AMP": [ "C1596065640-ASF", @@ -898,13 +891,11 @@ "C1225776659-ASF", ], "CSLC-STATIC": [ - "C1259982010-ASF", "C1259982010-ASF", "C2795135668-ASF" ], "RTC-STATIC": [ "C1259981910-ASF", - "C1260726378-ASF", "C2795135174-ASF" ], "GRD": [ From 257c772d6892e2e154dc038c97e972232613e4fb Mon Sep 17 00:00:00 2001 From: kim Date: Wed, 31 Jan 2024 11:45:39 -0900 Subject: [PATCH 05/10] update changelog --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8bf586c2..744035cd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,11 +28,14 @@ and uses [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ------ ## [v7.0.3](https://github.com/asfadmin/Discovery-asf_search/compare/v7.0.2...v7.0.3) ### Added -- Adds newer `CSLC-STATIC` and `RTC-STATIC` concept-ids to `collections_by_processing_level`. +- Adds newer `CSLC-STATIC` and `RTC-STATIC` concept-ids to `collections_by_processing_level` and Sentinel-1 platform concept id lists. ### Fixed - Fixed typo for constant variable name `constants.PRODUCT_TYPE.CSLC_STATIC` +### Changed +- Completely remove calval `CSLC-STATIC` and calval `RTC-STATIC` collections from concept-id lists + ------ ## [v7.0.2](https://github.com/asfadmin/Discovery-asf_search/compare/v7.0.1...v7.0.2) ### Added From 177956e88ac7903140287f8fcd973e2fdbc484a0 Mon Sep 17 00:00:00 2001 From: kim Date: Wed, 31 Jan 2024 11:49:56 -0900 Subject: [PATCH 06/10] adds more test cases against searchAPI for opera products --- tests/yml_tests/test_search.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tests/yml_tests/test_search.yml b/tests/yml_tests/test_search.yml index 9823c441..01ac40cd 100644 --- a/tests/yml_tests/test_search.yml +++ b/tests/yml_tests/test_search.yml @@ -377,6 +377,26 @@ tests: platform: SENTINEL-1A processingLevel: SLC + - test-aliasing-search-against-api S1A RTC: + params: + platform: SENTINEL-1A + processingLevel: RTC + + - test-aliasing-search-against-api S1A CSLC: + params: + platform: SENTINEL-1A + processingLevel: CSLC + + - test-aliasing-search-against-api OERA-S1 CSLC: + params: + dataset: OPERA-S1 + processingLevel: CSLC + + - test-aliasing-search-against-api OERA-S1 RTC: + params: + dataset: OPERA-S1 + processingLevel: RTC + - test-ASFSearch OPERA Resp 1: response: OPERA_Products.yml From 49a4d69708e19b216882076c4cab7afc4b05e39e Mon Sep 17 00:00:00 2001 From: kim Date: Wed, 31 Jan 2024 11:52:05 -0900 Subject: [PATCH 07/10] fix: add missing comma --- asf_search/CMR/datasets.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/asf_search/CMR/datasets.py b/asf_search/CMR/datasets.py index 70ce993d..b84c80cc 100644 --- a/asf_search/CMR/datasets.py +++ b/asf_search/CMR/datasets.py @@ -376,7 +376,7 @@ "C1260726384-ASF", "C1258354200-ASF", "C1259982010-ASF", - "C2795135668-ASF" + "C2795135668-ASF", "C1260721945-ASF", "C1257995185-ASF", "C1259976861-ASF", From 4364599ec3575db68c0d723060379a599454f99a Mon Sep 17 00:00:00 2001 From: kim Date: Wed, 31 Jan 2024 12:06:13 -0900 Subject: [PATCH 08/10] test: update test case data and adds tests for static files against searchAPI --- tests/yml_tests/test_search.yml | 350 ++++++++++++++++---------------- 1 file changed, 178 insertions(+), 172 deletions(-) diff --git a/tests/yml_tests/test_search.yml b/tests/yml_tests/test_search.yml index 01ac40cd..79c1f07f 100644 --- a/tests/yml_tests/test_search.yml +++ b/tests/yml_tests/test_search.yml @@ -52,175 +52,178 @@ tests: - SENTINEL-1B expected: - collections: - - C1214470488-ASF - - C1214470533-ASF - - C1214470576-ASF - - C1595422627-ASF - - C1214470496-ASF - - C1214470532-ASF - - C1214472977-ASF - - C1214472336-ASF - - C1266376001-ASF - - C1214472994-ASF - - C1214470732-ASF - - C1214473170-ASF - - C1214470561-ASF - - C1214471521-ASF - - C1214470682-ASF - - C2777443834-ASF - - C2777436413-ASF - - C1214471197-ASF - - C1214471960-ASF - - C1214472978-ASF - - C1214473165-ASF - - C2709161906-ASF - - C1596065640-ASF - - C1596065639-ASF - - C1596065641-ASF - - C1595765183-ASF - - C2450786986-ASF - - C1205428742-ASF - - C1212201032-ASF - - C1212212560-ASF - - C1205264459-ASF - - C1208117434-ASF - - C1212209035-ASF - - C1212209226-ASF - - C1208115009-ASF - - C1212158327-ASF - - C1215704763-ASF - - C1225776654-ASF - - C1212158318-ASF - - C1212212493-ASF - - C1212158326-ASF - - C1212233976-ASF - - C1260726384-ASF - - C1258354200-ASF - - C1259982010-ASF - - C1260721945-ASF - - C1257995185-ASF - - C1259976861-ASF - - C1260726378-ASF - - C1258354201-ASF - - C1259981910-ASF - - C1260721853-ASF - - C1257995186-ASF - - C1259974840-ASF - - C1212200781-ASF - - C1212209075-ASF - - C1257024016-ASF - - C1225776655-ASF - - C1225776657-ASF - - C1225776658-ASF - - C1225776659-ASF - - C1245953394-ASF - - C1234413245-ASFDEV - - C1234413229-ASFDEV - - C1234413237-ASFDEV - - C1234413238-ASFDEV - - C1234413236-ASFDEV - - C1234413230-ASFDEV - - C1234413232-ASFDEV - - C1234413235-ASFDEV - - C1234413240-ASFDEV - - C1234413234-ASFDEV - - C1234413241-ASFDEV - - C1234413233-ASFDEV - - C1234413243-ASFDEV - - C1234413244-ASFDEV - - C1244552887-ASFDEV - - C1234413228-ASFDEV - - C1234413231-ASFDEV - - C1234413239-ASFDEV - - C1234413242-ASFDEV - - C1257175154-ASFDEV - - C1244598379-ASFDEV - - C1240784657-ASFDEV - - C1327985661-ASF - - C1327985645-ASF - - C1595422627-ASF - - C1327985617-ASF - - C1327985660-ASF - - C1327985741-ASF - - C1327985578-ASF - - C1327985646-ASF - - C1327985650-ASF - - C1327985579-ASF - - C1327985740-ASF - - C1327985619-ASF - - C1327985739-ASF - - C1327985647-ASF - - C2777443834-ASF - - C2777436413-ASF - - C1327985697-ASF - - C1327985651-ASF - - C1327985644-ASF - - C1327985571-ASF - - C1327985674-ASF - - C2709161906-ASF - - C1596065640-ASF - - C1596065639-ASF - - C1596065641-ASF - - C1595765183-ASF - - C2450786986-ASF - - C1216244348-ASF - - C1216244589-ASF - - C1216244594-ASF - - C1216244593-ASF - - C1216244585-ASF - - C1216244592-ASF - - C1216244595-ASF - - C1225776654-ASF - - C1216244590-ASF - - C1216244601-ASF - - C1216244600-ASF - - C1216244591-ASF - - C1216244587-ASF - - C1216244598-ASF - - C1216244586-ASF - - C1260726384-ASF - - C1258354200-ASF - - C1259982010-ASF - - C1260721945-ASF - - C1257995185-ASF - - C1259976861-ASF - - C1260726378-ASF - - C1258354201-ASF - - C1259981910-ASF - - C1260721853-ASF - - C1257995186-ASF - - C1259974840-ASF - - C1216244597-ASF - - C1216244596-ASF - - C1216244588-ASF - - C1216244599-ASF - - C1257024016-ASF - - C1225776655-ASF - - C1225776657-ASF - - C1225776658-ASF - - C1225776659-ASF - - C1245953394-ASF - - C1234413263-ASFDEV - - C1234413247-ASFDEV - - C1234413248-ASFDEV - - C1234413255-ASFDEV - - C1234413254-ASFDEV - - C1234413256-ASFDEV - - C1234413253-ASFDEV - - C1234413252-ASFDEV - - C1234413250-ASFDEV - - C1234413259-ASFDEV - - C1234413251-ASFDEV - - C1234413261-ASFDEV - - C1234413262-ASFDEV - - C1234413258-ASFDEV - - C1244552887-ASFDEV - - C1234413246-ASFDEV - - C1234413249-ASFDEV - - C1234413257-ASFDEV - - C1234413260-ASFDEV - - C1257175154-ASFDEV - - C1244598379-ASFDEV + - "C1214470488-ASF" # S1A + - "C1214470533-ASF" + - "C1214470576-ASF" + - "C1595422627-ASF" + - "C1214470496-ASF" + - "C1214470532-ASF" + - "C1214472977-ASF" + - "C1214472336-ASF" + - "C1266376001-ASF" + - "C1214472994-ASF" + - "C1214470732-ASF" + - "C1214473170-ASF" + - "C1214470561-ASF" + - "C1214471521-ASF" + - "C1214470682-ASF" + - "C2777443834-ASF" + - "C2777436413-ASF" + - "C1214471197-ASF" + - "C1214471960-ASF" + - "C1214472978-ASF" + - "C1214473165-ASF" + - "C2709161906-ASF" + - "C1596065640-ASF" + - "C1596065639-ASF" + - "C1596065641-ASF" + - "C1595765183-ASF" + - "C2450786986-ASF" + - "C1205428742-ASF" + - "C1212201032-ASF" + - "C1212212560-ASF" + - "C1205264459-ASF" + - "C1208117434-ASF" + - "C1212209035-ASF" + - "C1212209226-ASF" + - "C1208115009-ASF" + - "C1212158327-ASF" + - "C1215704763-ASF" + - "C1225776654-ASF" + - "C1212158318-ASF" + - "C1212212493-ASF" + - "C1212158326-ASF" + - "C1212233976-ASF" + - "C1260726384-ASF" + - "C1258354200-ASF" + - "C1259982010-ASF" + - "C2795135668-ASF" + - "C1260721945-ASF" + - "C1257995185-ASF" + - "C1259976861-ASF" + - "C1258354201-ASF" + - "C1259981910-ASF" + - "C2795135174-ASF" + - "C1260721853-ASF" + - "C1257995186-ASF" + - "C1259974840-ASF" + - "C1212200781-ASF" + - "C1212209075-ASF" + - "C1257024016-ASF" + - "C1225776655-ASF" + - "C1225776657-ASF" + - "C1225776658-ASF" + - "C1225776659-ASF" + - "C1245953394-ASF" + - "C1234413245-ASFDEV" + - "C1234413229-ASFDEV" + - "C1234413237-ASFDEV" + - "C1234413238-ASFDEV" + - "C1234413236-ASFDEV" + - "C1234413230-ASFDEV" + - "C1234413232-ASFDEV" + - "C1234413235-ASFDEV" + - "C1234413240-ASFDEV" + - "C1234413234-ASFDEV" + - "C1234413241-ASFDEV" + - "C1234413233-ASFDEV" + - "C1234413243-ASFDEV" + - "C1234413244-ASFDEV" + - "C1244552887-ASFDEV" + - "C1234413228-ASFDEV" + - "C1234413231-ASFDEV" + - "C1234413239-ASFDEV" + - "C1234413242-ASFDEV" + - "C1257175154-ASFDEV" + - "C1244598379-ASFDEV" + - "C1240784657-ASFDEV" + - "C1327985661-ASF" # S1B + - "C1327985645-ASF" + - "C1595422627-ASF" + - "C1327985617-ASF" + - "C1327985660-ASF" + - "C1327985741-ASF" + - "C1327985578-ASF" + - "C1327985646-ASF" + - "C1327985650-ASF" + - "C1327985579-ASF" + - "C1327985740-ASF" + - "C1327985619-ASF" + - "C1327985739-ASF" + - "C1327985647-ASF" + - "C2777443834-ASF" + - "C2777436413-ASF" + - "C1327985697-ASF" + - "C1327985651-ASF" + - "C1327985644-ASF" + - "C1327985571-ASF" + - "C1327985674-ASF" + - "C2709161906-ASF" + - "C1596065640-ASF" + - "C1596065639-ASF" + - "C1596065641-ASF" + - "C1595765183-ASF" + - "C2450786986-ASF" + - "C1216244348-ASF" + - "C1216244589-ASF" + - "C1216244594-ASF" + - "C1216244593-ASF" + - "C1216244585-ASF" + - "C1216244592-ASF" + - "C1216244595-ASF" + - "C1225776654-ASF" + - "C1216244590-ASF" + - "C1216244601-ASF" + - "C1216244600-ASF" + - "C1216244591-ASF" + - "C1216244587-ASF" + - "C1216244598-ASF" + - "C1216244586-ASF" + - "C1260726384-ASF" + - "C1258354200-ASF" + - "C1259982010-ASF" + - "C2795135668-ASF" + - "C1260721945-ASF" + - "C1257995185-ASF" + - "C1259976861-ASF" + - "C1258354201-ASF" + - "C1259981910-ASF" + - "C2795135174-ASF" + - "C1260721853-ASF" + - "C1257995186-ASF" + - "C1259974840-ASF" + - "C1216244597-ASF" + - "C1216244596-ASF" + - "C1216244588-ASF" + - "C1216244599-ASF" + - "C1257024016-ASF" + - "C1225776655-ASF" + - "C1225776657-ASF" + - "C1225776658-ASF" + - "C1225776659-ASF" + - "C1245953394-ASF" + - "C1234413263-ASFDEV" + - "C1234413247-ASFDEV" + - "C1234413248-ASFDEV" + - "C1234413255-ASFDEV" + - "C1234413254-ASFDEV" + - "C1234413256-ASFDEV" + - "C1234413253-ASFDEV" + - "C1234413252-ASFDEV" + - "C1234413250-ASFDEV" + - "C1234413259-ASFDEV" + - "C1234413251-ASFDEV" + - "C1234413261-ASFDEV" + - "C1234413262-ASFDEV" + - "C1234413258-ASFDEV" + - "C1244552887-ASFDEV" + - "C1234413246-ASFDEV" + - "C1234413249-ASFDEV" + - "C1234413257-ASFDEV" + - "C1234413260-ASFDEV" + - "C1257175154-ASFDEV" + - "C1244598379-ASFDEV" + - test-search-build_subquery S1-Platform SLC: params: platform: @@ -387,10 +390,13 @@ tests: platform: SENTINEL-1A processingLevel: CSLC - - test-aliasing-search-against-api OERA-S1 CSLC: + - test-aliasing-search-against-api RTC-STATIC: params: - dataset: OPERA-S1 - processingLevel: CSLC + processingLevel: RTC-STATIC + + - test-aliasing-search-against-api CSLC-STATIC: + params: + processingLevel: CSLC-STATIC - test-aliasing-search-against-api OERA-S1 RTC: params: From 9a3e0fdb5050fa887f647dc5ca1a384f80d5850f Mon Sep 17 00:00:00 2001 From: kim Date: Wed, 31 Jan 2024 13:10:24 -0900 Subject: [PATCH 09/10] adds calval rtc and cslc to platform collection list. Updates test cases, makes test_search subquery test more accurate --- asf_search/CMR/datasets.py | 6 + tests/Search/test_search.py | 7 +- tests/yml_tests/test_search.yml | 584 ++++++++++++++++++++++---------- 3 files changed, 409 insertions(+), 188 deletions(-) diff --git a/asf_search/CMR/datasets.py b/asf_search/CMR/datasets.py index b84c80cc..3fcd0cfc 100644 --- a/asf_search/CMR/datasets.py +++ b/asf_search/CMR/datasets.py @@ -331,6 +331,8 @@ collections_per_platform = { "SENTINEL-1A": [ + "C2803501758-ASF", + "C2803501097-ASF", "C1214470488-ASF", "C1214470533-ASF", "C1214470576-ASF", @@ -418,6 +420,8 @@ "C1240784657-ASFDEV", ], "SENTINEL-1B": [ + "C2803501758-ASF", + "C2803501097-ASF", "C1327985661-ASF", "C1327985645-ASF", "C1595422627-ASF", @@ -852,11 +856,13 @@ "CSLC": [ "C2777443834-ASF", "C1260721945-ASF", + "C2803501758-ASF", "C1259976861-ASF", ], "RTC": [ "C2777436413-ASF", "C1260721853-ASF", + "C2803501097-ASF", "C1259974840-ASF", ], "GRD_FD": ["C1214471197-ASF", "C1212200781-ASF"], diff --git a/tests/Search/test_search.py b/tests/Search/test_search.py index 49111cdb..7ef9df95 100644 --- a/tests/Search/test_search.py +++ b/tests/Search/test_search.py @@ -109,14 +109,17 @@ def run_test_dataset_search(datasets: List): def run_test_build_subqueries(params: ASFSearchOptions, expected: List): # mainly for getting platform aliases preprocess_opts(params) - actual = build_subqueries(params) for a, b in zip(actual, expected): for key, actual_val in a: expected_val = getattr(b, key) if isinstance(actual_val, list): if len(actual_val) > 0: # ASFSearchOptions leaves empty lists as None - assert len(set(expected_val).difference(set(actual_val))) == 0 + expected_set = set(expected_val) + actual_set = set(actual_val) + + difference = expected_set.symmetric_difference(actual_set) + assert len(difference) == 0, f"Found {len(difference)} missing entries for subquery generated keyword: \"{key}\"\n{list(difference)}" else: assert actual_val == expected_val diff --git a/tests/yml_tests/test_search.yml b/tests/yml_tests/test_search.yml index 79c1f07f..9289aa5e 100644 --- a/tests/yml_tests/test_search.yml +++ b/tests/yml_tests/test_search.yml @@ -1,3 +1,178 @@ +sentinel-1_collections: &sentinel-1_collections + - "C2803501758-ASF" + - "C2803501097-ASF" + - "C1214470488-ASF" # S1A + - "C1214470533-ASF" + - "C1214470576-ASF" + - "C1595422627-ASF" + - "C1214470496-ASF" + - "C1214470532-ASF" + - "C1214472977-ASF" + - "C1214472336-ASF" + - "C1266376001-ASF" + - "C1214472994-ASF" + - "C1214470732-ASF" + - "C1214473170-ASF" + - "C1214470561-ASF" + - "C1214471521-ASF" + - "C1214470682-ASF" + - "C2777443834-ASF" + - "C2777436413-ASF" + - "C1214471197-ASF" + - "C1214471960-ASF" + - "C1214472978-ASF" + - "C1214473165-ASF" + - "C2709161906-ASF" + - "C1596065640-ASF" + - "C1596065639-ASF" + - "C1596065641-ASF" + - "C1595765183-ASF" + - "C2450786986-ASF" + - "C1205428742-ASF" + - "C1212201032-ASF" + - "C1212212560-ASF" + - "C1205264459-ASF" + - "C1208117434-ASF" + - "C1212209035-ASF" + - "C1212209226-ASF" + - "C1208115009-ASF" + - "C1212158327-ASF" + - "C1215704763-ASF" + - "C1225776654-ASF" + - "C1212158318-ASF" + - "C1212212493-ASF" + - "C1212158326-ASF" + - "C1212233976-ASF" + - "C1260726384-ASF" + - "C1258354200-ASF" + - "C1259982010-ASF" + - "C2795135668-ASF" + - "C1260721945-ASF" + - "C1257995185-ASF" + - "C1259976861-ASF" + - "C1258354201-ASF" + - "C1259981910-ASF" + - "C2795135174-ASF" + - "C1260721853-ASF" + - "C1257995186-ASF" + - "C1259974840-ASF" + - "C1212200781-ASF" + - "C1212209075-ASF" + - "C1257024016-ASF" + - "C1225776655-ASF" + - "C1225776657-ASF" + - "C1225776658-ASF" + - "C1225776659-ASF" + - "C1245953394-ASF" + - "C1234413245-ASFDEV" + - "C1234413229-ASFDEV" + - "C1234413237-ASFDEV" + - "C1234413238-ASFDEV" + - "C1234413236-ASFDEV" + - "C1234413230-ASFDEV" + - "C1234413232-ASFDEV" + - "C1234413235-ASFDEV" + - "C1234413240-ASFDEV" + - "C1234413234-ASFDEV" + - "C1234413241-ASFDEV" + - "C1234413233-ASFDEV" + - "C1234413243-ASFDEV" + - "C1234413244-ASFDEV" + - "C1244552887-ASFDEV" + - "C1234413228-ASFDEV" + - "C1234413231-ASFDEV" + - "C1234413239-ASFDEV" + - "C1234413242-ASFDEV" + - "C1257175154-ASFDEV" + - "C1244598379-ASFDEV" + - "C1240784657-ASFDEV" + - "C1327985661-ASF" # S1B + - "C1327985645-ASF" + - "C1595422627-ASF" + - "C1327985617-ASF" + - "C1327985660-ASF" + - "C1327985741-ASF" + - "C1327985578-ASF" + - "C1327985646-ASF" + - "C1327985650-ASF" + - "C1327985579-ASF" + - "C1327985740-ASF" + - "C1327985619-ASF" + - "C1327985739-ASF" + - "C1327985647-ASF" + - "C2777443834-ASF" + - "C2777436413-ASF" + - "C1327985697-ASF" + - "C1327985651-ASF" + - "C1327985644-ASF" + - "C1327985571-ASF" + - "C1327985674-ASF" + - "C2709161906-ASF" + - "C1596065640-ASF" + - "C1596065639-ASF" + - "C1596065641-ASF" + - "C1595765183-ASF" + - "C2450786986-ASF" + - "C1216244348-ASF" + - "C1216244589-ASF" + - "C1216244594-ASF" + - "C1216244593-ASF" + - "C1216244585-ASF" + - "C1216244592-ASF" + - "C1216244595-ASF" + - "C1225776654-ASF" + - "C1216244590-ASF" + - "C1216244601-ASF" + - "C1216244600-ASF" + - "C1216244591-ASF" + - "C1216244587-ASF" + - "C1216244598-ASF" + - "C1216244586-ASF" + - "C1260726384-ASF" + - "C1258354200-ASF" + - "C1259982010-ASF" + - "C2795135668-ASF" + - "C1260721945-ASF" + - "C1257995185-ASF" + - "C1259976861-ASF" + - "C1258354201-ASF" + - "C1259981910-ASF" + - "C2795135174-ASF" + - "C1260721853-ASF" + - "C1257995186-ASF" + - "C1259974840-ASF" + - "C1216244597-ASF" + - "C1216244596-ASF" + - "C1216244588-ASF" + - "C1216244599-ASF" + - "C1257024016-ASF" + - "C1225776655-ASF" + - "C1225776657-ASF" + - "C1225776658-ASF" + - "C1225776659-ASF" + - "C1245953394-ASF" + - "C1234413263-ASFDEV" + - "C1234413247-ASFDEV" + - "C1234413248-ASFDEV" + - "C1234413255-ASFDEV" + - "C1234413254-ASFDEV" + - "C1234413256-ASFDEV" + - "C1234413253-ASFDEV" + - "C1234413252-ASFDEV" + - "C1234413250-ASFDEV" + - "C1234413259-ASFDEV" + - "C1234413251-ASFDEV" + - "C1234413261-ASFDEV" + - "C1234413262-ASFDEV" + - "C1234413258-ASFDEV" + - "C1244552887-ASFDEV" + - "C1234413246-ASFDEV" + - "C1234413249-ASFDEV" + - "C1234413257-ASFDEV" + - "C1234413260-ASFDEV" + - "C1257175154-ASFDEV" + - "C1244598379-ASFDEV" + tests: - test-ASFSearch ALOS Resp 1: response: Alos_response_maxResults3.yml @@ -51,178 +226,7 @@ tests: - SENTINEL-1A - SENTINEL-1B expected: - - collections: - - "C1214470488-ASF" # S1A - - "C1214470533-ASF" - - "C1214470576-ASF" - - "C1595422627-ASF" - - "C1214470496-ASF" - - "C1214470532-ASF" - - "C1214472977-ASF" - - "C1214472336-ASF" - - "C1266376001-ASF" - - "C1214472994-ASF" - - "C1214470732-ASF" - - "C1214473170-ASF" - - "C1214470561-ASF" - - "C1214471521-ASF" - - "C1214470682-ASF" - - "C2777443834-ASF" - - "C2777436413-ASF" - - "C1214471197-ASF" - - "C1214471960-ASF" - - "C1214472978-ASF" - - "C1214473165-ASF" - - "C2709161906-ASF" - - "C1596065640-ASF" - - "C1596065639-ASF" - - "C1596065641-ASF" - - "C1595765183-ASF" - - "C2450786986-ASF" - - "C1205428742-ASF" - - "C1212201032-ASF" - - "C1212212560-ASF" - - "C1205264459-ASF" - - "C1208117434-ASF" - - "C1212209035-ASF" - - "C1212209226-ASF" - - "C1208115009-ASF" - - "C1212158327-ASF" - - "C1215704763-ASF" - - "C1225776654-ASF" - - "C1212158318-ASF" - - "C1212212493-ASF" - - "C1212158326-ASF" - - "C1212233976-ASF" - - "C1260726384-ASF" - - "C1258354200-ASF" - - "C1259982010-ASF" - - "C2795135668-ASF" - - "C1260721945-ASF" - - "C1257995185-ASF" - - "C1259976861-ASF" - - "C1258354201-ASF" - - "C1259981910-ASF" - - "C2795135174-ASF" - - "C1260721853-ASF" - - "C1257995186-ASF" - - "C1259974840-ASF" - - "C1212200781-ASF" - - "C1212209075-ASF" - - "C1257024016-ASF" - - "C1225776655-ASF" - - "C1225776657-ASF" - - "C1225776658-ASF" - - "C1225776659-ASF" - - "C1245953394-ASF" - - "C1234413245-ASFDEV" - - "C1234413229-ASFDEV" - - "C1234413237-ASFDEV" - - "C1234413238-ASFDEV" - - "C1234413236-ASFDEV" - - "C1234413230-ASFDEV" - - "C1234413232-ASFDEV" - - "C1234413235-ASFDEV" - - "C1234413240-ASFDEV" - - "C1234413234-ASFDEV" - - "C1234413241-ASFDEV" - - "C1234413233-ASFDEV" - - "C1234413243-ASFDEV" - - "C1234413244-ASFDEV" - - "C1244552887-ASFDEV" - - "C1234413228-ASFDEV" - - "C1234413231-ASFDEV" - - "C1234413239-ASFDEV" - - "C1234413242-ASFDEV" - - "C1257175154-ASFDEV" - - "C1244598379-ASFDEV" - - "C1240784657-ASFDEV" - - "C1327985661-ASF" # S1B - - "C1327985645-ASF" - - "C1595422627-ASF" - - "C1327985617-ASF" - - "C1327985660-ASF" - - "C1327985741-ASF" - - "C1327985578-ASF" - - "C1327985646-ASF" - - "C1327985650-ASF" - - "C1327985579-ASF" - - "C1327985740-ASF" - - "C1327985619-ASF" - - "C1327985739-ASF" - - "C1327985647-ASF" - - "C2777443834-ASF" - - "C2777436413-ASF" - - "C1327985697-ASF" - - "C1327985651-ASF" - - "C1327985644-ASF" - - "C1327985571-ASF" - - "C1327985674-ASF" - - "C2709161906-ASF" - - "C1596065640-ASF" - - "C1596065639-ASF" - - "C1596065641-ASF" - - "C1595765183-ASF" - - "C2450786986-ASF" - - "C1216244348-ASF" - - "C1216244589-ASF" - - "C1216244594-ASF" - - "C1216244593-ASF" - - "C1216244585-ASF" - - "C1216244592-ASF" - - "C1216244595-ASF" - - "C1225776654-ASF" - - "C1216244590-ASF" - - "C1216244601-ASF" - - "C1216244600-ASF" - - "C1216244591-ASF" - - "C1216244587-ASF" - - "C1216244598-ASF" - - "C1216244586-ASF" - - "C1260726384-ASF" - - "C1258354200-ASF" - - "C1259982010-ASF" - - "C2795135668-ASF" - - "C1260721945-ASF" - - "C1257995185-ASF" - - "C1259976861-ASF" - - "C1258354201-ASF" - - "C1259981910-ASF" - - "C2795135174-ASF" - - "C1260721853-ASF" - - "C1257995186-ASF" - - "C1259974840-ASF" - - "C1216244597-ASF" - - "C1216244596-ASF" - - "C1216244588-ASF" - - "C1216244599-ASF" - - "C1257024016-ASF" - - "C1225776655-ASF" - - "C1225776657-ASF" - - "C1225776658-ASF" - - "C1225776659-ASF" - - "C1245953394-ASF" - - "C1234413263-ASFDEV" - - "C1234413247-ASFDEV" - - "C1234413248-ASFDEV" - - "C1234413255-ASFDEV" - - "C1234413254-ASFDEV" - - "C1234413256-ASFDEV" - - "C1234413253-ASFDEV" - - "C1234413252-ASFDEV" - - "C1234413250-ASFDEV" - - "C1234413259-ASFDEV" - - "C1234413251-ASFDEV" - - "C1234413261-ASFDEV" - - "C1234413262-ASFDEV" - - "C1234413258-ASFDEV" - - "C1244552887-ASFDEV" - - "C1234413246-ASFDEV" - - "C1234413249-ASFDEV" - - "C1234413257-ASFDEV" - - "C1234413260-ASFDEV" - - "C1257175154-ASFDEV" - - "C1244598379-ASFDEV" + - collections: *sentinel-1_collections - test-search-build_subquery S1-Platform SLC: params: @@ -233,12 +237,12 @@ tests: - SLC expected: - collections: - - C1214470488-ASF - - C1205428742-ASF - - C1234413245-ASFDEV - - C1327985661-ASF - - C1216244348-ASF - - C1234413263-ASFDEV + - 'C1205428742-ASF' + - 'C1214470488-ASF' + - 'C1216244348-ASF' + - 'C1234413245-ASFDEV' + - 'C1234413263-ASFDEV' + - 'C1327985661-ASF' - test-search-build_subquery S1-Dataset SLC: params: dataset: @@ -335,7 +339,7 @@ tests: C1212001698-ASF] } ] - - test-search-build_subquery UNKNOWN_PROCESSING_TYPE with platform, SLC, & collection: + - test-search-build_subquery UNKNOWN_PROCESSING_TYPE with platform, SLC, & collection (skip set difference with unknown processing level): params: platform: - SENTINEL-1A @@ -349,13 +353,221 @@ tests: expected: [{ processingLevel: UNKNOWN_PROCESSING_TYPE, collections: [ - C1214470488-ASF, - C1205428742-ASF, - C1234413245-ASFDEV, - C1327985661-ASF, - C1216244348-ASF, - C1234413263-ASFDEV, - C1212001698-ASF, + "C1214353986-ASF", + "C1214336045-ASF", + "C1214336717-ASF", + "C1214335430-ASF", + "C1214335471-ASF", + "C1214335903-ASF", + "C1214336154-ASF", + "C1214336554-ASF", + "C1214353593-ASF", + "C1214353754-ASF", + "C1214353859-ASF", + "C1214337770-ASF", + "C1214354144-ASF", + "C1214354235-ASF", + "C1214343609-ASF", + "C1214354031-ASF", + "C1214408428-ASF", + "C1214419355-ASF", + "C1210487703-ASF", + "C1212030772-ASF", + "C1206116665-ASF", + "C1206132445-ASF", + "C1211962154-ASF", + "C1212001698-ASF", + "C1212005594-ASF", + "C1212019993-ASF", + "C1207638502-ASF", + "C1210025872-ASF", + "C1210485039-ASF", + "C1207188317-ASF", + "C1210546638-ASF", + "C1206122195-ASF", + "C1209970710-ASF", + "C1207038647-ASF", + "C1210599503-ASF", + "C1210599673-ASF", + "C1214470488-ASF", + "C1205428742-ASF", + "C1234413245-ASFDEV", + "C1327985661-ASF", + "C1216244348-ASF", + "C1234413263-ASFDEV", + "C2803501758-ASF", # OPERA + "C2803501097-ASF", # OPERA + "C1214470488-ASF", # S1A + "C1214470533-ASF", + "C1214470576-ASF", + "C1595422627-ASF", + "C1214470496-ASF", + "C1214470532-ASF", + "C1214472977-ASF", + "C1214472336-ASF", + "C1266376001-ASF", + "C1214472994-ASF", + "C1214470732-ASF", + "C1214473170-ASF", + "C1214470561-ASF", + "C1214471521-ASF", + "C1214470682-ASF", + "C2777443834-ASF", + "C2777436413-ASF", + "C1214471197-ASF", + "C1214471960-ASF", + "C1214472978-ASF", + "C1214473165-ASF", + "C2709161906-ASF", + "C1596065640-ASF", + "C1596065639-ASF", + "C1596065641-ASF", + "C1595765183-ASF", + "C2450786986-ASF", + "C1205428742-ASF", + "C1212201032-ASF", + "C1212212560-ASF", + "C1205264459-ASF", + "C1208117434-ASF", + "C1212209035-ASF", + "C1212209226-ASF", + "C1208115009-ASF", + "C1212158327-ASF", + "C1215704763-ASF", + "C1225776654-ASF", + "C1212158318-ASF", + "C1212212493-ASF", + "C1212158326-ASF", + "C1212233976-ASF", + "C1260726384-ASF", + "C1258354200-ASF", + "C1259982010-ASF", + "C2795135668-ASF", + "C1260721945-ASF", + "C1257995185-ASF", + "C1259976861-ASF", + "C1258354201-ASF", + "C1259981910-ASF", + "C2795135174-ASF", + "C1260721853-ASF", + "C1257995186-ASF", + "C1259974840-ASF", + "C1212200781-ASF", + "C1212209075-ASF", + "C1257024016-ASF", + "C1225776655-ASF", + "C1225776657-ASF", + "C1225776658-ASF", + "C1225776659-ASF", + "C1245953394-ASF", + "C1234413245-ASFDEV", + "C1234413229-ASFDEV", + "C1234413237-ASFDEV", + "C1234413238-ASFDEV", + "C1234413236-ASFDEV", + "C1234413230-ASFDEV", + "C1234413232-ASFDEV", + "C1234413235-ASFDEV", + "C1234413240-ASFDEV", + "C1234413234-ASFDEV", + "C1234413241-ASFDEV", + "C1234413233-ASFDEV", + "C1234413243-ASFDEV", + "C1234413244-ASFDEV", + "C1244552887-ASFDEV", + "C1234413228-ASFDEV", + "C1234413231-ASFDEV", + "C1234413239-ASFDEV", + "C1234413242-ASFDEV", + "C1257175154-ASFDEV", + "C1244598379-ASFDEV", + "C1240784657-ASFDEV", + "C1327985661-ASF", # S1B + "C1327985645-ASF", + "C1595422627-ASF", + "C1327985617-ASF", + "C1327985660-ASF", + "C1327985741-ASF", + "C1327985578-ASF", + "C1327985646-ASF", + "C1327985650-ASF", + "C1327985579-ASF", + "C1327985740-ASF", + "C1327985619-ASF", + "C1327985739-ASF", + "C1327985647-ASF", + "C2777443834-ASF", + "C2777436413-ASF", + "C1327985697-ASF", + "C1327985651-ASF", + "C1327985644-ASF", + "C1327985571-ASF", + "C1327985674-ASF", + "C2709161906-ASF", + "C1596065640-ASF", + "C1596065639-ASF", + "C1596065641-ASF", + "C1595765183-ASF", + "C2450786986-ASF", + "C1216244348-ASF", + "C1216244589-ASF", + "C1216244594-ASF", + "C1216244593-ASF", + "C1216244585-ASF", + "C1216244592-ASF", + "C1216244595-ASF", + "C1225776654-ASF", + "C1216244590-ASF", + "C1216244601-ASF", + "C1216244600-ASF", + "C1216244591-ASF", + "C1216244587-ASF", + "C1216244598-ASF", + "C1216244586-ASF", + "C1260726384-ASF", + "C1258354200-ASF", + "C1259982010-ASF", + "C2795135668-ASF", + "C1260721945-ASF", + "C1257995185-ASF", + "C1259976861-ASF", + "C1258354201-ASF", + "C1259981910-ASF", + "C2795135174-ASF", + "C1260721853-ASF", + "C1257995186-ASF", + "C1259974840-ASF", + "C1216244597-ASF", + "C1216244596-ASF", + "C1216244588-ASF", + "C1216244599-ASF", + "C1257024016-ASF", + "C1225776655-ASF", + "C1225776657-ASF", + "C1225776658-ASF", + "C1225776659-ASF", + "C1245953394-ASF", + "C1234413263-ASFDEV", + "C1234413247-ASFDEV", + "C1234413248-ASFDEV", + "C1234413255-ASFDEV", + "C1234413254-ASFDEV", + "C1234413256-ASFDEV", + "C1234413253-ASFDEV", + "C1234413252-ASFDEV", + "C1234413250-ASFDEV", + "C1234413259-ASFDEV", + "C1234413251-ASFDEV", + "C1234413261-ASFDEV", + "C1234413262-ASFDEV", + "C1234413258-ASFDEV", + "C1244552887-ASFDEV", + "C1234413246-ASFDEV", + "C1234413249-ASFDEV", + "C1234413257-ASFDEV", + "C1234413260-ASFDEV", + "C1257175154-ASFDEV", + "C1244598379-ASFDEV", ] }] - test-search-build_subquery configuration params: From 42d253b4b05e5d23d9b465bd1adcf56dbe904f87 Mon Sep 17 00:00:00 2001 From: Kim <33294735+SpicyGarlicAlbacoreRoll@users.noreply.github.com> Date: Wed, 31 Jan 2024 13:29:15 -0900 Subject: [PATCH 10/10] Update CHANGELOG.md --- CHANGELOG.md | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 744035cd..c86529cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,14 +27,12 @@ and uses [Semantic Versioning](https://semver.org/spec/v2.0.0.html). --> ------ ## [v7.0.3](https://github.com/asfadmin/Discovery-asf_search/compare/v7.0.2...v7.0.3) -### Added -- Adds newer `CSLC-STATIC` and `RTC-STATIC` concept-ids to `collections_by_processing_level` and Sentinel-1 platform concept id lists. - ### Fixed -- Fixed typo for constant variable name `constants.PRODUCT_TYPE.CSLC_STATIC` +- Fixes typo for constant variable name `constants.PRODUCT_TYPE.CSLC_STATIC` +- Normalizes concept-id lists for `OPERA-S1` dataset product types ### Changed -- Completely remove calval `CSLC-STATIC` and calval `RTC-STATIC` collections from concept-id lists +- Completely removes `CSLC-STATIC` Calval and `RTC-STATIC` Calval collections from concept-id lists ------ ## [v7.0.2](https://github.com/asfadmin/Discovery-asf_search/compare/v7.0.1...v7.0.2)