Skip to content

Commit

Permalink
feat(providers): add METOP_HIRSL1 and SATELLITE_FIRE_BURNED_AREA data…
Browse files Browse the repository at this point in the history
…sets (#1227)
  • Loading branch information
alambare authored Jun 21, 2024
1 parent 5a72caa commit 03306fa
Show file tree
Hide file tree
Showing 4 changed files with 108 additions and 4 deletions.
6 changes: 4 additions & 2 deletions eodag/plugins/download/http.py
Original file line number Diff line number Diff line change
Expand Up @@ -195,8 +195,10 @@ def orderDownload(
logger.debug(ordered_message)
product.properties["storageStatus"] = STAGING_STATUS
except RequestException as e:
if e.response and hasattr(e.response, "content"):
error_message = f"{e.response.content.decode('utf-8')} - {e}"
if hasattr(e, "response") and (
content := getattr(e.response, "content", None)
):
error_message = f"{content.decode('utf-8')} - {e}"
else:
error_message = str(e)
logger.warning(
Expand Down
49 changes: 48 additions & 1 deletion eodag/resources/product_types.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3032,6 +3032,40 @@ SATELLITE_CARBON_DIOXIDE:
missionStartDate: "2002-10-01T00:00:00Z"
missionEndDate: "2022-12-31T23:59:59"

SATELLITE_FIRE_BURNED_AREA:
abstract: |
The Burned Area products provide global information of total burned area (BA) at pixel and grid scale. The BA is
identified with the date of first detection of the burned signal in the case of the pixel product, and with the
total BA per grid cell in the case of the grid product. The products were obtained through the analysis of
reflectance changes from medium resolution sensors (Terra MODIS, Sentinel-3 OLCI), supported by the use of MODIS
thermal information. The burned area products also include information related to the land cover that has been
burned, which has been extracted from the Copernicus Climate Change Service (C3S) land cover dataset, thus
assuring consistency between the datasets.
The algorithms for BA retrieval were developed by the University of Alcala (Spain), and processed by Brockmann
Consult GmbH (Germany). Different product versions are available. FireCCI v5.0cds and FireCCI v5.1cds were
developed as part of the Fire ECV Climate Change Initiative Project (Fire CCI) and brokered to C3S, offering the
first global burned area time series at 250m spatial resolution. FireCCI v5.1cds used a more mature algorithm than
the previous version. This algorithm was adapted to Sentinel-3 OLCI data to create the C3S v1.0 burned area
product, extending the BA database to the present.
During July 2020, an error in some files in the version v5.1cds were identified, affecting the files of the grid
product of January 2018, and the pixel and grid products of October, November and December 2019. These errors were
fixed, and a new version, v5.1.1cds, was created for the whole time series, to replace version v5.1cds. The latter
product has been deprecated, but it is temporally kept in the database for transparency and traceability reasons.
Only version v5.1.1cds should be used.
The BA products are useful for researchers studying climate change, as they provide crucial information on burned
biomass, which can be translated to greenhouse gases emissions amongst other contaminants. Burned area is also
useful for land cover change studies, fire management and risk analysis.
platform:
instrument:
platformSerialIdentifier:
processingLevel:
keywords: ECMWF,CDS,C3S,burned
sensorType: ATMOSPHERIC
license: proprietary
title: Fire burned area from 2001 to present derived from satellite observations
missionStartDate: "2001-01-01T00:00:00Z"
missionEndDate: "2022-04-01T23:59:59"

SATELLITE_METHANE:
abstract: |
This dataset provides observations of atmospheric methane (CH4)\namounts obtained from observations collected
Expand Down Expand Up @@ -4641,7 +4675,6 @@ METOP_GOMEL1R03:
title: GOME-2 Level 1B Fundamental Data Record Release 3 - Metop-A and -B
missionStartDate: "2007-04-01T00:00:00Z"
missionEndDate: "2020-08-01T00:00:00Z"

METOP_IASTHR011:
abstract: |
This is the release 1.1 of the climate data record of "all-sky" temperature and humidity profiles and their
Expand Down Expand Up @@ -4710,6 +4743,20 @@ METOP_MHSL1:
license: proprietary
title: MHS Level 1B - Metop - Global
missionStartDate: "2009-03-23T00:00:00Z"
METOP_HIRSL1:
abstract: |
The High Resolution Infrared Sounder (HIRS) operates at 20 channels (19 channels in the infrared and one in the
visible). Its main purpose is to provide input for the vertical temperature and humidity profile retrievals. In
addition, the HIRS pixel resolution serves as the standard grid resolution for all ATOVS level 2 products.
instrument: HIRS
platform: METOP
platformSerialIdentifier: METOP
processingLevel: L1
keywords: METOP,HIRS,SOUNDER,L1,L1B,ATMOSPHERE,HIRxxx1B,HIRSL1
sensorType: SOUNDER
license: proprietary
title: HIRS Level 1B - Metop - Global
missionStartDate: "2009-03-23T00:00:00Z"

# Copernicus Marine
MO_GLOBAL_ANALYSISFORECAST_PHY_001_024:
Expand Down
55 changes: 54 additions & 1 deletion eodag/resources/providers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2824,6 +2824,9 @@
SATELLITE_CARBON_DIOXIDE:
outputs_extension: .zip
extract: true
SATELLITE_FIRE_BURNED_AREA:
outputs_extension: .zip
extract: true
SATELLITE_METHANE:
outputs_extension: .zip
extract: true
Expand Down Expand Up @@ -3306,6 +3309,22 @@
version: '4.0'
metadata_mapping:
<<: *day_month_year
SATELLITE_FIRE_BURNED_AREA:
dataset: satellite-fire-burned-area
format: zip
origin: esa_cci
sensor: modis
variable: grid_variables
version: 5_1_1cds
metadata_mapping:
completionTimeFromAscendingNode:
- |
{{
"year": {_date#interval_to_datetime_dict}["year"],
"month": {_date#interval_to_datetime_dict}["month"],
"nominal_day": {_date#interval_to_datetime_dict}["day"]
}}
- '{$.completionTimeFromAscendingNode#to_iso_date}'
SATELLITE_METHANE:
dataset: satellite-methane
format: zip
Expand Down Expand Up @@ -4456,7 +4475,7 @@
- '{{"time": {time}}}'
- '$.null'
region:
- '{{"region": "{region}"}}'
- '{{"region": {region}}}'
- '$.null'
type:
- '{{"type": "{type}"}}'
Expand Down Expand Up @@ -4530,6 +4549,9 @@
statistic:
- '{{"statistic": {statistic}}}'
- '$.null'
sensor:
- '{{"sensor": "{sensor}"}}'
- '$.null'
products:
S1_SAR_GRD:
productType: EO:ESA:DAT:SENTINEL-1
Expand Down Expand Up @@ -4798,6 +4820,32 @@
- '$.null'
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}", "cacheable": "true", "dataset_id": "EO:ECMWF:DAT:SATELLITE_CARBON_DIOXIDE"}}'
SATELLITE_FIRE_BURNED_AREA:
productType: EO:ECMWF:DAT:SATELLITE_FIRE_BURNED_AREA
origin: c3s
sensor: modis
variable: grid_variables
version: 5_1_1cds
region:
- europe
format: zip
metadata_mapping:
variable:
- '{{"variable": "{variable}"}}'
- '$.null'
version:
- '{{"version": "{version}"}}'
- '$.null'
startTimeFromAscendingNode:
- |
{{
"year": {startTimeFromAscendingNode#to_datetime_dict(list)}["year"],
"month": {startTimeFromAscendingNode#to_datetime_dict(list)}["month"],
"day": {startTimeFromAscendingNode#to_datetime_dict(list)}["day"]
}}
- $.properties.startDate
completionTimeFromAscendingNode: $.properties.endDate
orderLink: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/download?{{"location": "{downloadLink}","product_id":"{id}", "cacheable": "true", "dataset_id": "EO:ECMWF:DAT:SATELLITE_FIRE_BURNED_AREA"}}'
SATELLITE_METHANE:
productType: EO:ECMWF:DAT:SATELLITE_METHANE
processingLevel:
Expand Down Expand Up @@ -4829,6 +4877,9 @@
metadata_mapping:
id: '$.id'
<<: *day_month_year
region:
- '{{"region": "{region}"}}'
- '$.null'
version:
- '{{"version": "{version}"}}'
- '$.null'
Expand Down Expand Up @@ -7134,6 +7185,8 @@
parentIdentifier: EO:EUM:DAT:METOP:IASIL1C-ALL
METOP_MHSL1:
parentIdentifier: EO:EUM:DAT:METOP:MHSL1
METOP_HIRSL1:
parentIdentifier: EO:EUM:DAT:MULT:HIRSL1
GENERIC_PRODUCT_TYPE:
productType: '{productType}'
parentIdentifier: '{parentIdentifier}'
Expand Down
2 changes: 2 additions & 0 deletions tests/units/test_core.py
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@ class TestCore(TestCoreBase):
"METOP_GLB_SST_NC": ["eumetsat_ds"],
"METOP_GOMEL1": ["eumetsat_ds"],
"METOP_GOMEL1R03": ["eumetsat_ds"],
"METOP_HIRSL1": ["eumetsat_ds"],
"METOP_IASTHR011": ["eumetsat_ds"],
"METOP_IASSND02": ["eumetsat_ds"],
"METOP_IASIL1C_ALL": ["eumetsat_ds"],
Expand Down Expand Up @@ -522,6 +523,7 @@ class TestCore(TestCoreBase):
"S5P_L2_O3_TCL": ["cop_dataspace", "creodias", "creodias_s3"],
"S5P_L2_SO2": ["cop_dataspace", "creodias", "creodias_s3", "onda"],
"SATELLITE_CARBON_DIOXIDE": ["cop_cds", "dedl", "wekeo"],
"SATELLITE_FIRE_BURNED_AREA": ["cop_cds", "wekeo"],
"SATELLITE_METHANE": ["cop_cds", "dedl", "wekeo"],
"SATELLITE_SEA_LEVEL_BLACK_SEA": ["cop_cds", "dedl", "wekeo"],
"SATELLITE_SEA_ICE_EDGE_TYPE": ["cop_cds", "dedl", "wekeo"],
Expand Down

0 comments on commit 03306fa

Please sign in to comment.