Merge branch 'test' into devel

Author: kim

.gitignore

@@ -22,4 +22,4 @@ jsonlite_cache/*
 venv/*
 .DS_Store
 .vscode
-
+.env

SearchAPI/CMR/Translate/parse_cmr_response.py

@@ -68,10 +68,17 @@ def remove_field(f):
         remove_field('platform')
 
     if 'frameNumber' in req_fields:
-        asf_frame_platforms = ['Sentinel-1A', 'Sentinel-1B', 'ALOS', 'SENTINEL-1A', 'SENTINEL-1B']
-        result['frameNumber'] = get_val(attr_path('FRAME_NUMBER')) \
-            if result['platform'] in asf_frame_platforms \
-            else get_val(attr_path('CENTER_ESA_FRAME'))
+        asf_frame_platforms = [
+            'Sentinel-1A', 'Sentinel-1B', 'ALOS', 'SENTINEL-1A', 'SENTINEL-1B',
+            'ERS-1', 'ERS-2', 'JERS-1', 'RADARSAT-1'
+        ]
+
+        if result['platform'] in asf_frame_platforms:
+            frame_type = 'FRAME_NUMBER'
+        else:
+            frame_type = 'CENTER_ESA_FRAME'
+
+        result['frameNumber'] = get_val(attr_path(frame_type))
         remove_field('frameNumber')
 
     if 'browse' in req_fields:
@@ -126,13 +133,13 @@ def float_or_none(a):
     if 'canInsar' in req_fields:
         if result['platform'] in ['ALOS', 'RADARSAT-1', 'JERS-1', 'ERS-1', 'ERS-2']:
             result['insarGrouping'] = get_val(field_paths['insarGrouping'])
-            
+
             insarBaseline = get_val(field_paths['insarBaseline'])
             if insarBaseline is not None:
                 insarBaseline = float(insarBaseline)
             result['baseline'] = {
                 'insarBaseline': insarBaseline
-                } 
+                }
             remove_field('insarGrouping')
             if result['insarGrouping'] not in [None, 0, '0', 'NA', 'NULL']:
                 result['canInsar'] = True
@@ -148,7 +155,7 @@ def float_or_none(a):
             result['canInsar'] = False
         remove_field('canInsar')
 
-        
+
     # These fields are always None or NA and should be fully deprecated/removed in the future
     deprecated_fields = [
         'beamSwath',
@@ -199,7 +206,12 @@ def float_or_none(a):
             result['fileName'] = result['granuleName'] + '.' + urls[0].split('.')[-1]
 
     if result.get('product_file_id', '').startswith('OPERA'):
-        result['additionalUrls'] = [url for url in get_all_vals('./OnlineAccessURLs/OnlineAccessURL/URL') if not url.endswith('.md5') and not url.startswith('s3://')]
+        result['beamMode'] = get_val(attr_path('BEAM_MODE'))
+        accessUrls = [url for url in get_all_vals('./OnlineAccessURLs/OnlineAccessURL/URL') if not url.endswith('.md5') and not url.startswith('s3://') and not 's3credentials' in url]
+        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://')]
     return result