Merge branch 'topic-opera-s1-calibration-dataset' of https://github.c…

…om/asfadmin/Discovery-SearchAPI into topic-opera-s1-calibration-dataset
asfadmin · Jan 24, 2024 · e766bca · e766bca
2 parents 809d1ff + a2438b3
commit e766bca
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/SearchAPI/CMR/Output/jsonlite.py b/SearchAPI/CMR/Output/jsonlite.py
@@ -181,7 +181,9 @@ def getItem(self, p):
         if p.get('operaBurstID') is not None or result['productID'].startswith('OPERA'):
             result['opera'] = {
                 'operaBurstID': p.get('operaBurstID'),
-                'additionalUrls': p.get('additionalUrls')
+                'additionalUrls': p.get('additionalUrls'),
             }
+            if p.get('validityStartDate'):
+                result['opera']['validityStartDate'] = p.get('validityStartDate')
 
         return result
diff --git a/SearchAPI/CMR/Translate/datasets.py b/SearchAPI/CMR/Translate/datasets.py
@@ -114,8 +114,8 @@
     "OPERA-S1": [
         "C2777443834-ASF",
         "C2777436413-ASF",
-        "C2795135174-ASF",  # RTC-STATIC
-        "C2795135668-ASF",  # CSLC-STATIC
+        "C2795135174-ASF", # RTC-STATIC
+        "C2795135668-ASF", # CSLC-STATIC
         "C1258354200-ASF",  # maybe extra?
         "C1259982010-ASF",
         "C1257995185-ASF",

diff --git a/SearchAPI/CMR/Translate/parse_cmr_response.py b/SearchAPI/CMR/Translate/parse_cmr_response.py
@@ -211,7 +211,13 @@ def float_or_none(a):
         OnlineResources = [url for url in get_all_vals('./OnlineResources/OnlineResource/URL') if not url.endswith('.md5') and not url.startswith('s3://') and not 's3credentials' in url]
         result['additionalUrls'] = list(set([*accessUrls, *OnlineResources]))
         result['configurationName'] = "Interferometric Wide. 250 km swath, 5 m x 20 m spatial resolution and burst synchronization for interferometry. IW is considered to be the standard mode over land masses."
-        result['browse'] = [url for url in get_all_vals('./AssociatedBrowseImageUrls/ProviderBrowseUrl/URL') if not url.startswith('s3://')]
+
+        if (providerbrowseUrls := get_all_vals('./AssociatedBrowseImageUrls/ProviderBrowseUrl/URL')):
+            result['browse'] = [url for url in providerbrowseUrls if not url.startswith('s3://')]
+
+        if 'STATIC' in result['processingLevel']:
+            result['validityStartDate'] = get_val('./Temporal/SingleDateTime')
+
     return result