From 9521bd48a164bb8da0992bec653ddca789b42ffc Mon Sep 17 00:00:00 2001 From: kim Date: Mon, 8 Apr 2024 08:58:15 -0800 Subject: [PATCH 1/3] adds ARIA_S1_GUNW dataset, inputGranules and ariaVersion to ARIAS1GUNWProduct properties --- asf_search/CMR/datasets.py | 3 +++ asf_search/Products/ARIAS1GUNWProduct.py | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/asf_search/CMR/datasets.py b/asf_search/CMR/datasets.py index 288f9cd5..7d49e089 100644 --- a/asf_search/CMR/datasets.py +++ b/asf_search/CMR/datasets.py @@ -433,6 +433,7 @@ "C1595765183-ASF", "C1225776659-ASF", ], + "ARIA_S1_GUNW": ["C2859376221-ASF", "C1261881077-ASF"] }, "SMAP": { "SPL1A_RO_METADATA_003": ["C1243122884-ASF", "C1233103964-ASF"], @@ -539,6 +540,8 @@ "C1214470533-ASF", "C1214470576-ASF", "C1595422627-ASF", + "C2859376221-ASF", + "C1261881077-ASF", "C1214470496-ASF", "C1214470532-ASF", "C1214472977-ASF", diff --git a/asf_search/Products/ARIAS1GUNWProduct.py b/asf_search/Products/ARIAS1GUNWProduct.py index 2d88419a..f8dfa08b 100644 --- a/asf_search/Products/ARIAS1GUNWProduct.py +++ b/asf_search/Products/ARIAS1GUNWProduct.py @@ -13,7 +13,9 @@ class ARIAS1GUNWProduct(S1Product): """ _base_properties = { 'perpendicularBaseline': {'path': ['AdditionalAttributes', ('Name', 'PERPENDICULAR_BASELINE'), 'Values', 0], 'cast': try_parse_float}, - 'orbit': {'path': ['OrbitCalculatedSpatialDomains']} + 'orbit': {'path': ['OrbitCalculatedSpatialDomains']}, + 'inputGranules': {'path': ['InputGranules']}, + 'ariaVersion': {'path': ['AdditionalAttributes', ('Name', 'VERSION'), 'Values', 0]} } def __init__(self, args: Dict = {}, session: ASFSession = ASFSession()): @@ -21,10 +23,12 @@ def __init__(self, args: Dict = {}, session: ASFSession = ASFSession()): self.properties['orbit'] = [orbit['OrbitNumber'] for orbit in self.properties['orbit']] urls = self.umm_get(self.umm, 'RelatedUrls', ('Type', [('USE SERVICE API', 'URL')]), 0) + + self.properties['additionalUrls'] = [] if urls is not None: self.properties['url'] = urls[0] self.properties['fileName'] = self.properties['fileID'] + '.' + urls[0].split('.')[-1] - self.properties['additionalUrls'] = [urls[1]] + self.properties['additionalUrls'] = urls[1:] @staticmethod def get_property_paths() -> Dict: From c77f027a07ee0373ef3714dac1eebf0dd11dba87 Mon Sep 17 00:00:00 2001 From: kim Date: Mon, 8 Apr 2024 10:01:32 -0800 Subject: [PATCH 2/3] updates test cases for new aria dataset entries --- tests/yml_tests/test_search.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/yml_tests/test_search.yml b/tests/yml_tests/test_search.yml index f18370c1..ab896207 100644 --- a/tests/yml_tests/test_search.yml +++ b/tests/yml_tests/test_search.yml @@ -1,6 +1,8 @@ sentinel-1_collections: &sentinel-1_collections - "C2803501758-ASF" - "C2803501097-ASF" + - "C1261881077-ASF" + - "C2859376221-ASF" - "C1214470488-ASF" # S1A - "C1214470533-ASF" - "C1214470576-ASF" @@ -355,6 +357,8 @@ tests: collections: [ "C1214353986-ASF", "C1214336045-ASF", + "C1261881077-ASF", + "C2859376221-ASF", "C1214336717-ASF", "C1214335430-ASF", "C1214335471-ASF", From 55bacb90c06fc1c48c8726eaa8525e84680e39a7 Mon Sep 17 00:00:00 2001 From: kim Date: Wed, 10 Apr 2024 11:34:07 -0800 Subject: [PATCH 3/3] update changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 474ec27f..d7cf5885 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,12 @@ and uses [Semantic Versioning](https://semver.org/spec/v2.0.0.html). - --> +------ +## [v7.0.9](https://github.com/asfadmin/Discovery-asf_search/compare/v7.0.8...v7.0.9) +### Added +- collection "ARIA_S1_GUNW" added to `ARIA_S1_GUNW` dataset, V3 products now loaded as `ARIAS1GUNWProduct` subclass +- `ARIAS1GUNWProduct` now exposes `ariaVersion` and (for V3 products) `inputGranules` in `ARIAS1GUNWProduct.properties` + ------ ## [v7.0.8](https://github.com/asfadmin/Discovery-asf_search/compare/v7.0.7...v7.0.8) ### Added