Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1388 some ecmwf products have invalid default parameters #1389

Open
wants to merge 9 commits into
base: develop
Choose a base branch
from
2 changes: 1 addition & 1 deletion eodag/resources/product_types.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2375,7 +2375,7 @@ CAMS_GAC_FORECAST:
sensorType: ATMOSPHERIC
license: proprietary
title: CAMS global atmospheric composition forecasts
missionStartDate: "2015-01-02T00:00:00Z"
missionStartDate: "2015-01-01T00:00:00Z"

CAMS_EU_AIR_QUALITY_FORECAST:
abstract: |
Expand Down
41 changes: 29 additions & 12 deletions eodag/resources/providers.yml
jlahovnik marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -2427,13 +2427,13 @@
dataset: cams-global-atmospheric-composition-forecasts
type: forecast
format: grib
variable: ammonium_aerosol_optical_depth_550nm
variable: 10m_u_component_of_wind
time: '00:00'
leadtime_hour: '0'
CAMS_GFE_GFAS:
dataset: cams-global-fire-emissions-gfas
format: grib
variable: altitude_of_plume_bottom
variable: wildfire_combustion_rate
CAMS_EU_AIR_QUALITY_FORECAST:
dataset: cams-europe-air-quality-forecasts
model: ensemble
Expand Down Expand Up @@ -2913,9 +2913,9 @@
- '{$.completionTimeFromAscendingNode#get_hydrological_year}'
SATELLITE_CARBON_DIOXIDE:
dataset: satellite-carbon-dioxide
processing_level: level_2
processing_level: level_3
jlahovnik marked this conversation as resolved.
Show resolved Hide resolved
variable: xco2
sensor_and_algorithm: merged_emma
sensor_and_algorithm: merged_obs4mips
version: '4_5'
metadata_mapping:
<<: *day_month_year
Expand All @@ -2930,9 +2930,9 @@
<<: *month_year
SATELLITE_METHANE:
dataset: satellite-methane
processing_level: level_2
processing_level: level_3
variable: xch4
sensor_and_algorithm: merged_emma
sensor_and_algorithm: merged_obs4mips
version: '4_5'
metadata_mapping:
<<: *day_month_year
Expand Down Expand Up @@ -4515,10 +4515,10 @@
- '{{"productIdentifier": "{id}"}}'
- '{$.id#remove_extension}'
startTimeFromAscendingNode:
- '{{"dtstart": "{startTimeFromAscendingNode#to_iso_utc_datetime}"}}'
- '{{"startdate": "{startTimeFromAscendingNode#to_iso_utc_datetime}"}}'
- '$.properties.startdate'
completionTimeFromAscendingNode:
- '{{"dtend": "{completionTimeFromAscendingNode#to_iso_utc_datetime}"}}'
- '{{"enddate": "{completionTimeFromAscendingNode#to_iso_utc_datetime}"}}'
- '$.properties.enddate'
downloadLink: '$.properties.location'
title: '$.id'
Expand All @@ -4545,7 +4545,7 @@
- '{{"system": "{system}"}}'
- '$.null'
format:
- '{{"format": "{format}"}}'
- '{{"data_format": "{format}"}}'
- '$.null'
pressure_level:
- '{{"pressure_level": {pressure_level}}}'
Expand Down Expand Up @@ -4655,7 +4655,7 @@
processingLevel:
- level_2
version:
- "4.0"
- "4_0"
variable: xco2
sensor_and_algorithm: sciamachy_wfmd
format: zip
Expand Down Expand Up @@ -4701,7 +4701,7 @@
processingLevel:
- level_2
version:
- "4.0"
- "4_0"
variable: xch4
sensor_and_algorithm: sciamachy_wfmd
format: zip
Expand Down Expand Up @@ -5344,7 +5344,7 @@
- forecast
format: grib
variable:
- ammonium_aerosol_optical_depth_550nm
- 10m_u_component_of_wind
time:
- '00:00'
leadtime_hour:
Expand All @@ -5357,6 +5357,23 @@
<<: *variable_list
defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))'
orderLink: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/download?{{"location": "{downloadLink}","product_id":"{id}", "dataset_id": "EO:ECMWF:DAT:CAMS_GLOBAL_ATMOSPHERIC_COMPOSITION_FORECASTS"}}'
CAMS_GFE_GFAS:
productType: EO:ECMWF:DAT:CAMS_GLOBAL_FIRE_EMISSIONS_GFAS
format: grib
variable:
- wildfire_combustion_rate
time:
- '00:00'
leadtime_hour:
- '0'
metadata_mapping:
id: '$.id'
type:
- '{{"type": {type}}}'
- '$.null'
<<: *variable_list
defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))'
orderLink: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/download?{{"location": "{downloadLink}","product_id":"{id}", "dataset_id": "EO:ECMWF:DAT:CAMS_GLOBAL_FIRE_EMISSIONS_GFAS"}}'
CAMS_SOLAR_RADIATION:
productType: EO:ECMWF:DAT:CAMS_SOLAR_RADIATION_TIMESERIES
sky_type: clear
Expand Down
2 changes: 1 addition & 1 deletion tests/units/test_core.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ class TestCore(TestCoreBase):
"AG_ERA5": ["cop_cds", "wekeo_ecmwf"],
"CAMS_GAC_FORECAST": ["cop_ads", "dedl", "wekeo_ecmwf"],
"CAMS_EU_AIR_QUALITY_FORECAST": ["cop_ads", "dedl", "wekeo_ecmwf"],
"CAMS_GFE_GFAS": ["cop_ads", "dedl"],
"CAMS_GFE_GFAS": ["cop_ads", "dedl", "wekeo_ecmwf"],
"CAMS_GRF": ["cop_ads", "dedl", "wekeo_ecmwf"],
"CAMS_GRF_AUX": ["cop_ads", "dedl", "wekeo_ecmwf"],
"CAMS_SOLAR_RADIATION": ["cop_ads", "dedl", "wekeo_ecmwf"],
Expand Down
18 changes: 9 additions & 9 deletions tests/units/test_search_plugins.py
Original file line number Diff line number Diff line change
Expand Up @@ -1054,7 +1054,7 @@ def test_plugins_search_postjsonsearch_default_dates(
"time": ["01:00"],
"product_type": ["ensemble_mean"],
"variable": ["10m_u_component_of_wind"],
"format": "grib",
"data_format": "grib",
"itemsPerPage": 20,
"startIndex": 0,
},
Expand All @@ -1078,7 +1078,7 @@ def test_plugins_search_postjsonsearch_default_dates(
"time": ["03:00"],
"product_type": ["ensemble_mean"],
"variable": ["10m_u_component_of_wind"],
"format": "grib",
"data_format": "grib",
"itemsPerPage": 20,
"startIndex": 0,
},
Expand Down Expand Up @@ -1116,7 +1116,7 @@ def test_plugins_search_postjsonsearch_default_dates(
"time": ["00:00"],
"product_type": ["ensemble_mean"],
"variable": ["10m_u_component_of_wind"],
"format": "grib",
"data_format": "grib",
"itemsPerPage": 20,
"startIndex": 0,
},
Expand Down Expand Up @@ -1148,11 +1148,11 @@ def test_plugins_search_postjsonsearch_default_dates(
"https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/search",
json={
"dataset_id": "EO:ECMWF:DAT:CAMS_GLOBAL_REANALYSIS_EAC4",
"format": "grib",
"data_format": "grib",
"variable": ["2m_dewpoint_temperature"],
"time": ["00:00"],
"dtstart": "2003-01-01T00:00:00.000Z",
"dtend": today().strftime("%Y-%m-%dT%H:%M:%S.%f")[:-3] + "Z",
"startdate": "2003-01-01T00:00:00.000Z",
"enddate": today().strftime("%Y-%m-%dT%H:%M:%S.%f")[:-3] + "Z",
"itemsPerPage": 20,
"startIndex": 0,
},
Expand Down Expand Up @@ -1215,7 +1215,7 @@ def _test_query_params(search_criteria, raw_result, expected_query_params):
"dataset_id": "EO:ECMWF:DAT:DERIVED_GRIDDED_GLACIER_MASS_CHANGE",
"hydrological_year": ["1980_81"],
"variable": "glacier_mass_change",
"format": "zip",
"data_format": "zip",
"product_version": "wgms_fog_2022_09",
"itemsPerPage": 10,
"startIndex": 0,
Expand All @@ -1234,7 +1234,7 @@ def _test_query_params(search_criteria, raw_result, expected_query_params):
"dataset_id": "EO:ECMWF:DAT:DERIVED_GRIDDED_GLACIER_MASS_CHANGE",
"hydrological_year": ["2020_21"],
"variable": "glacier_mass_change",
"format": "zip",
"data_format": "zip",
"product_version": "wgms_fog_2022_09",
"itemsPerPage": 10,
"startIndex": 0,
Expand All @@ -1253,7 +1253,7 @@ def _test_query_params(search_criteria, raw_result, expected_query_params):
"dataset_id": "EO:ECMWF:DAT:DERIVED_GRIDDED_GLACIER_MASS_CHANGE",
"hydrological_year": ["1990_91", "2020_21"],
"variable": "glacier_mass_change",
"format": "zip",
"data_format": "zip",
"product_version": "wgms_fog_2022_09",
"itemsPerPage": 10,
"startIndex": 0,
Expand Down