diff --git a/SearchAPI/CMR/SubQuery.py b/SearchAPI/CMR/SubQuery.py index 00087a00..5f77553f 100644 --- a/SearchAPI/CMR/SubQuery.py +++ b/SearchAPI/CMR/SubQuery.py @@ -61,7 +61,7 @@ def combine_params(self, params, extra_params): def should_use_asf_frame(self): asf_frame_platforms = ['SENTINEL-1A', 'SENTINEL-1B', 'ALOS'] - asf_frame_datasets = ['SENTINEL-1', 'OPERA-S1', 'SLC-BURST', 'ALOS PALSAR', 'ALOS AVNIR-2'] + asf_frame_datasets = ['SENTINEL-1', 'OPERA-S1', 'SLC-BURST', 'ALOS PALSAR', 'ALOS AVNIR-2', 'ALOS-2'] asf_frame_collections = [] for dataset in asf_frame_datasets: diff --git a/SearchAPI/CMR/Translate/datasets.py b/SearchAPI/CMR/Translate/datasets.py index 7b9da157..00c76509 100644 --- a/SearchAPI/CMR/Translate/datasets.py +++ b/SearchAPI/CMR/Translate/datasets.py @@ -132,6 +132,9 @@ "C2803501097-ASF", ], "SLC-BURST": ["C2709161906-ASF", "C1257024016-ASF"], + "ALOS-2": [ + "C3315903479-ASF" + ], "ALOS PALSAR": [ "C1206487504-ASF", "C1206485940-ASF", diff --git a/SearchAPI/CMR/Translate/parse_cmr_response.py b/SearchAPI/CMR/Translate/parse_cmr_response.py index 194fbb59..1525995e 100644 --- a/SearchAPI/CMR/Translate/parse_cmr_response.py +++ b/SearchAPI/CMR/Translate/parse_cmr_response.py @@ -70,7 +70,7 @@ def remove_field(f): if 'frameNumber' in req_fields: asf_frame_platforms = [ 'Sentinel-1A', 'Sentinel-1B', 'ALOS', 'SENTINEL-1A', 'SENTINEL-1B', - 'ERS-1', 'ERS-2', 'JERS-1', 'RADARSAT-1' + 'ERS-1', 'ERS-2', 'JERS-1', 'RADARSAT-1', 'ALOS-2' ] if result['platform'] in asf_frame_platforms: @@ -90,7 +90,7 @@ def remove_field(f): result['fileName'] = file_name.split('/')[-1] if file_name else None remove_field('fileName') - if 'stateVectors' in req_fields or ('canInsar' in req_fields and result['platform'] not in ['ALOS', 'RADARSAT-1', 'JERS-1', 'ERS-1', 'ERS-2']): + if 'stateVectors' in req_fields or ('canInsar' in req_fields and result['platform'] not in ['ALOS', 'ALOS-2', 'RADARSAT-1', 'JERS-1', 'ERS-1', 'ERS-2']): def parse_sv(sv): def float_or_none(a): try: @@ -131,7 +131,7 @@ def float_or_none(a): remove_field('stateVectors') if 'canInsar' in req_fields: - if result['platform'] in ['ALOS', 'RADARSAT-1', 'JERS-1', 'ERS-1', 'ERS-2']: + if result['platform'] in ['ALOS', 'ALOS-2', 'RADARSAT-1', 'JERS-1', 'ERS-1', 'ERS-2']: result['insarGrouping'] = get_val(field_paths['insarGrouping']) insarBaseline = get_val(field_paths['insarBaseline']) @@ -204,9 +204,9 @@ def float_or_none(a): if len(urls): result['downloadUrl'] = urls[0] result['fileName'] = result['granuleName'] + '.' + urls[0].split('.')[-1] + if result['platform'] in ['ALOS-2']: + result['beamMode'] = get_val(attr_path('BEAM_MODE')) - - def get_all_urls(): accessPath = './OnlineAccessURLs/OnlineAccessURL/URL' resourcesPath = './OnlineResources/OnlineResource/URL'