Repository: CS-SI/eodag
Pull request #902 (2023-10-26 08:42:20)

feat: update wekeo sentinel product types
- adaptations on sentinel 1 product types
- add all available search parameters for all sentinel products
- add sentinel 3 and 6 products available in wekeo and not available in EODAG so far
- add wekeo to support providers list in documentation index page


github-actions[bot]: ## Test Results
    1 files   -     1      1 suites   - 1   1m 11s [:stopwatch:](https://github.com/EnricoMi/publish-unit-test-result-action/blob/v2.11.0/README.md#the-symbols "duration of all tests") - 1m 14s
431 tests ±    0  425 [:heavy_check_mark:](https://github.com/EnricoMi/publish-unit-test-result-action/blob/v2.11.0/README.md#the-symbols "passed tests") +  26  3 [:zzz:](https://github.com/EnricoMi/publish-unit-test-result-action/blob/v2.11.0/README.md#the-symbols "skipped / disabled tests") ±0  3 [:x:](https://github.com/EnricoMi/publish-unit-test-result-action/blob/v2.11.0/README.md#the-symbols "failed tests") +3 
431 runs   - 401  425 [:heavy_check_mark:](https://github.com/EnricoMi/publish-unit-test-result-action/blob/v2.11.0/README.md#the-symbols "passed tests")  - 370  3 [:zzz:](https://github.com/EnricoMi/publish-unit-test-result-action/blob/v2.11.0/README.md#the-symbols "skipped / disabled tests")  - 3  3 [:x:](https://github.com/EnricoMi/publish-unit-test-result-action/blob/v2.11.0/README.md#the-symbols "failed tests") +3 

For more details on these failures, see [this check](https://github.com/CS-SI/eodag/runs/18074113909).

Results for commit bd3761fc. ± Comparison against base commit 19d7d6b2.

<details>
  <summary>This pull request <b>removes</b> 1 and <b>adds</b> 1 tests. <i>Note that renamed tests count towards both.</i></summary>

```
tests.units.test_http_server
```

```
tests.units.test_metadata_mapping.TestMetadataFormatter ‑ test_convert_get_dates_from_string
```
</details>

[test-results]:data:application/gzip;base64,H4sIAEInOmUC/1XMSwrDIBSF4a0Exx0YtWq7meLrgjSJxccodO/VFDQZ/t+BsyPwi0voOc23CaXicw9boso+bDVF67rktjHa65WKMY3IfdDbfyrRDqD8cgEXY4hVcJVYtvHZ4nr5l/F49Onw6POfCevqcw2kLRV8BiMdwVIKrSQoxoEoJhkF4izTHEv6QN8fULI/GAQBAAA=

github-actions[bot]: <strong>Code Coverage (Ubuntu)</strong>

| File | Coverage |   |
| - | :-: | :-: |
| **All files** | `82%` | :white_check_mark: |

_Minimum allowed coverage is `70%`_

<p align="right">Generated by :monkey: cobertura-action against a3c1f97a1b2ca0b94316b74f6b758e0c052e7a65 </p>
github-actions[bot]: <strong>Code Coverage (Windows)</strong>

| File | Coverage |   |
| - | :-: | :-: |
| **All files** | `22%` | :x: |

_Minimum allowed coverage is `70%`_

<p align="right">Generated by :monkey: cobertura-action against a3c1f97a1b2ca0b94316b74f6b758e0c052e7a65 </p>
jlahovnik: > please
> 
>     * add `S1_SAR_OCN`, `S1_SAR_RAW`, `S2_MSI_L2AP`
> 
>     * rename `*_REPROCESSED` product types to `*_BC00X`.
>       Ex: `S3_SRA_1B_SE_REPROCESSED` to `S3_SRA_BS_BC004`

Updated
jlahovnik: > please use standard metadata parameters names: `relativeOrbitNumber` instead of `relorbit`, `platform` instead of `sat`, ...

all changes done
jlahovnik: > Please change properties:
> 
>     * `type` to `providerProductType`
> 
>     * `cycle` to `cycleNumber`

done

Patch:
diff --git a/docs/_static/product_types_information.csv b/docs/_static/product_types_information.csv
index b906bc7f..57d750a2 100644
--- a/docs/_static/product_types_information.csv
+++ b/docs/_static/product_types_information.csv
@@ -66,11 +66,12 @@ PLD_PAN,Pleiades Panchromatic (Pan),PHR,PLEIADES,"P1A,P1B",PRIMARY,"PHR,PLEIADES
 PLD_PANSHARPENED,Pleiades Pansharpened (Pan+XS),PHR,PLEIADES,"P1A,P1B",PRIMARY,"PHR,PLEIADES,P1A,P1B,PRIMARY,PLD,PANSHARPENED,Pan,Xs",OPTICAL,proprietary,Pleiades Pansharpened,2011-12-17T00:00:00Z,,,,,,,,,,,,,,,,,available,,,
 PLD_XS,Pleiades Multispectral (XS),PHR,PLEIADES,"P1A,P1B",PRIMARY,"PHR,PLEIADES,P1A,P1B,PRIMARY,PLD,XS,Multispectral",OPTICAL,proprietary,Pleiades Multispectral,2011-12-17T00:00:00Z,,,,,,,,,,,,,,,,,available,,,
 S1_SAR_GRD,"Level-1 Ground Range Detected (GRD) products consist of focused SAR data that has been detected, multi-looked and projected to ground range using an Earth ellipsoid model. Phase information is lost. The resulting product has approximately square spatial resolution pixels and square pixel spacing with reduced speckle at the cost of worse spatial resolution. GRD products can be in one of three resolutions: |   Full Resolution (FR),   High Resolution (HR),   Medium Resolution (MR). The resolution is dependent upon the amount of multi-looking performed. Level-1 GRD products are available in MR and HR for IW and EW modes, MR for WV mode and MR, HR and FR for SM mode. SAFE formatted product, see https://sentinel.esa.int/web/sentinel/user-guides/sentinel-1-sar/data-formats/safe-specification ",SAR,SENTINEL1,"S1A,S1B",L1,"SAR,SENTINEL,SENTINEL1,S1,S1A,S1B,L1,GRD,SAFE",RADAR,proprietary,SENTINEL1 Level-1 Ground Range Detected,2014-04-03T00:00:00Z,available,available,,,available,available,,,,,,,available,available,available,available,,,,available
-S1_SAR_OCN,"Level-2 OCN products include components for Ocean Swell spectra (OSW) providing continuity with ERS and ASAR WV and two new components: Ocean Wind Fields (OWI) and Surface Radial Velocities (RVL). The OSW is a two-dimensional ocean surface swell spectrum and includes an estimate of the wind speed and direction per swell spectrum. The OSW is generated from Stripmap and Wave modes only. For Stripmap mode, there are multiple spectra derived from internally generated Level-1 SLC images. For Wave mode, there is one spectrum per vignette. The OWI is a ground range gridded estimate of the surface wind speed and direction at 10 m above the surface derived from internally generated Level-1 GRD images of SM, IW or EW modes. The RVL is a ground range gridded difference between the measured Level-2 Doppler grid and the Level-1 calculated geometrical Doppler. SAFE formatted product, see https://sentinel.esa.int/web/sentinel/user-guides/sentinel-1-sar/data-formats/safe-specification ",SAR,SENTINEL1,"S1A,S1B",L2,"SAR,SENTINEL,SENTINEL1,S1,S1A,S1B,L2,OCN,SAFE",RADAR,proprietary,SENTINEL1 Level-2 OCN,2014-04-03T00:00:00Z,,,,,available,available,,,,,,,available,available,,available,,,,
-S1_SAR_RAW,"The SAR Level-0 products consist of the sequence of Flexible Dynamic Block Adaptive Quantization (FDBAQ) compressed unfocused SAR raw data. For the data to be usable, it will need to be decompressed and processed using a SAR processor. SAFE formatted product, see https://sentinel.esa.int/web/sentinel/user-guides/sentinel-1-sar/data-formats/safe-specification ",SAR,SENTINEL1,"S1A,S1B",L0,"SAR,SENTINEL,SENTINEL1,S1,S1A,S1B,L0,RAW,SAFE",RADAR,proprietary,SENTINEL1 SAR Level-0,2014-04-03T00:00:00Z,,,,,available,available,,,,,,,available,,,,,,,
+S1_SAR_OCN,"Level-2 OCN products include components for Ocean Swell spectra (OSW) providing continuity with ERS and ASAR WV and two new components: Ocean Wind Fields (OWI) and Surface Radial Velocities (RVL). The OSW is a two-dimensional ocean surface swell spectrum and includes an estimate of the wind speed and direction per swell spectrum. The OSW is generated from Stripmap and Wave modes only. For Stripmap mode, there are multiple spectra derived from internally generated Level-1 SLC images. For Wave mode, there is one spectrum per vignette. The OWI is a ground range gridded estimate of the surface wind speed and direction at 10 m above the surface derived from internally generated Level-1 GRD images of SM, IW or EW modes. The RVL is a ground range gridded difference between the measured Level-2 Doppler grid and the Level-1 calculated geometrical Doppler. SAFE formatted product, see https://sentinel.esa.int/web/sentinel/user-guides/sentinel-1-sar/data-formats/safe-specification ",SAR,SENTINEL1,"S1A,S1B",L2,"SAR,SENTINEL,SENTINEL1,S1,S1A,S1B,L2,OCN,SAFE",RADAR,proprietary,SENTINEL1 Level-2 OCN,2014-04-03T00:00:00Z,,,,,available,available,,,,,,,available,available,,available,,,,available
+S1_SAR_RAW,"The SAR Level-0 products consist of the sequence of Flexible Dynamic Block Adaptive Quantization (FDBAQ) compressed unfocused SAR raw data. For the data to be usable, it will need to be decompressed and processed using a SAR processor. SAFE formatted product, see https://sentinel.esa.int/web/sentinel/user-guides/sentinel-1-sar/data-formats/safe-specification ",SAR,SENTINEL1,"S1A,S1B",L0,"SAR,SENTINEL,SENTINEL1,S1,S1A,S1B,L0,RAW,SAFE",RADAR,proprietary,SENTINEL1 SAR Level-0,2014-04-03T00:00:00Z,,,,,available,available,,,,,,,available,,,,,,,available
 S1_SAR_SLC,"Level-1 Single Look Complex (SLC) products consist of focused SAR data geo-referenced using orbit and attitude data from the satellite and provided in zero-Doppler slant-range geometry. The products include a single look in each dimension using the full transmit signal bandwidth and consist of complex samples preserving the phase information. SAFE formatted product, see https://sentinel.esa.int/web/sentinel/user-guides/sentinel-1-sar/data-formats/safe-specification ",SAR,SENTINEL1,"S1A,S1B",L1,"SAR,SENTINEL,SENTINEL1,S1,S1A,S1B,L1,SLC,SAFE",RADAR,proprietary,SENTINEL1 Level-1 Single Look Complex,2014-04-03T00:00:00Z,,,,,available,available,,,,,,,available,available,,available,,,,available
 S2_MSI_L1C,"The Level-1C product is composed of 100x100 km2 tiles (ortho-images in UTM/WGS84 projection). It results from using a Digital Elevation Model (DEM) to project the image in cartographic geometry. Per-pixel radiometric measurements are provided in Top Of Atmosphere (TOA) reflectances along with the parameters to transform them into radiances. Level-1C products are resampled with a constant Ground Sampling Distance (GSD) of 10, 20 and 60 meters depending on the native resolution of the different spectral bands. In Level-1C  products, pixel coordinates refer to the upper left corner of the pixel. Level-1C products will additionally include Cloud Masks and ECMWF data (total column of ozone, total column of water vapour and mean sea level pressure). SAFE formatted product, see https://sentinel.esa.int/web/sentinel/user-guides/sentinel-2-msi/data-formats ",MSI,SENTINEL2,"S2A,S2B",L1,"MSI,SENTINEL,SENTINEL2,S2,S2A,S2B,L1,L1C,SAFE",OPTICAL,proprietary,SENTINEL2 Level-1C,2015-06-23T00:00:00Z,available,available,,,available,available,available,,available,,,,available,available,,available,,available,,available
 S2_MSI_L2A,"The Level-2A product provides Bottom Of Atmosphere (BOA) reflectance images derived from the associated Level-1C products. Each Level-2A product is composed of 100x100 km2 tiles in cartographic geometry (UTM/WGS84 projection). SAFE formatted product, see https://sentinel.esa.int/web/sentinel/user-guides/sentinel-2-msi/data-formats ",MSI,SENTINEL2,"S2A,S2B",L2,"MSI,SENTINEL,SENTINEL2,S2,S2A,S2B,L2,L2A,SAFE",OPTICAL,proprietary,SENTINEL2 Level-2A,2018-03-26T00:00:00Z,available,available,,,available,available,available,,,,,,available,available,available,available,,,,available
+S2_MSI_L2AP,"The Level-2A product provides Bottom Of Atmosphere (BOA) reflectance images derived from the associated Level-1C products. Each Level-2A product is composed of 100x100 km2 tiles in cartographic geometry (UTM/WGS84 projection). SAFE formatted product, see https://sentinel.esa.int/web/sentinel/user-guides/sentinel-2-msi/data-formats. Level-2AP are the pilot products of Level-2A product generated by ESA until March 2018. After March, they are operational products ",MSI,SENTINEL2,"S2A,S2B",L2,"MSI,SENTINEL,SENTINEL2,S2,S2A,S2B,L2,L2A,SAFE, pilot",OPTICAL,proprietary,SENTINEL2 Level-2A pilot,2017-05-23T00:00:00Z,,,,,,,,,,,,,,,,,,,,available
 S2_MSI_L2A_COG,"The Level-2A product provides Bottom Of Atmosphere (BOA) reflectance images derived from the associated Level-1C products. Each Level-2A product is composed of 100x100 km2 tiles in cartographic geometry (UTM/WGS84 projection). Product containing Cloud Optimized GeoTIFF images, without SAFE formatting. ",MSI,SENTINEL2,"S2A,S2B",L2,"MSI,SENTINEL,SENTINEL2,S2,S2A,S2B,L2,L2A,COG",OPTICAL,proprietary,SENTINEL2 Level-2A,2015-06-23T00:00:00Z,,,,,,,,available,,,,,,,,,,,,
 S2_MSI_L2A_MAJA,"The level 2A products correct the data for atmospheric effects and detect the clouds and their shadows using MAJA. MAJA uses MUSCATE processing center at CNES, in the framework of THEIA land data center. Sentinel-2 level 1C data are downloaded from PEPS. The full description of the product format is available at https://theia.cnes.fr/atdistrib/documents/PSC-NT-411-0362-CNES_01_00_SENTINEL-2A_L2A_Products_Description.pdf ",MSI,SENTINEL2,"S2A,S2B",L2,"MSI,SENTINEL,SENTINEL2,S2,S2A,S2B,L2,L2A,MAJA",OPTICAL,proprietary,SENTINEL2 Level-2A,2015-06-23T00:00:00Z,,,,,,,,,,,,,,,,,available,,,
 S2_MSI_L2B_MAJA_SNOW,The Theia snow product is derived from Sentinel-2 L2A images generated by Theia. It  indicates the snow presence or absence on the land surface every fifth day if there is no cloud. The product is distributed by Theia as a raster file (8 bits GeoTIFF) of 20 m resolution and a vector file (Shapefile polygons). More details about the snow products description are available at http://www.cesbio.ups-tlse.fr/multitemp/?page_id=10748#en ,MSI,SENTINEL2,"S2A,S2B",L2,"MSI,MAJA,SENTINEL,sentinel2,S2,S2A,S2B,L2,L2B,SNOW",OPTICAL,proprietary,SENTINEL2 snow product,2015-06-23T00:00:00Z,,,,,,,,,,,,,,,,,available,,,
@@ -79,26 +80,35 @@ S2_MSI_L3A_WASP,"The Level-3A product provides a monthly synthesis of surface re
 S3_EFR,"OLCI (Ocean and Land Colour Instrument) Full resolution: 300m at nadir. Level 1 products are calibrated Top Of Atmosphere radiance values at OLCI 21 spectral bands. Radiances are computed from the instrument digital counts by applying geo-referencing, radiometric processing (non-linearity correction, smear correction, dark offset correction, absolute gain calibration adjusted for gain evolution with time), and stray-light correction for straylight effects in OLCI camera's spectrometer and ground imager. Additionally, spatial resampling of OLCI pixels to the 'ideal' instrument grid, initial pixel classification, and annotation at tie points with auxiliary meteorological data and acquisition geometry are provided. The radiance products are accompanied by error estimate products, however the error values are currently not available. - All Sentinel-3 NRT products are available at pick-up point in less than 3h. - All Sentinel-3 Non Time Critical (NTC) products are available at pick-up point in less than 30 days. Sentinel-3 is part of a series of Sentinel satellites, under the umbrella of the EU Copernicus programme. ",OLCI,SENTINEL3,"S3A,S3B",L1,"OLCI,SENTINEL,SENTINEL3,S3,S3A,S3B,L1,EFR",OPTICAL,proprietary,SENTINEL3 EFR,2016-02-16T00:00:00Z,,,,,available,available,,,,,,,available,,,available,,,,available
 S3_ERR,"OLCI (Ocean and Land Colour Instrument) Reduced resolution: 1200m at nadir. All Sentinel-3 NRT products are available at pick-up point in less than 3h. Level 1 products are calibrated Top Of Atmosphere radiance values at OLCI 21 spectral bands. Radiances are computed from the instrument digital counts by applying geo-referencing, radiometric processing (non-linearity correction, smear correction, dark offset correction, absolute gain calibration adjusted for gain evolution with time), and stray-light correction for straylight effects in OLCI camera's spectrometer and ground imager. Additionally, spatial resampling of OLCI pixels to the 'ideal' instrument grid, initial pixel classification, and annotation at tie points with auxiliary meteorological data and acquisition geometry are provided. The radiance products are accompanied by error estimate products, however the error values are currently not available. - All Sentinel-3 NRT products are available at pick-up point in less than 3h - All Sentinel-3 Non Time Critical (NTC) products are available at pick-up point in less than 30 days Sentinel-3 is part of a series of Sentinel satellites, under the umbrella of the EU Copernicus programme. ",OLCI,SENTINEL3,"S3A,S3B",L1,"OLCI,SENTINEL,SENTINEL3,S3,S3A,S3B,L1,ERR",OPTICAL,proprietary,SENTINEL3 ERR,2016-02-16T00:00:00Z,,,,,available,available,,,,,,,available,,,available,,,,available
 S3_LAN,LAN or SR_2_LAN___ (peps),SRAL,SENTINEL3,"S3A,S3B",L2,"SRAL,SENTINEL,SENTINEL3,S3,S3A,S3B,L2,LAN",RADAR,proprietary,SENTINEL3 SRAL Level-2 LAN,2016-02-16T00:00:00Z,,,,,available,available,,,,,,,available,,,available,,,,available
-S3_OLCI_L2LFR,"The OLCI Level-2 Water Full Resolution (OL_2_WFR) products contain water and atmospheric geophysical products at Full resolution with a spatial sampling of approximately 300 m. The products are assumed to be computed in Near Real Time (NRT) (i.e. delivered to users less than 3 hours after acquisition), in Non-Time Critical (NTC) (i.e. within 1 month after acquisition) or in re-processed NTC. Details at https://sentinel.esa.int/web/sentinel/user-guides/sentinel-3-olci/product-types/level-2-water ",OLCI,SENTINEL3,"S3A,S3B",L2,"OLCI,SENTINEL,SENTINEL3,S3,S3A,S3B,L2,L2WFR,WFR",OPTICAL,proprietary,SENTINEL3 OLCI Level-2 Water Full Resolution,2016-02-16T00:00:00Z,,,,,available,available,,,,,,,available,,,available,,,,available
+S3_OLCI_L2LFR,"The OLCI Level-2 Land Full Resolution (OL_2_LFR) products contain land and atmospheric geophysical products at Full resolution with a spatial sampling of approximately 300 m. The products are assumed to be computed in Near Real Time (NRT) (i.e. delivered to users less than 3 hours after acquisition), in Non-Time Critical (NTC) (i.e. within 1 month after acquisition) or in re-processed NTC. Details at https://sentinel.esa.int/web/sentinel/user-guides/sentinel-3-olci/product-types/level-2-land ",OLCI,SENTINEL3,"S3A,S3B",L2,"OLCI,SENTINEL,SENTINEL3,S3,S3A,S3B,L2,L2LFR,LFR",OPTICAL,proprietary,SENTINEL3 OLCI Level-2 Land Full Resolution,2016-02-16T00:00:00Z,,,,,available,available,,,,,,,available,,,available,,,,available
 S3_OLCI_L2LRR,"The OLCI Level-2 Land Reduced Resolution (OL_2_LRR) products contain land and atmospheric geophysical products at Reduced resolution with a spatial sampling of approximately 1.2 km. The products are assumed to be computed in Near Real Time (NRT) (i.e. delivered to users less than 3 hours after acquisition), in Non-Time Critical (NTC) (i.e. within 1 month after acquisition) or in re-processed NTC. Details at https://sentinel.esa.int/web/sentinel/user-guides/sentinel-3-olci/product-types/level-2-land ",OLCI,SENTINEL3,"S3A,S3B",L2,"OLCI,SENTINEL,SENTINEL3,S3,S3A,S3B,L2,L2LRR,LRR",OPTICAL,proprietary,SENTINEL3 OLCI Level-2 Land Reduced Resolution,2016-02-16T00:00:00Z,,,,,available,available,,,,,,,available,,,available,,,,available
-S3_OLCI_L2WFR,"The OLCI Level-2 Water Full Resolution (OL_2_WFR) products contain water and atmospheric geophysical products at Full resolution with a spatial sampling of approximately 1.2 km. The products are assumed to be computed in Near Real Time (NRT) (i.e. delivered to users less than 3 hours after acquisition), in Non-Time Critical (NTC) (i.e. within 1 month after acquisition) or in re-processed NTC. Details at https://sentinel.esa.int/web/sentinel/user-guides/sentinel-3-olci/product-types/level-2-water ",OLCI,SENTINEL3,"S3A,S3B",L2,"OLCI,SENTINEL,SENTINEL3,S3,S3A,S3B,L2,L2WFR,WFR",OPTICAL,proprietary,SENTINEL3 OLCI Level-2 Water Full Resolution,2016-02-16T00:00:00Z,,,,,available,available,,,,,,,available,,,available,,,,available
+S3_OLCI_L2WFR,"The OLCI Level-2 Water Full Resolution (OL_2_WFR) products contain water and atmospheric geophysical products at Full resolution with a spatial sampling of approximately 300 m. The products are assumed to be computed in Near Real Time (NRT) (i.e. delivered to users less than 3 hours after acquisition), in Non-Time Critical (NTC) (i.e. within 1 month after acquisition) or in re-processed NTC. Details at https://sentinel.esa.int/web/sentinel/user-guides/sentinel-3-olci/product-types/level-2-water ",OLCI,SENTINEL3,"S3A,S3B",L2,"OLCI,SENTINEL,SENTINEL3,S3,S3A,S3B,L2,L2WFR,WFR",OPTICAL,proprietary,SENTINEL3 OLCI Level-2 Water Full Resolution,2016-02-16T00:00:00Z,,,,,available,available,,,,,,,available,,,available,,,,available
+S3_OLCI_L2WFR_BC003,"OLCI Level 2 Marine products provide spectral information on the colour of the oceans (water reflectances). These radiometric products are used to estimate geophysical parameters e.g. estimates of phytoplankton biomass through determining the Chlorophyll-a (Chl) concentration. In coastal areas, they also allow monitoring of the sediment load via the Total Suspended Matter (TSM) product. Full resolution products are at a nominal 300m resolution. This collection contains reprocessed data from baseline collection 003. Operational data can be found in the corresponding collection. Details at https://sentinel.esa.int/web/sentinel/user-guides/sentinel-3-olci/product-types/level-2-water ",OLCI,SENTINEL3,"S3A,S3B",L2,"OLCI,SENTINEL,SENTINEL3,S3,S3A,S3B,L2,L2WFR,WFR,REPROCESSED,BC003",OPTICAL,proprietary,SENTINEL3 OLCI Level-2 Water Full Resolution Reprocessed from BC003,2016-02-16T00:00:00Z,,,,,,,,,,,,,,,,,,,,available
 S3_OLCI_L2WRR,"The OLCI Level-2 Water Reduced Resolution (OL_2_WRR) products contain water and atmospheric geophysical products at Reduced resolution with a spatial sampling of approximately 1.2 km. The products are assumed to be computed in Near Real Time (NRT) (i.e. delivered to users less than 3 hours after acquisition), in Non-Time Critical (NTC) (i.e. within 1 month after acquisition) or in re-processed NTC. Details at https://sentinel.esa.int/web/sentinel/user-guides/sentinel-3-olci/product-types/level-2-water ",OLCI,SENTINEL3,"S3A,S3B",L2,"OLCI,SENTINEL,SENTINEL3,S3,S3A,S3B,L2,L2WRR,WRR",OPTICAL,proprietary,SENTINEL3 OLCI Level-2 Water Reduced Resolution,2016-02-16T00:00:00Z,,,,,available,available,,,,,,,available,,,available,,,,available
+S3_OLCI_L2WRR_BC003,"OLCI Level 2 Marine products provide spectral information on the colour of the oceans (water reflectances). These radiometric products are used to estimate geophysical parameters e.g. estimates of phytoplankton biomass through determining the Chlorophyll-a (Chl) concentration. In coastal areas, they also allow monitoring of the sediment load via the Total Suspended Matter (TSM) product. Reduced resolution products are at a nominal 1km resolution. This collection contains reprocessed data from baseline collection 003. Operational data can be found in the corresponding collection. ",OLCI,SENTINEL3,"S3A,S3B",L2,"OLCI,SENTINEL,SENTINEL3,S3,S3A,S3B,L2,L2WRR,WRR,REPROCESSED,BC003",OPTICAL,proprietary,SENTINEL3 OLCI Level-2 Water Reduced Resolution Reprocessed from BC003,2016-02-16T00:00:00Z,,,,,,,,,,,,,,,,,,,,available
+S3_OLCI_L4BALTIC,"Baltic Sea Surface Ocean Colour Plankton from Sentinel-3 OLCI L4 monthly observations For the Baltic Sea Ocean Satellite Observations, the Italian National Research Council (CNR – Rome, Italy), is providing Bio-Geo_Chemical (BGC) regional datasets: * ''plankton'' with the phytoplankton chlorophyll concentration (CHL) evaluated via region-specific neural network (Brando et al. 2021) Upstreams: OLCI-S3A & S3B Temporal resolution: monthly Spatial resolution: 300 meters To find this product in the catalogue, use the search keyword """"OCEANCOLOUR_BAL_BGC_L4_NRT"""". DOI (product) : https://doi.org/10.48670/moi-00295 ",OLCI,SENTINEL3,"S3A,S3B",L4,"OLCI,SENTINEL,SENTINEL3,S3,S3A,S3B,L4,BGC,CHL,BALTIC",OPTICAL,proprietary,SENTINEL3 OLCI Baltic Sea Surface Ocean Colour Plankton,2023-04-10T00:00:00Z,,,,,,,,,,,,,,,,,,,,available
 S3_RAC,Sentinel 3 OLCI products output during Radiometric Calibration mode ,OLCI,SENTINEL3,"S3A,S3B",L1,"OLCI,SENTINEL,SENTINEL3,S3,S3A,S3B,L1,L2,RAC",OPTICAL,proprietary,SENTINEL3 RAC,2016-02-16T00:00:00Z,,,,,,,,,,,,,,,,available,,,,
 S3_SLSTR_L1RBT,"SLSTR Level-1 observation mode products consisting of full resolution, geolocated, co-located nadir and along track view, Top of Atmosphere (TOA) brightness temperatures (in the case of thermal IR channels) or radiances (in the case of visible, NIR and SWIR channels) from all SLSTR channels, and quality flags, pixel classification information and meteorological annotations ",SLSTR,SENTINEL3,"S3A,S3B",L1,"SLSTR,SENTINEL,SENTINEL3,S3,S3A,S3B,L1,L1RBT,RBT",ATMOSPHERIC,proprietary,SENTINEL3 SLSTR Level-1,2016-02-16T00:00:00Z,,,,,available,available,,,,,,,available,,,available,,,,available
+S3_SLSTR_L1RBT_BC004,"SLSTR Level 1B Radiances and Brightness Temperatures (version BC004) - Sentinel 3 - Reprocessed The SLSTR level 1 products contain: the radiances of the 6 visible (VIS), Near Infra-Red (NIR) and Short Wave Infra-Red (SWIR) bands (on the A and B stripe grids); the Brightness Temperature (BT) for the 3 Thermal Infra-Red (TIR) bands; the BT for the 2 Fire (FIR) bands. Resolution: 1km at nadir (TIR), 500m (VIS). All are provided for both the oblique and nadir view. These measurements are accompanied with grid and time information, quality flags, error estimates and meteorological auxiliary data. Sentinel-3 is part of a series of Sentinel satellites, under the umbrella of the EU Copernicus programme. This collection contains reprocessed data from baseline collection 004. Operational data can be found in the corresponding collection. ",SLSTR,SENTINEL3,"S3A,S3B",L1,"SLSTR,SENTINEL,SENTINEL3,S3,S3A,S3B,L1,L1RBT,RBT,VIS,NIR,SWIR,BT,TIR,FIR,Reprocessed,BC004",ATMOSPHERIC,proprietary,SENTINEL3 SLSTR Level-1 RBT - Reprocessed from BC004,2018-05-09T00:00:00Z,,,,,,,,,,,,,,,,,,,,available
 S3_SLSTR_L2,"The SLSTR Level-2 products are generated in five different types: 1. SL_2_WCT, including the Sea Surface Temperature for single and dual view, for 2 or 3 channels (internal product only), 2. SL_2_WST, including the Level-2P Sea surface temperature (provided to the users), 3. SL_2_LST, including the Land Surface Temperature parameters (provided to the users), 4. SL_2_FRP, including the Fire Radiative Power parameters (provided to the users), 5.SL_2_AOD, including the Aerosol Optical Depth parameters (provided to the users). The Level-2 product are organized in packages composed of one manifest file and several measurement and annotation data files (between 2 and 21 files depending on the package). The manifest file is in XML format and gathers general information concerning product and processing. The measurement and annotation data files are in netCDF 4 format, and include dimensions, variables and associated attributes. Regarding the measurement files: one measurement file, providing the land surface temperature, associated uncertainties and other supporting fields, is included in the SL_2_LST packet. The annotation data files are generated from the annotation files included in the SL_1RBT package and their format is identical to the files in the Level-1 packet.The SL_2_LST packet contains 10 annotation files, providing the same parameters as in SL_2_WCT and, in addition, some vegetation parameters. ",SLSTR,SENTINEL3,"S3A,S3B",L2,"SLSTR,SENTINEL,SENTINEL3,S3,S3A,S3B,L2,L2FRP,FRP,L2WCT,WCT,L2WST,WST,L2AOD,AOD",ATMOSPHERIC,proprietary,SENTINEL3 SLSTR Level-2,2017-07-05T00:00:00Z,,,,,,,,,,,,,,,,,,,,available
 S3_SLSTR_L2AOD,"The Copernicus NRT S3 AOD processor quantifies the abundance of aerosol particles and monitors their global distribution and long-range transport, at the scale of 9.5 x 9.5 km2. All observations are made available in less than three hours from the SLSTR observation sensing time. It is only applicable during daytime. NOTE: The SLSTR L2 AOD product is generated by EUMETSAT in NRT only. An offline (NTC) AOD product is generated from SYN data by ESA, exploiting the synergy between the SLSTR and OLCI instruments. ",SLSTR,SENTINEL3,"S3A,S3B",L2,"SLSTR,SENTINEL,SENTINEL3,S3,S3A,S3B,L2,L2AOD,AOD",ATMOSPHERIC,proprietary,SENTINEL3 SLSTR Level-2 AOD,2016-02-16T00:00:00Z,,,,,available,available,,,,,,,,,,available,,,,available
 S3_SLSTR_L2FRP,"The SLSTR Level-2 FRP product is providing one measurement data file, FRP_in.nc, with Fire Radiative Power (FRP) values and associated parameters generated for each fire detected over land and projected on the SLSTR 1 km grid. The fire detection is based on a mixed thermal band, combining S7 radiometric measurements and, for pixels associated with a saturated value of S7 (i.e. above 311 K), F1 radiometric measurements. ",SLSTR,SENTINEL3,"S3A,S3B",L2,"SLSTR,SENTINEL,SENTINEL3,S3,S3A,S3B,L2,L2FRP,FRP",ATMOSPHERIC,proprietary,SENTINEL3 SLSTR Level-2 FRP,2016-02-16T00:00:00Z,,,,,available,available,,,,,,,available,,,available,,,,available
 S3_SLSTR_L2LST,The SLSTR Level-2 LST product provides land surface parameters generated on the wide 1 km measurement grid. It contains measurement file with Land Surface Temperature (LST) values with associated parameters (LST parameters are computed and provided for each pixel (re-gridded or orphan) included in the 1 km measurement grid) ,SLSTR,SENTINEL3,"S3A,S3B",L2,"SLSTR,SENTINEL,SENTINEL3,S3,S3A,S3B,L2,L2LST,LST",ATMOSPHERIC,proprietary,SENTINEL3 SLSTR Level-2 LST,2016-02-16T00:00:00Z,,,,,available,available,,,,,,,available,,,available,,,,
 S3_SLSTR_L2WST,The SLSTR Level-2 WST product provides water surface parameters generated on the wide 1 km measurement grid. It contains measurement file with Water Surface Temperature (WST) values with associated parameters (WST parameters are computed and provided for each pixel (re-gridded or orphan) included in the 1 km measurement grid) ,SLSTR,SENTINEL3,"S3A,S3B",L2,"SLSTR,SENTINEL,SENTINEL3,S3,S3A,S3B,L2,L2WST,WST",ATMOSPHERIC,proprietary,SENTINEL3 SLSTR Level-2 WST,2016-02-16T00:00:00Z,,,,,available,available,,,,,,,available,,,available,,,,available
+S3_SLSTR_L2WST_BC003,"The SLSTR SST has a spatial resolution of 1km at nadir. Skin Sea Surface Temperature following the GHRSST L2P GDS2 format specification, see https://www.ghrsst.org/ . Sentinel-3 is part of a series of Sentinel satellites, under the umbrella of the EU Copernicus programme. This collection contains reprocessed data from baseline collection 003. Operational data can be found in the corresponding collection. ",SLSTR,SENTINEL3,"S3A,S3B",L2,"SLSTR,SENTINEL,SENTINEL3,S3,S3A,S3B,L2,L2WST,WST,REPROCESSED,BC003",ATMOSPHERIC,proprietary,SENTINEL3 SLSTR Level-2 WST Reprocessed from BC003,2016-04-18T00:00:00Z,,,,,,,,,,,,,,,,,,,,available
 S3_SRA,"SRAL Level 1B: Complex echoes (In-phase (I) and Quadrature (Q)) for the Low Resolution Mode (LRM) and/or Synthetic Aperture Radar (SAR) mode both for C Band and Ku band. When the altimeter is in SAR mode, this product also contains the so-called Pseudo LRM (PLRM) echoes. - All Sentinel-3 Near Real Time (NRT) products are available at pick-up point in less than 3h. - All Sentinel-3 Non Time Critical (NTC) products are available at pick-up point in less than 30 days. - All Sentinel-3 Short Time Critical (STC) products are available at pick-up point in less than 48 hours. Sentinel-3 is part of a series of Sentinel satellites, under the umbrella of the EU Copernicus programme. ",SRAL,SENTINEL3,"S3A,S3B",L1,"SRA,SRAL,SENTINEL,SENTINEL3,S3,S3A,S3B,L1",RADAR,proprietary,SENTINEL3 SRAL Level-1,2016-02-16T00:00:00Z,,,,,available,available,,,,,,,available,,,available,,,,available
+S3_SRA_1A_BC004,"SRAL Level 1A Unpacked L0 Complex Echoes (version BC004) - Sentinel-3 - Reprocessed Fundamental science and engineering product development supporting operational users. This product is most relevant to SAR processing specialists allowing fundamental studies on SAR processing such as Doppler beam formation and for calibration studies using ground-based Transponders. Sentinel-3 is part of a series of Sentinel satellites, under the umbrella of the EU Copernicus programme. This collection contains reprocessed data from baseline collection 004. Operational data can be found in the corresponding collection. ",SRAL,SENTINEL3,"S3A,S3B",L1A,"SRA,SRAL,SENTINEL,SENTINEL3,S3,S3A,S3B,L1,L1A,REPROCESSED,BC004",RADAR,proprietary,SENTINEL3 SRAL Level-1A Unpacked - Reprocessed from BC004,2016-03-01T00:00:00Z,,,,,,,,,,,,,,,,,,,,available
+S3_SRA_1B_BC004,"SRAL Level 1B (version BC004) - Sentinel-3 - Reprocessed SRAL Level 1B: Complex echoes (In-phase (I) and Quadrature (Q)) for the Low Resolution Mode (LRM) and/or Synthetic Aperture Radar (SAR) mode both for C Band and Ku band. When the altimeter is in SAR mode, this product also contains the so-called Pseudo LRM (PLRM) echoes. Sentinel-3 is part of a series of Sentinel satellites, under the umbrella of the EU Copernicus programme. This collection contains reprocessed data from baseline collection 004. Operational data can be found in the corresponding collection. ",SRAL,SENTINEL3,"S3A,S3B",L1B,"SRA,SRAL,SENTINEL,SENTINEL3,S3,S3A,S3B,L1,L1B,REPROCESSED,BC004",RADAR,proprietary,SENTINEL3 SRAL Level-1B - Reprocessed from BC004,2016-03-01T00:00:00Z,,,,,,,,,,,,,,,,,,,,available
 S3_SRA_A,"A Level 1A SRAL product contains one ""measurement data file"" containing the L1A measurements parameters: ECHO_SAR_Ku: L1A Tracking measurements (sorted and calibrated) in SAR mode - Ku-band (80-Hz) ECHO_PLRM: L1A Tracking measurements (sorted and calibrated) in pseudo-LRM mode - Ku and C bands (80-Hz) ",SRAL,SENTINEL3,"S3A,S3B",L1,"SRA,SRAL,SENTINEL,SENTINEL3,S3,S3A,S3B,L1",RADAR,proprietary,SENTINEL3 SRAL Level-1 SRA_A,2016-02-16T00:00:00Z,,,,,available,available,,,,,,,available,,,available,,,,available
 S3_SRA_BS,"A Level 1B-S SRAL product contains one ""measurement data file"" containing the L1b measurements parameters: ECHO_SAR_Ku : L1b Tracking measurements in SAR mode - Ku band (20-Hz) as defined in the L1b MEAS product               completed with SAR expert information ECHO_PLRM : L1b Tracking measurements in pseudo-LRM mode - Ku and C bands (20-Hz) as defined in the L1b             MEAS product ",SRAL,SENTINEL3,"S3A,S3B",L1,"SRA,SRAL,SENTINEL,SENTINEL3,S3,S3A,S3B,L1",RADAR,proprietary,SENTINEL3 SRAL Level-1 SRA_BS,2016-02-16T00:00:00Z,,,,,available,available,,,,,,,available,,,available,,,,available
+S3_SRA_BS_BC004,"SRAL Level 1B Stack Echoes (version BC004) - Sentinel-3 - Reprocessed SRAL Level 1B: Complex echoes (In-phase (I) and Quadrature (Q)) for the Low Resolution Mode (LRM) and/or Synthetic Aperture Radar (SAR) mode both for C Band and Ku band. When the altimeter is in SAR mode, this product also contains the so-called Pseudo LRM (PLRM) echoes. Complex (In-phase and Quadrature) echoes (I's and Q;s) after slant/Doppler range correction. This product is most relevant to geophysical retrieval algorithm developers (over ocean, land and ice surfaces), surface characterisations studies (e.g. impact of sea state bias, wave directional effects etc) and Quality Control systems. Sentinel-3 is part of a series of Sentinel satellites, under the umbrella of the EU Copernicus programme. This collection contains reprocessed data from baseline collection 004. Operational data can be found in the corresponding collection. ",SRAL,SENTINEL3,"S3A,S3B",L1B,"SRA,SRAL,SENTINEL,SENTINEL3,S3,S3A,S3B,L1,L1B,REPROCESSED,STACK,ECHOES,BC004",RADAR,proprietary,SENTINEL3 SRAL Level-1B Stack Echoes - Reprocessed from BC004,2016-03-01T00:00:00Z,,,,,,,,,,,,,,,,,,,,available
 S3_SY_AOD,"The Level-2 SYN AOD product (SY_2_AOD) is produced by a dedicated processor including the whole SYN L1 processing module and a global synergy level 2 processing module retrieving, over land and sea, aerosol optical thickness. The resolution of this product is wider than classic S3 products, as the dataset are provided on a 4.5 km² resolution ",SYNERGY,SENTINEL3,"S3A,S3B",L2,"SYNERGY,SY,SENTINEL,SENTINEL3,S3,S3A,S3B,L2,AOD","OPTICAL,RADAR",proprietary,SENTINEL3 SYNERGY Level-2 AOD,2016-02-16T00:00:00Z,,,,,available,available,,,,,,,available,,,available,,,,
 S3_SY_SYN,"The Level-2 SYN product (SY_2_SYN) is produced by the Synergy Level-1/2 SDR software and contains surface reflectance and aerosol parameters over land. All measurement datasets are provided on the OLCI image grid, similar to the one included in the OLCI L1b product. Some sub-sampled annotations and atmospheric datasets are provided on the OLCI tie-points grid. Several associated variables are also provided in annotation data files. ",SYNERGY,SENTINEL3,"S3A,S3B",L2,"SYNERGY,SY,SENTINEL,SENTINEL3,S3,S3A,S3B,L2,SYN","OPTICAL,RADAR",proprietary,SENTINEL3 SYNERGY Level-2 SYN,2016-02-16T00:00:00Z,,,,,available,available,,,,,,,available,,,available,,,,available
 S3_SY_V10,"The Level-2 VG1 and V10 SYN products (SY_2_VG1 and SY_2_V10 respectively) are produced by the SYNERGY Level-2 processor and contain 1 km VEGETATION-like product, 1 and 10 days synthesis surface reflectances and NDVI. The product grid and the four spectral bands are similar to the SYN Level-2 VGP product. ",SYNERGY,SENTINEL3,"S3A,S3B",LEVEL-2W,"SYNERGY,SY,SENTINEL,SENTINEL3,S3,S3A,S3B,L2,V10","OPTICAL,RADAR",proprietary,SENTINEL3 SYNERGY Level-2 V10,2016-02-16T00:00:00Z,,,,,available,available,,,,,,,available,,,available,,,,
 S3_SY_VG1,"The Level-2 VG1 and V10 SYN products (SY_2_VG1 and SY_2_V10 respectively) are produced by the SYNERGY Level-2 processor and contain 1 km VEGETATION-like product, 1 and 10 days synthesis surface reflectances and NDVI. The product grid and the four spectral bands are similar to the SYN Level-2 VGP product. ",SYNERGY,SENTINEL3,"S3A,S3B",LEVEL-2,"SYNERGY,SY,SENTINEL,SENTINEL3,S3,S3A,S3B,L2,VG1","OPTICAL,RADAR",proprietary,SENTINEL3 SYNERGY Level-2 VG1,2016-02-16T00:00:00Z,,,,,available,available,,,,,,,available,,,available,,,,
 S3_SY_VGP,"The Level-2 VGP SYN product (SY_2_VGP) is produced by the Global Synergy Level-1/2 software and contains 1 km VEGETATION-like product TOA reflectances. The ""1 km VEGETATION-like product"" label means that measurements are provided on a regular latitude-longitude grid, with an equatorial sampling distance of approximately 1 km. This product is restricted in longitude, including only filled ones. ",SYNERGY,SENTINEL3,"S3A,S3B",LEVEL-2,"SYNERGY,SY,SENTINEL,SENTINEL3,S3,S3A,S3B,L2,VGP","OPTICAL,RADAR",proprietary,SENTINEL3 SYNERGY Level-2 VGP,2016-02-16T00:00:00Z,,,,,available,available,,,,,,,available,,,available,,,,
 S3_WAT,"The products contain the typical altimetry measurements, like the altimeter range, the sea surface height, the wind speed, significant wave height and all required geophysical corrections and related flags. Also the sea Ice freeboard measurement is included. The measurements in the standard data file provide the measurements in low (1 Hz = approx. 7km) and high resolution (20 Hz = approx. 300 m), in LRM mode or in SAR mode, for both C-band and Ku band. The SAR mode is the default mode. The reduced measurement data file contains 1 Hz measurements only. The enhanced measurement data file contains also the waveforms and associated parameters and the pseudo LRM measurements when in SAR mode. This product contains the following datasets: Sea Level Global(NRT) (PDS_MG3_CORE_14_GLONRT), Sea Level Global Reduced(NRT)(PDS_MG3_CORE_14_GLONRT_RD), Sea Level Global Standard(NRT) (PDS_MG3_CORE_14_GLONRT_SD), Sea Level Global Enhanced(NRT) (PDS_MG3_CORE_14_GLONRT_EN) - All Sentinel-3 NRT products are available at pick-up point in less than 3h. - All Sentinel-3 Non Time Critical (NTC) products are available at pick-up point in less than 30 days - All Sentinel-3 Short Time Critical (STC) products are available at pick-up point in less than 48 hours Sentinel-3 is part of a series of Sentinel satellites, under the umbrella of the EU Copernicus programme. ",SRAL,SENTINEL3,"S3A,S3B",L2,"SRAL,SENTINEL,SENTINEL3,S3,S3A,S3B,L2,WAT",RADAR,proprietary,SENTINEL3 SRAL Level-2 WAT,2016-02-16T00:00:00Z,,,,,available,available,,,,,,,available,,,available,,,,available
+S3_WAT_BC004,"The products contain the typical altimetry measurements, like the altimeter range, the sea surface height, the wind speed, significant wave height and all required geophysical corrections and related flags. Also the sea Ice freeboard measurement is included. The measurements in the standard data file provide the measurements in low (1 Hz = approx. 7km) and high resolution (20 Hz = approx. 300 m), in LRM mode or in SAR mode, for both C-band and Ku band. The SAR mode is the default mode. The reduced measurement data file contains 1 Hz measurements only. The enhanced measurement data file contains also the waveforms and associated parameters and the pseudo LRM measurements when in SAR mode. Sentinel-3 is part of a series of Sentinel satellites, under the umbrella of the EU Copernicus programme. This collection contains reprocessed data from baseline collection 004. Operational data can be found in the corresponding collection. ",SRAL,SENTINEL3,"S3A,S3B",L2,"SRAL,SENTINEL,SENTINEL3,S3,S3A,S3B,L2,WAT,REPROCESSED,BC004",RADAR,proprietary,SRAL Level 2 Altimetry Global - Reprocessed from BC004,2016-03-01T00:00:00Z,,,,,,,,,,,,,,,,,,,,available
 S5P_L1B2_IR_ALL,"Solar irradiance spectra for all bands (UV1-6 and SWIR) The TROPOMI instrument is a space-borne, nadir-viewing, imaging spectrometer covering wavelength bands between the ultraviolet and the shortwave infrared. The instrument, the single payload of the Sentinel-5P spacecraft, uses passive remote sensing techniques to attain its objective by measuring, at the Top Of Atmosphere (TOA), the solar radiation reflected by and radiated from the earth. The instrument operates in a push-broom configuration (non-scanning), with a swath width of ~2600 km on the Earth's surface. The typical pixel size (near nadir) will be 7x3.5 km2 for all spectral bands, with the exception of the UV1 band (7x28 km2) and SWIR bands (7x7 km2). ",TROPOMI,SENTINEL5P,S5P,"L1B, L2","SENTINEL,SENTINEL5P,S5P,L1,L1B,TROPOMI,IR,SIR,SWIR,Irradiances,UVN",ATMOSPHERIC,proprietary,Sentinel-5 Precursor Level 1B and Level 2 Irradiances for the SWIR and UNV bands,2017-10-13T00:00:00Z,,,,,,,,,,,,,,,,,,,,available
 S5P_L1B_IR_SIR,"Solar irradiance spectra for the SWIR bands (band 7 and band 8). TROPOMI utilises a single telescope to form an image of the target area onto a rectangular slit that acts as the entrance slit of the spectrometer system. There are four different spectrometers, each with its own optics and detector: mediumwave ultraviolet (UV), longwave ultraviolet combined with visible (UVIS), near infrared (NIR), and shortwave infrared (SWIR). The spectrometers for UV, UVIS and NIR are jointly referred to as UVN. Radiation for the SWIR spectrometer is transferred by an optical relay part in the UVN system from the telescope to an interface position (the pupil stop) for the SWIR spectrometer. This is done because of the more stringent thermal requirements on the SWIR part of the instrument. Each of the detectors is divided in two halves, which yields a total of eight spectral bands. ",TROPOMI,SENTINEL5P,S5P,L1B,"SENTINEL,SENTINEL5P,S5P,L1,L1B,TROPOMI,IR,SIR,SWIR,Irradiances",ATMOSPHERIC,proprietary,Sentinel-5 Precursor Level 1B Irradiances for the SWIR bands,2017-10-13T00:00:00Z,,,,,available,available,,,,,,,,,,,,,,
 S5P_L1B_IR_UVN,"Solar irradiance spectra for the UVN bands (band 1 through band 6). TROPOMI utilises a single telescope to form an image of the target area onto a rectangular slit that acts as the entrance slit of the spectrometer system. There are four different spectrometers, each with its own optics and detector: mediumwave ultraviolet (UV), longwave ultraviolet combined with visible (UVIS), near infrared (NIR), and shortwave infrared (SWIR). The spectrometers for UV, UVIS and NIR are jointly referred to as UVN. Radiation for the SWIR spectrometer is transferred by an optical relay part in the UVN system from the telescope to an interface position (the pupil stop) for the SWIR spectrometer. This is done because of the more stringent thermal requirements on the SWIR part of the instrument. Each of the detectors is divided in two halves, which yields a total of eight spectral bands. ",TROPOMI,SENTINEL5P,S5P,L1B,"SENTINEL,SENTINEL5P,S5P,L1,L1B,TROPOMI,IR,UVN,Irradiances",ATMOSPHERIC,proprietary,Sentinel-5 Precursor Level 1B Irradiances for the UVN bands,2017-10-13T00:00:00Z,,,,,available,available,,,,,,,,,,,,,,
@@ -124,6 +134,12 @@ S5P_L2_O3,"Ozone (O3) is of crucial importance for the equilibrium of the Earth'
 S5P_L2_O3_PR,"Retrieved ozone profiles are used to monitor the evolution of stratospheric and tropospheric ozone. Such monitoring is important as the ozone layer protects life on Earth against harmful UV radiation. The ozone layer is recovering from depletion due to manmade Chlorofluorocarbons (CFCs). Tropospheric ozone is toxic and it plays an important role in tropospheric chemistry. Also, ozone is a greenhouse gas and is therefore also relevant for climate change. The main parameters in the file are the retrieved ozone profile at 33 levels and the retrieved sub-columns of ozone in 6 layers. In addition, the total ozone column and tropospheric ozone columns are provided. For the ozone profile, the precision and smoothing errors, the a-priori profile and the averaging kernel are also provided. ",TROPOMI,SENTINEL5P,S5P,L2,"SENTINEL,SENTINEL5P,S5P,L2,TROPOMI,O3,PR,Ozone,Profile",ATMOSPHERIC,proprietary,Sentinel-5 Precursor Level 2 Ozone Profile,2017-10-13T00:00:00Z,,,,,available,available,,,,,,,available,,,,,,,
 S5P_L2_O3_TCL,"Ozone in the tropical troposphere plays various important roles. The intense UV radiation and high humidity in the tropics stimulate the formation of the hydroxyl radical (OH) by the photolysis of ozone. OH is the most important oxidant in the troposphere because it reacts with virtually all trace gases, such as CO, CH4 and other hydrocarbons. The tropics are also characterized by large emissions of nitrogen oxides (NOx), carbon monoxide (CO) and hydrocarbons, both from natural and anthropogenic sources. Ozone that is formed over regions where large amounts of these ozone precursors are emitted, can be transported over great distances and affects areas far from the source. The TROPOMI tropospheric ozone product is a level-2c product that represents three day averaged tropospheric ozone columns on a 0.5° by 1° latitude-longitude grid for the tropical region between 20°N and 20°S. The TROPOMI tropospheric ozone column product uses the TROPOMI Level-2 total OZONE and CLOUD products as input. ",TROPOMI,SENTINEL5P,S5P,L2,"SENTINEL,SENTINEL5P,S5P,L2,TROPOMI,O3,TCL,Tropospheric,Ozone",ATMOSPHERIC,proprietary,Sentinel-5 Precursor Level 2 Tropospheric Ozone,2017-10-13T00:00:00Z,,,,,available,available,,,,,,,,,,,,,,
 S5P_L2_SO2,"Sulphur dioxide (SO2) enters the Earth's atmosphere through both natural (~30%) and anthropogenic processes (~70%). It plays a role in chemistry on a local and global scale and its impact ranges from short term pollution to effects on climate. Beside the total column of SO2, enhanced levels of SO2 are flagged within the products. The recognition of enhanced SO2 values is essential in order to detect and monitor volcanic eruptions and anthropogenic pollution sources. Volcanic SO2 emissions may also pose a threat to aviation, along with volcanic ash. ",TROPOMI,SENTINEL5P,S5P,L2,"SENTINEL,SENTINEL5P,S5P,L2,TROPOMI,SO2,Sulphur,Dioxide",ATMOSPHERIC,proprietary,Sentinel-5 Precursor Level 2 Sulphur Dioxide,2017-10-13T00:00:00Z,,,,,available,available,,,,,,,available,,,,,,,
+S6_AMR_L2_F06,"This is a reprocessed dataset at baseline F06, which is continued by the NRT/NTC data stream from 29/April/2022 onwards. AMR-C Level 2 Products as generated by the AMR-C CFI Processor. These products include antenna and brightness temperatures, wet tropospheric correction, water vapour content, and a rain flag. Sentinel-6 is part of a series of Sentinel satellites, under the umbrella of the EU Copernicus programme. It is a collaborative Copernicus mission, implemented and co-funded by the European Commission, ESA, EUMETSAT and the USA, through NASA and the National Oceanic and Atmospheric Administration (NOAA). ",AMR-C,SENTINEL6-A,S6A,L2,"SENTINEL,SENTINEL6,S6,S6A,LEO,L2,AMR-C,RADIOMETER,MICROWAVE,F06",RADIOMETER,proprietary,Sentinel 6 - Climate-quality Advanced Microwave Radiometer Level 2 Products Reprocessed at F06,2020-11-28T00:00:00Z,,,,,,,,,,,,,,,,,,,,available
+S6_P4_L1AHR_F06,"This is a reprocessed dataset at baseline F06, which is continued by the NRT/NTC data stream from 29/April/2022 onwards. The Level-1A product contains Level 1 intermediate output of the HR processor (RAW and RMC). It includes geo-located bursts of Ku echoes (at ~9 kHz) with all instrument calibrations applied. It includes the full rate complex waveforms input to the delay/Doppler or SAR processor. This product is most relevant to altimetry specialists, working on fundamental SAR processing techniques and calibration studies. Sentinel-6 is part of a series of Sentinel satellites, under the umbrella of the EU Copernicus programme. It is a collaborative Copernicus mission, implemented and co-funded by the European Commission, ESA, EUMETSAT and the USA, through NASA and the National Oceanic and Atmospheric Administration (NOAA). ",Poseidon-4,SENTINEL6-A,S6A,L1A,"SENTINEL,SENTINEL6,S6,S6A,LEO,L1A,ALTIMETRIC,HR,POSEIDON4,P4,F06",ALTIMETRIC,proprietary,Sentinel 6 - Poseidon-4 Altimetry Level 1A High Resolution Reprocessed at F06,2020-12-17T00:00:00Z,,,,,,,,,,,,,,,,,,,,available
+S6_P4_L1BAHR_F06,"This is a reprocessed dataset at baseline F06, which is continued by the NRT/NTC data stream from 29/April/2022 onwards. The Level-1B HR product is output of the HR processor. It includes geo-located, and fully calibrated multi-looked high-resolution Ku-band waveforms. This product is most relevant to geophysical retrieval algorithm developers (over ocean, land and ice surfaces), surface characterisations studies (e.g. impact of sea state bias, wave directional effects etc.) and Quality Control systems. Sentinel-6 is part of a series of Sentinel satellites, under the umbrella of the EU Copernicus programme. It is a collaborative Copernicus mission, implemented and co-funded by the European Commission, ESA, EUMETSAT and the USA, through NASA and the National Oceanic and Atmospheric Administration (NOAA). ",Poseidon-4,SENTINEL6-A,S6A,L1B,"SENTINEL,SENTINEL6,S6,S6A,LEO,L1B,ALTIMETRIC,HR,POSEIDON4,P4,F06",ALTIMETRIC,proprietary,Sentinel 6 - Poseidon-4 Altimetry Level 1B High Resolution Reprocessed at F06,2020-12-17T00:00:00Z,,,,,,,,,,,,,,,,,,,,available
+S6_P4_L1BLR_F06,"This is a reprocessed dataset at baseline F06, which is continued by the NRT/NTC data stream from 29/April/2022 onwards. The Level-1B LR product is output of the LR processor. It includes geo-located, and fully calibrated pulse-limited low-resolution Ku-band and C-band waveforms. This product is most relevant to geophysical retrieval algorithm developers (over ocean, land and ice surfaces), surface characterisations studies (e.g. impact of sea state bias, wave directional effects etc) and Quality Control systems. Sentinel-6 is part of a series of Sentinel satellites, under the umbrella of the EU Copernicus programme. It is a collaborative Copernicus mission, implemented and co-funded by the European Commission, ESA, EUMETSAT and the USA, through NASA and the National Oceanic and Atmospheric Administration (NOAA). ",Poseidon-4,SENTINEL6-A,S6A,L1B,"SENTINEL,SENTINEL6,S6,S6A,LEO,L1B,ALTIMETRIC,LR,POSEIDON4,P4,F06",ALTIMETRIC,proprietary,Sentinel 6 - Poseidon-4 Altimetry Level 1B Low Resolution Reprocessed at F06,2020-12-17T00:00:00Z,,,,,,,,,,,,,,,,,,,,available
+S6_P4_L2HR_F06,"This is a reprocessed dataset at baseline F06, which is continued by the NRT/NTC data stream from 29/April/2022 onwards. The level-2 high resolution products contain the typical altimetry measurements, like the altimeter range, the sea surface height, the wind speed, significant wave height and all required geophysical corrections and related flags derived either from RAW or RMC, or the combination of both. Two measurement data files are available (standard and reduced), each with a different number of variables. The standard data file includes 1 Hz and 20 Hz measurements for the Ku- band as well as geophysical corrections at 1 Hz and some at 20 Hz. The reduced data file contains only 1 Hz measurements for the Ku- and C-bands as well as geophysical corrections at 1 Hz. Note that the HR data products only contain Ku-band measurements. These products are suitable for users seeking information on sea state and those creating downstream added value products from multiple altimeters. Particularly for those seeking the highest resolution measurements. Sentinel-6 is part of a series of Sentinel satellites, under the umbrella of the EU Copernicus programme. It is a collaborative Copernicus mission, implemented and co-funded by the European Commission, ESA, EUMETSAT and the USA, through NASA and the National Oceanic and Atmospheric Administration (NOAA). ",Poseidon-4,SENTINEL6-A,S6A,L2,"SENTINEL,SENTINEL6,S6,S6A,LEO,L2,ALTIMETRIC,HR,POSEIDON4,P4,F06",ALTIMETRIC,proprietary,Sentinel 6 - Poseidon-4 Altimetry Level 2 High Resolution Reprocessed at F06,2020-12-17T00:00:00Z,,,,,,,,,,,,,,,,,,,,available
+S6_P4_L2LR_F06,"This is a reprocessed dataset at baseline F06, which is continued by the NRT/NTC data stream from 29/April/2022 onwards. The product contain the typical altimetry measurements, like the altimeter range, the sea surface height, the wind speed, significant wave height and all required geophysical corrections and related flags derived from LR. Two measurement data files are available (standard and reduced), each with a different number of variables. The standard data file includes 1 Hz and 20 Hz measurements for the Ku- and C-bands as well as geophysical corrections at 1 Hz and some at 20 Hz. The reduced data file contains only 1 Hz measurements for the Ku- and C-bands as well as geophysical corrections at 1 Hz. These products are suitable for users seeking information on sea state and those creating downstream added value products from multiple altimeters. Sentinel-6 is part of a series of Sentinel satellites, under the umbrella of the EU Copernicus programme. It is a collaborative Copernicus mission, implemented and co-funded by the European Commission, ESA, EUMETSAT and the USA, through NASA and the National Oceanic and Atmospheric Administration (NOAA). ",Poseidon-4,SENTINEL6-A,S6A,L2,"SENTINEL,SENTINEL6,S6,S6A,LEO,L2,ALTIMETRIC,LR,POSEIDON4,P4,F06",ALTIMETRIC,proprietary,Sentinel 6 - Poseidon-4 Altimetry Level 2 Low Resolution Reprocessed at F06,2020-12-17T00:00:00Z,,,,,,,,,,,,,,,,,,,,available
 SATELLITE_CARBON_DIOXIDE,"This dataset provides observations of atmospheric carbon dioxide (CO2)\namounts obtained from observations collected by several current and historical \nsatellite instruments. Carbon dioxide is a naturally occurring Greenhouse Gas (GHG), but one whose abundance has been increased substantially above its pre-industrial value of some 280 ppm by human activities, primarily because of emissions from combustion of fossil fuels, deforestation and other land-use change. The annual cycle (especially in the northern hemisphere) is primarily due to seasonal uptake and release of atmospheric CO2 by terrestrial vegetation.\nAtmospheric carbon dioxide abundance is indirectly observed by various satellite instruments. These instruments measure spectrally resolved near-infrared and/or infrared radiation reflected or emitted by the Earth and its atmosphere. In the measured signal, molecular absorption signatures from carbon dioxide and other constituent gasses can be identified. It is through analysis of those absorption lines in these radiance observations that the averaged carbon dioxide abundance in the sampled atmospheric column can be determined.\nThe software used to analyse the absorption lines and determine the carbon dioxide concentration in the sampled atmospheric column is referred to as the retrieval algorithm. For this dataset, carbon dioxide abundances have been determined by applying several algorithms to different satellite \ninstruments. Typically, different algorithms have different strengths and weaknesses and therefore, which product to use for a given application typically depends on the application.\nThe data set consists of 2 types of products: (i) column-averaged mixing ratios of CO2, denoted XCO2 and (ii) mid-tropospheric CO2 columns.  The XCO2 products have been retrieved from SCIAMACHY/ENVISAT, TANSO-FTS/GOSAT and OCO-2. The mid-tropospheric CO2 product has been retrieved from the IASI instruments on-board the Metop satellite series and from AIRS. \nThe XCO2 products are available as Level 2 (L2) products (satellite orbit tracks) and as Level 3 (L3) product (gridded). The L2 products are available as individual sensor products (SCIAMACHY: BESD and WFMD algorithms; GOSAT: OCFP and SRFP algorithms) and as a multi-sensor merged product (EMMA algorithm). The L3 XCO2 product is provided in OBS4MIPS format. \nThe IASI and AIRS products are available as L2 products generated with the NLIS algorithm.\nThis data set is updated on a yearly basis, with each update cycle adding (if required) a new data version for the entire period, up to one year behind real time.\nThis dataset is produced on behalf of C3S with the exception of the SCIAMACHY and AIRS L2 products that were generated in the framework of the GHG-CCI project of the European Space Agency (ESA) Climate Change Initiative (CCI).\n\nVariables in the dataset/application are:\nColumn-average dry-air mole fraction of atmospheric carbon dioxide (XCO2), Mid-tropospheric columns of atmospheric carbon dioxide (CO2) ",,,,,"ECMWF,CDS,C3S,carbon-dioxide",ATMOSPHERIC,proprietary,Carbon dioxide data from 2002 to present derived from satellite observations,2002-10-01T00:00:00Z,,,,,,,,,,,,,,,,,,,,available
 SATELLITE_METHANE,"This dataset provides observations of atmospheric methane (CH4)\namounts obtained from observations collected by several current and historical \nsatellite instruments.  Methane is a naturally occurring Greenhouse Gas (GHG), but one whose abundance has been increased substantially above its pre-industrial value of some 720 ppb by human activities, primarily because of agricultural emissions (e.g., rice production, ruminants) and fossil fuel production and use. A clear annual cycle is largely due to seasonal wetland emissions.\nAtmospheric methane abundance is indirectly observed by various satellite instruments. These instruments measure spectrally resolved near-infrared and infrared radiation reflected or emitted by the Earth and its atmosphere. In the measured signal, molecular absorption signatures from methane and constituent gasses can be identified. It is through analysis of those absorption lines in these radiance observations that the averaged methane abundance in the sampled atmospheric column can be determined.\nThe software used to analyse the absorption lines and determine the methane concentration in the sampled atmospheric column is referred to as the retrieval algorithm. For this dataset, methane abundances have been determined by applying several algorithms to different satellite instruments.\nThe data set consists of 2 types of products: (i) column-averaged mixing ratios of CH4, denoted XCH4 and (ii) mid-tropospheric CH4 columns. \nThe XCH4 products have been retrieved from SCIAMACHY/ENVISAT and TANSO-FTS/GOSAT. The mid-tropospheric CH4 product has been retrieved from the IASI instruments onboard the Metop satellite series. The XCH4 products are available as Level 2 (L2) products (satellite orbit tracks) and as Level 3 (L3) product (gridded). The L2 products are available as individual sensor products (SCIAMACHY: WFMD and IMAP algorithms; GOSAT: OCFP, OCPR, SRFP and SRPR algorithms) and as a multi-sensor merged product (EMMA algorithm). The L3 XCH4 product is provided in OBS4MIPS format. The IASI products are available as L2 products generated with the NLIS algorithm.\nThis data set is updated on a yearly basis, with each update cycle adding (if required) a new data version for the entire period, up to one year behind real time.\nThis dataset is produced on behalf of C3S with the exception of the SCIAMACHY L2 products that were generated in the framework of the GHG-CCI project of the European Space Agency (ESA) Climate Change Initiative (CCI).\n\nVariables in the dataset/application are:\nColumn-average dry-air mole fraction of atmospheric methane (XCH4), Mid-tropospheric columns of atmospheric methane (CH4) ",,,,,"ECMWF,CDS,C3S,methane",ATMOSPHERIC,proprietary,Methane data from 2002 to present derived from satellite observations,2002-10-01T00:00:00Z,,,,,,,,,,,,,,,,,,,,available
 SATELLITE_SEA_LEVEL_BLACK_SEA,"Sea level anomaly is the height of water over the mean sea surface in a given time and region. Up-to-date altimeter standards are used to estimate the sea level anomalies with a mapping algorithm dedicated to the Black sea region. Anomalies are computed with respect to a twenty-year mean reference period (1993-2012). The steady number of reference satellite used in the production of this dataset contributes to the long-term stability of the sea level record. Improvements of the accuracy, sampling of meso-scale processes and of the high-latitude coverage were achieved by using a few additional satellite missions. New data are provided with a delay of about 4-5 months relatively to near-real time or interim sea level products. This delay is mainly due to the timeliness of the input data, the centred processing temporal window and the validation process. However, this processing and validation adds stability and accuracy to the sea level variables and make them adapted to climate applications. This dataset includes uncertainties for each grid cell. More details about the sea level retrieval, additional filters, optimisation procedures, and the error estimation are given in the Documentation section. Variables in the dataset/application are: Absolute dynamic topography, Absolute geostrophic velocity meridian component, Absolute geostrophic velocity zonal component, Geostrophic velocity anomalies meridian component, Geostrophic velocity anomalies zonal component, Sea level anomaly ",,,,,"Climate,ECMWF,CDS,C3S,methane,sea",HYDROLOGICAL,proprietary,Sea level daily gridded data from satellite observations for the Black Sea from 1993 to 2020,1993-01-01T00:00:00Z,,,,,,,,,,,,,,,,,,,,available
diff --git a/docs/index.rst b/docs/index.rst
index 4c6566f6..03ffebfa 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -37,7 +37,8 @@ types (Sentinel 1, Sentinel 2, Sentinel 3, Landsat, etc.) that can be searched a
       `meteoblue <https://content.meteoblue.com/en/business-solutions/weather-apis/dataset-api>`_,
       `cop_dataspace <https://dataspace.copernicus.eu/>`_,
       `planetary_computer <https://planetarycomputer.microsoft.com/>`_,
-      `hydroweb_next <https://hydroweb.next.theia-land.fr>`_
+      `hydroweb_next <https://hydroweb.next.theia-land.fr>`_,
+      `wekeo <https://www.wekeo.eu/>`_
 
 EODAG has the following primary features:
 
diff --git a/eodag/api/product/metadata_mapping.py b/eodag/api/product/metadata_mapping.py
index a9e8583a..b369ddc8 100644
--- a/eodag/api/product/metadata_mapping.py
+++ b/eodag/api/product/metadata_mapping.py
@@ -579,13 +579,14 @@ def format_metadata(search_param, *args, **kwargs):
         def convert_split_id_into_s3_params(product_id):
             parts = re.split(r"_(?!_)", product_id)
             params = {"productType": product_id[4:15]}
-            start_date = datetime.strptime(
-                product_id[16:31], "%Y%m%dT%H%M%S"
-            ) - timedelta(seconds=1)
+            dates = re.findall("[0-9]{8}T[0-9]{6}", product_id)
+            start_date = datetime.strptime(dates[0], "%Y%m%dT%H%M%S") - timedelta(
+                seconds=1
+            )
             params["startDate"] = start_date.strftime("%Y-%m-%dT%H:%M:%SZ")
-            end_date = datetime.strptime(
-                product_id[32:47], "%Y%m%dT%H%M%S"
-            ) + timedelta(seconds=1)
+            end_date = datetime.strptime(dates[1], "%Y%m%dT%H%M%S") + timedelta(
+                seconds=1
+            )
             params["endDate"] = end_date.strftime("%Y-%m-%dT%H:%M:%SZ")
             params["timeliness"] = parts[-2]
             params["sat"] = "Sentinel-" + parts[0][1:]
@@ -705,6 +706,18 @@ def format_metadata(search_param, *args, **kwargs):
                 MetadataFormatter.convert_to_datetime_dict(date, "str")["hour"] + ":00"
             ]
 
+        @staticmethod
+        def convert_get_dates_from_string(text: str, split_param="-"):
+            reg = "[0-9]{8}" + split_param + "[0-9]{8}"
+            dates_str = re.search(reg, text).group()
+            dates = dates_str.split(split_param)
+            start_date = datetime.strptime(dates[0], "%Y%m%d")
+            end_date = datetime.strptime(dates[1], "%Y%m%d")
+            return {
+                "startDate": start_date.strftime("%Y-%m-%dT%H:%M:%SZ"),
+                "endDate": end_date.strftime("%Y-%m-%dT%H:%M:%SZ"),
+            }
+
     # if stac extension colon separator `:` is in search params, parse it to prevent issues with vformat
     if re.search(r"{[a-zA-Z0-9_-]*:[a-zA-Z0-9_-]*}", search_param):
         search_param = re.sub(
diff --git a/eodag/plugins/search/data_request_search.py b/eodag/plugins/search/data_request_search.py
index c621f1a3..7a09c6a2 100644
--- a/eodag/plugins/search/data_request_search.py
+++ b/eodag/plugins/search/data_request_search.py
@@ -146,7 +146,7 @@ class DataRequestSearch(Search):
         )
 
         # update dates if needed
-        if getattr(self.config, "dates_required", True):
+        if getattr(self.config, "dates_required", True) and "id" not in keywords:
             if not keywords.get("startTimeFromAscendingNode", None):
                 keywords["startTimeFromAscendingNode"] = getattr(
                     self.config, "product_type_config", {}
diff --git a/eodag/resources/product_types.yml b/eodag/resources/product_types.yml
index bfab67b8..07f5c9d0 100644
--- a/eodag/resources/product_types.yml
+++ b/eodag/resources/product_types.yml
@@ -869,7 +869,25 @@ S3_OLCI_L2WRR:
   title: SENTINEL3 OLCI Level-2 Water Reduced Resolution
   missionStartDate: "2016-02-16T00:00:00Z"
 
-S3_OLCI_L2LFR:
+S3_OLCI_L2WRR_BC003:
+  abstract: |
+    OLCI Level 2 Marine products provide spectral information on the colour of the oceans (water reflectances). These
+    radiometric products are used to estimate geophysical parameters e.g. estimates of phytoplankton biomass through
+    determining the Chlorophyll-a (Chl) concentration. In coastal areas, they also allow monitoring of the sediment
+    load via the Total Suspended Matter (TSM) product. Reduced resolution products are at a nominal 1km resolution.
+    This collection contains reprocessed data from baseline collection 003. Operational data can be found in the
+    corresponding collection.
+  instrument: OLCI
+  platform: SENTINEL3
+  platformSerialIdentifier: S3A,S3B
+  processingLevel: L2
+  keywords: OLCI,SENTINEL,SENTINEL3,S3,S3A,S3B,L2,L2WRR,WRR,REPROCESSED,BC003
+  sensorType: OPTICAL
+  license: proprietary
+  title: SENTINEL3 OLCI Level-2 Water Reduced Resolution Reprocessed from BC003
+  missionStartDate: "2016-02-16T00:00:00Z"
+
+S3_OLCI_L2WFR:
   abstract: |
     The OLCI Level-2 Water Full Resolution (OL_2_WFR) products contain water and atmospheric geophysical products at Full
     resolution with a spatial sampling of approximately 300 m. The products are assumed to be computed in Near Real
@@ -886,22 +904,43 @@ S3_OLCI_L2LFR:
   title: SENTINEL3 OLCI Level-2 Water Full Resolution
   missionStartDate: "2016-02-16T00:00:00Z"
 
-S3_OLCI_L2WFR:
+S3_OLCI_L2WFR_BC003:
   abstract: |
-    The OLCI Level-2 Water Full Resolution (OL_2_WFR) products contain water and atmospheric geophysical products
-    at Full resolution with a spatial sampling of approximately 1.2 km. The products are assumed to be computed
-    in Near Real Time (NRT) (i.e. delivered to users less than 3 hours after acquisition), in Non-Time Critical
-    (NTC) (i.e. within 1 month after acquisition) or in re-processed NTC.
+    OLCI Level 2 Marine products provide spectral information on the colour of the oceans (water reflectances). These
+    radiometric products are used to estimate geophysical parameters e.g. estimates of phytoplankton biomass through
+    determining the Chlorophyll-a (Chl) concentration. In coastal areas, they also allow monitoring of the sediment
+    load via the Total Suspended Matter (TSM) product. Full resolution products are at a nominal 300m resolution. This
+    collection contains reprocessed data from baseline collection 003. Operational data can be found in the
+    corresponding collection.
     Details at https://sentinel.esa.int/web/sentinel/user-guides/sentinel-3-olci/product-types/level-2-water
   instrument: OLCI
   platform: SENTINEL3
   platformSerialIdentifier: S3A,S3B
   processingLevel: L2
-  keywords: OLCI,SENTINEL,SENTINEL3,S3,S3A,S3B,L2,L2WFR,WFR
+  keywords: OLCI,SENTINEL,SENTINEL3,S3,S3A,S3B,L2,L2WFR,WFR,REPROCESSED,BC003
   sensorType: OPTICAL
   license: proprietary
-  title: SENTINEL3 OLCI Level-2 Water Full Resolution
+  title: SENTINEL3 OLCI Level-2 Water Full Resolution Reprocessed from BC003
   missionStartDate: "2016-02-16T00:00:00Z"
+
+S3_OLCI_L4BALTIC:
+  abstract: |
+    Baltic Sea Surface Ocean Colour Plankton from Sentinel-3 OLCI L4 monthly observations
+    For the Baltic Sea Ocean Satellite Observations, the Italian National Research Council (CNR – Rome, Italy), is
+    providing Bio-Geo_Chemical (BGC) regional datasets: * ''plankton'' with the phytoplankton chlorophyll
+    concentration (CHL) evaluated via region-specific neural network (Brando et al. 2021) Upstreams: OLCI-S3A & S3B
+    Temporal resolution: monthly Spatial resolution: 300 meters To find this product in the catalogue, use the search
+    keyword ""OCEANCOLOUR_BAL_BGC_L4_NRT"". DOI (product) : https://doi.org/10.48670/moi-00295
+  instrument: OLCI
+  platform: SENTINEL3
+  platformSerialIdentifier: S3A,S3B
+  processingLevel: L4
+  keywords: OLCI,SENTINEL,SENTINEL3,S3,S3A,S3B,L4,BGC,CHL,BALTIC
+  sensorType: OPTICAL
+  license: proprietary
+  title: SENTINEL3 OLCI Baltic Sea Surface Ocean Colour Plankton
+  missionStartDate: "2023-04-10T00:00:00Z"
+
 # S3 SLSTR
 S3_SLSTR_L1RBT:
   abstract: |
@@ -921,6 +960,26 @@ S3_SLSTR_L1RBT:
   title: SENTINEL3 SLSTR Level-1
   missionStartDate: "2016-02-16T00:00:00Z"
 
+S3_SLSTR_L1RBT_BC004:
+  abstract: |
+    SLSTR Level 1B Radiances and Brightness Temperatures (version BC004) - Sentinel 3 - Reprocessed
+    The SLSTR level 1 products contain: the radiances of the 6 visible (VIS), Near Infra-Red (NIR) and Short Wave
+    Infra-Red (SWIR) bands (on the A and B stripe grids); the Brightness Temperature (BT) for the 3 Thermal Infra-Red
+    (TIR) bands; the BT for the 2 Fire (FIR) bands. Resolution: 1km at nadir (TIR), 500m (VIS). All are provided for
+    both the oblique and nadir view. These measurements are accompanied with grid and time information, quality flags,
+    error estimates and meteorological auxiliary data. Sentinel-3 is part of a series of Sentinel satellites, under the
+    umbrella of the EU Copernicus programme. This collection contains reprocessed data from baseline collection 004.
+    Operational data can be found in the corresponding collection.
+  instrument: SLSTR
+  platform: SENTINEL3
+  platformSerialIdentifier: S3A,S3B
+  processingLevel: L1
+  keywords: SLSTR,SENTINEL,SENTINEL3,S3,S3A,S3B,L1,L1RBT,RBT,VIS,NIR,SWIR,BT,TIR,FIR,Reprocessed,BC004
+  sensorType: ATMOSPHERIC
+  license: proprietary
+  title: SENTINEL3 SLSTR Level-1 RBT - Reprocessed from BC004
+  missionStartDate: "2018-05-09T00:00:00Z"
+
 S3_SLSTR_L2LST:
   abstract: |
     The SLSTR Level-2 LST product provides land surface parameters generated on the wide 1 km measurement grid.
@@ -951,6 +1010,22 @@ S3_SLSTR_L2WST:
   title: SENTINEL3 SLSTR Level-2 WST
   missionStartDate: "2016-02-16T00:00:00Z"
 
+S3_SLSTR_L2WST_BC003:
+  abstract: |
+    The SLSTR SST has a spatial resolution of 1km at nadir. Skin Sea Surface Temperature following the
+    GHRSST L2P GDS2 format specification, see https://www.ghrsst.org/ . Sentinel-3 is part of a series of Sentinel
+    satellites, under the umbrella of the EU Copernicus programme. This collection contains reprocessed data from
+    baseline collection 003. Operational data can be found in the corresponding collection.
+  instrument: SLSTR
+  platform: SENTINEL3
+  platformSerialIdentifier: S3A,S3B
+  processingLevel: L2
+  keywords: SLSTR,SENTINEL,SENTINEL3,S3,S3A,S3B,L2,L2WST,WST,REPROCESSED,BC003
+  sensorType: ATMOSPHERIC
+  license: proprietary
+  title: SENTINEL3 SLSTR Level-2 WST Reprocessed from BC003
+  missionStartDate: "2016-04-18T00:00:00Z"
+
 S3_SLSTR_L2AOD:
   abstract: |
     The Copernicus NRT S3 AOD processor quantifies the abundance of aerosol particles and monitors their global
@@ -1060,6 +1135,63 @@ S3_SRA_BS:
   title: SENTINEL3 SRAL Level-1 SRA_BS
   missionStartDate: "2016-02-16T00:00:00Z"
 
+S3_SRA_1A_BC004:
+  abstract: |
+    SRAL Level 1A Unpacked L0 Complex Echoes (version BC004) - Sentinel-3 - Reprocessed
+    Fundamental science and engineering product development supporting operational users. This product is most
+    relevant to SAR processing specialists allowing fundamental studies on SAR processing such as Doppler beam
+    formation and for calibration studies using ground-based Transponders. Sentinel-3 is part of a series of Sentinel
+    satellites, under the umbrella of the EU Copernicus programme. This collection contains reprocessed data from
+    baseline collection 004. Operational data can be found in the corresponding collection.
+  instrument: SRAL
+  platform: SENTINEL3
+  platformSerialIdentifier: S3A,S3B
+  processingLevel: L1A
+  keywords: SRA,SRAL,SENTINEL,SENTINEL3,S3,S3A,S3B,L1,L1A,REPROCESSED,BC004
+  sensorType: RADAR
+  license: proprietary
+  title: SENTINEL3 SRAL Level-1A Unpacked - Reprocessed from BC004
+  missionStartDate: "2016-03-01T00:00:00Z"
+
+S3_SRA_1B_BC004:
+  abstract: |
+    SRAL Level 1B (version BC004) - Sentinel-3 - Reprocessed
+    SRAL Level 1B: Complex echoes (In-phase (I) and Quadrature (Q)) for the Low Resolution Mode (LRM) and/or
+    Synthetic Aperture Radar (SAR) mode both for C Band and Ku band. When the altimeter is in SAR mode, this product
+    also contains the so-called Pseudo LRM (PLRM) echoes. Sentinel-3 is part of a series of Sentinel satellites, under
+    the umbrella of the EU Copernicus programme. This collection contains reprocessed data from baseline collection 004.
+    Operational data can be found in the corresponding collection.
+  instrument: SRAL
+  platform: SENTINEL3
+  platformSerialIdentifier: S3A,S3B
+  processingLevel: L1B
+  keywords: SRA,SRAL,SENTINEL,SENTINEL3,S3,S3A,S3B,L1,L1B,REPROCESSED,BC004
+  sensorType: RADAR
+  license: proprietary
+  title: SENTINEL3 SRAL Level-1B - Reprocessed from BC004
+  missionStartDate: "2016-03-01T00:00:00Z"
+
+S3_SRA_BS_BC004:
+  abstract: |
+    SRAL Level 1B Stack Echoes (version BC004) - Sentinel-3 - Reprocessed
+    SRAL Level 1B: Complex echoes (In-phase (I) and Quadrature (Q)) for the Low Resolution Mode (LRM) and/or Synthetic
+    Aperture Radar (SAR) mode both for C Band and Ku band. When the altimeter is in SAR mode, this product also
+    contains the so-called Pseudo LRM (PLRM) echoes. Complex (In-phase and Quadrature) echoes (I's and Q;s) after
+    slant/Doppler range correction. This product is most relevant to geophysical retrieval algorithm developers
+    (over ocean, land and ice surfaces), surface characterisations studies (e.g. impact of sea state bias, wave
+    directional effects etc) and Quality Control systems. Sentinel-3 is part of a series of Sentinel satellites, under
+    the umbrella of the EU Copernicus programme. This collection contains reprocessed data from baseline collection 004.
+    Operational data can be found in the corresponding collection.
+  instrument: SRAL
+  platform: SENTINEL3
+  platformSerialIdentifier: S3A,S3B
+  processingLevel: L1B
+  keywords: SRA,SRAL,SENTINEL,SENTINEL3,S3,S3A,S3B,L1,L1B,REPROCESSED,STACK,ECHOES,BC004
+  sensorType: RADAR
+  license: proprietary
+  title: SENTINEL3 SRAL Level-1B Stack Echoes - Reprocessed from BC004
+  missionStartDate: "2016-03-01T00:00:00Z"
+
 S3_WAT:
   abstract: |
     The products contain the typical altimetry measurements, like the altimeter range, the sea surface height, the wind
@@ -1084,6 +1216,27 @@ S3_WAT:
   title: SENTINEL3 SRAL Level-2 WAT
   missionStartDate: "2016-02-16T00:00:00Z"
 
+S3_WAT_BC004:
+  abstract: |
+    The products contain the typical altimetry measurements, like the altimeter range, the sea surface height, the wind
+    speed, significant wave height and all required geophysical corrections and related flags. Also the sea Ice
+    freeboard measurement is included. The measurements in the standard data file provide the measurements in low
+    (1 Hz = approx. 7km) and high resolution (20 Hz = approx. 300 m), in LRM mode or in SAR mode, for both C-band and
+    Ku band. The SAR mode is the default mode. The reduced measurement data file contains 1 Hz measurements only. The
+    enhanced measurement data file contains also the waveforms and associated parameters and the pseudo LRM
+    measurements when in SAR mode. Sentinel-3 is part of a series of Sentinel satellites, under the umbrella of the EU
+    Copernicus programme. This collection contains reprocessed data from baseline collection 004. Operational data can
+    be found in the corresponding collection.
+  instrument: SRAL
+  platform: SENTINEL3
+  platformSerialIdentifier: S3A,S3B
+  processingLevel: L2
+  keywords: SRAL,SENTINEL,SENTINEL3,S3,S3A,S3B,L2,WAT,REPROCESSED,BC004
+  sensorType: RADAR
+  license: proprietary
+  title: SRAL Level 2 Altimetry Global - Reprocessed from BC004
+  missionStartDate: "2016-03-01T00:00:00Z"
+
 S3_LAN:
   abstract: LAN or SR_2_LAN___ (peps)
   instrument: SRAL
@@ -1689,6 +1842,133 @@ S5P_L2_SO2:
   title: Sentinel-5 Precursor Level 2 Sulphur Dioxide
   missionStartDate: "2017-10-13T00:00:00Z"
 
+# Sentinel 6
+S6_P4_L1AHR_F06:
+  abstract: |
+    This is a reprocessed dataset at baseline F06, which is continued by the NRT/NTC data stream from 29/April/2022
+    onwards. The Level-1A product contains Level 1 intermediate output of the HR processor (RAW and RMC). It
+    includes geo-located bursts of Ku echoes (at ~9 kHz) with all instrument calibrations applied. It includes the full
+    rate complex waveforms input to the delay/Doppler or SAR processor. This product is most relevant to altimetry
+    specialists, working on fundamental SAR processing techniques and calibration studies. Sentinel-6 is part of a
+    series of Sentinel satellites, under the umbrella of the EU Copernicus programme. It is a collaborative Copernicus
+    mission, implemented and co-funded by the European Commission, ESA, EUMETSAT and the USA, through NASA and the
+    National Oceanic and Atmospheric Administration (NOAA).
+  instrument: Poseidon-4
+  platform: SENTINEL6-A
+  platformSerialIdentifier: S6A
+  processingLevel: L1A
+  keywords: SENTINEL,SENTINEL6,S6,S6A,LEO,L1A,ALTIMETRIC,HR,POSEIDON4,P4,F06
+  sensorType: ALTIMETRIC
+  license: proprietary
+  title: Sentinel 6 - Poseidon-4 Altimetry Level 1A High Resolution Reprocessed at F06
+  missionStartDate: "2020-12-17T00:00:00Z"
+
+S6_P4_L1BLR_F06:
+  abstract: |
+    This is a reprocessed dataset at baseline F06, which is continued by the NRT/NTC data stream from 29/April/2022
+    onwards. The Level-1B LR product is output of the LR processor. It includes geo-located, and fully calibrated
+    pulse-limited low-resolution Ku-band and C-band waveforms. This product is most relevant to geophysical retrieval
+    algorithm developers (over ocean, land and ice surfaces), surface characterisations studies (e.g. impact of sea
+    state bias, wave directional effects etc) and Quality Control systems. Sentinel-6 is part of a series of Sentinel
+    satellites, under the umbrella of the EU Copernicus programme. It is a collaborative Copernicus mission, implemented
+    and co-funded by the European Commission, ESA, EUMETSAT and the USA, through NASA and the National Oceanic and
+    Atmospheric Administration (NOAA).
+  instrument: Poseidon-4
+  platform: SENTINEL6-A
+  platformSerialIdentifier: S6A
+  processingLevel: L1B
+  keywords: SENTINEL,SENTINEL6,S6,S6A,LEO,L1B,ALTIMETRIC,LR,POSEIDON4,P4,F06
+  sensorType: ALTIMETRIC
+  license: proprietary
+  title: Sentinel 6 - Poseidon-4 Altimetry Level 1B Low Resolution Reprocessed at F06
+  missionStartDate: "2020-12-17T00:00:00Z"
+
+S6_P4_L1BAHR_F06:
+  abstract: |
+    This is a reprocessed dataset at baseline F06, which is continued by the NRT/NTC data stream from 29/April/2022
+    onwards. The Level-1B HR product is output of the HR processor. It includes geo-located, and fully calibrated
+    multi-looked high-resolution Ku-band waveforms. This product is most relevant to geophysical retrieval algorithm
+    developers (over ocean, land and ice surfaces), surface characterisations studies (e.g. impact of sea state bias,
+    wave directional effects etc.) and Quality Control systems. Sentinel-6 is part of a series of Sentinel satellites,
+    under the umbrella of the EU Copernicus programme. It is a collaborative Copernicus mission, implemented and
+    co-funded by the European Commission, ESA, EUMETSAT and the USA, through NASA and the National Oceanic and
+    Atmospheric Administration (NOAA).
+  instrument: Poseidon-4
+  platform: SENTINEL6-A
+  platformSerialIdentifier: S6A
+  processingLevel: L1B
+  keywords: SENTINEL,SENTINEL6,S6,S6A,LEO,L1B,ALTIMETRIC,HR,POSEIDON4,P4,F06
+  sensorType: ALTIMETRIC
+  license: proprietary
+  title: Sentinel 6 - Poseidon-4 Altimetry Level 1B High Resolution Reprocessed at F06
+  missionStartDate: "2020-12-17T00:00:00Z"
+
+S6_P4_L2LR_F06:
+  abstract: |
+    This is a reprocessed dataset at baseline F06, which is continued by the NRT/NTC data stream from 29/April/2022
+    onwards. The product contain the typical altimetry measurements, like the altimeter range, the sea surface height,
+    the wind speed, significant wave height and all required geophysical corrections and related flags derived from LR.
+    Two measurement data files are available (standard and reduced), each with a different number of variables. The
+    standard data file includes 1 Hz and 20 Hz measurements for the Ku- and C-bands as well as geophysical corrections
+    at 1 Hz and some at 20 Hz. The reduced data file contains only 1 Hz measurements for the Ku- and C-bands as well as
+    geophysical corrections at 1 Hz. These products are suitable for users seeking information on sea state and those
+    creating downstream added value products from multiple altimeters. Sentinel-6 is part of a series of Sentinel
+    satellites, under the umbrella of the EU Copernicus programme. It is a collaborative Copernicus mission, implemented
+    and co-funded by the European Commission, ESA, EUMETSAT and the USA, through NASA and the National Oceanic and
+    Atmospheric Administration (NOAA).
+  instrument: Poseidon-4
+  platform: SENTINEL6-A
+  platformSerialIdentifier: S6A
+  processingLevel: L2
+  keywords: SENTINEL,SENTINEL6,S6,S6A,LEO,L2,ALTIMETRIC,LR,POSEIDON4,P4,F06
+  sensorType: ALTIMETRIC
+  license: proprietary
+  title: Sentinel 6 - Poseidon-4 Altimetry Level 2 Low Resolution Reprocessed at F06
+  missionStartDate: "2020-12-17T00:00:00Z"
+
+S6_P4_L2HR_F06:
+  abstract: |
+    This is a reprocessed dataset at baseline F06, which is continued by the NRT/NTC data stream from 29/April/2022
+    onwards. The level-2 high resolution products contain the typical altimetry measurements, like the altimeter range,
+    the sea surface height, the wind speed, significant wave height and all required geophysical corrections and related
+    flags derived either from RAW or RMC, or the combination of both. Two measurement data files are available
+    (standard and reduced), each with a different number of variables. The standard data file includes 1 Hz and 20 Hz
+    measurements for the Ku- band as well as geophysical corrections at 1 Hz and some at 20 Hz. The reduced data file
+    contains only 1 Hz measurements for the Ku- and C-bands as well as geophysical corrections at 1 Hz. Note that the
+    HR data products only contain Ku-band measurements. These products are suitable for users seeking information on
+    sea state and those creating downstream added value products from multiple altimeters. Particularly for those
+    seeking the highest resolution measurements. Sentinel-6 is part of a series of Sentinel satellites, under the
+    umbrella of the EU Copernicus programme. It is a collaborative Copernicus mission, implemented and co-funded by the
+    European Commission, ESA, EUMETSAT and the USA, through NASA and the National Oceanic and Atmospheric
+    Administration (NOAA).
+  instrument: Poseidon-4
+  platform: SENTINEL6-A
+  platformSerialIdentifier: S6A
+  processingLevel: L2
+  keywords: SENTINEL,SENTINEL6,S6,S6A,LEO,L2,ALTIMETRIC,HR,POSEIDON4,P4,F06
+  sensorType: ALTIMETRIC
+  license: proprietary
+  title: Sentinel 6 - Poseidon-4 Altimetry Level 2 High Resolution Reprocessed at F06
+  missionStartDate: "2020-12-17T00:00:00Z"
+
+S6_AMR_L2_F06:
+  abstract: |
+    This is a reprocessed dataset at baseline F06, which is continued by the NRT/NTC data stream from 29/April/2022
+    onwards. AMR-C Level 2 Products as generated by the AMR-C CFI Processor. These products include antenna and
+    brightness temperatures, wet tropospheric correction, water vapour content, and a rain flag. Sentinel-6 is part of
+    a series of Sentinel satellites, under the umbrella of the EU Copernicus programme. It is a collaborative
+    Copernicus mission, implemented and co-funded by the European Commission, ESA, EUMETSAT and the USA, through NASA
+    and the National Oceanic and Atmospheric Administration (NOAA).
+  instrument: AMR-C
+  platform: SENTINEL6-A
+  platformSerialIdentifier: S6A
+  processingLevel: L2
+  keywords: SENTINEL,SENTINEL6,S6,S6A,LEO,L2,AMR-C,RADIOMETER,MICROWAVE,F06
+  sensorType: RADIOMETER
+  license: proprietary
+  title: Sentinel 6 - Climate-quality Advanced Microwave Radiometer Level 2 Products Reprocessed at F06
+  missionStartDate: "2020-11-28T00:00:00Z"
+
 # SPOT ------------------------------------------------------------------------
 SPOT_SWH:
   abstract: |
diff --git a/eodag/resources/providers.yml b/eodag/resources/providers.yml
index 9765bec4..608e45d5 100644
--- a/eodag/resources/providers.yml
+++ b/eodag/resources/providers.yml
@@ -3412,6 +3412,9 @@
         cloudCover:
           - '{{"stringInputValues": [{{"name": "cloudCover", "value": "{cloudCover}"}}]}}'
           - '$.extraInformation.cloudCover'
+        productIdentifier:
+          - '{{"stringInputValues": [{{"name": "productIdentifier", "value": "{productIdentifier}"}}]}}'
+          - '$.null'
     S2_MSI_L2A:
       productType: EO:ESA:DAT:SENTINEL-2:MSI
       processingLevel: S2MSI2A
@@ -3425,63 +3428,247 @@
         cloudCover:
           - '{{"stringInputValues": [{{"name": "cloudCover", "value": "{cloudCover}"}}]}}'
           - '$.extraInformation.cloudCover'
+        productIdentifier:
+          - '{{"stringInputValues": [{{"name": "productIdentifier", "value": "{productIdentifier}"}}]}}'
+          - '$.null'
+    S2_MSI_L2AP:
+      productType: EO:ESA:DAT:SENTINEL-2:MSI
+      processingLevel: S2MSI2AP
+      metadata_mapping:
+        id:
+          - '{{"stringInputValues": [{{"name": "productIdentifier", "value": "{id}"}}]}}'
+          - '{$.productInfo.product#remove_extension}'
+        processingLevel:
+          - '{{"stringChoiceValues": [{{"name": "processingLevel", "value": "{processingLevel}"}}]}}'
+          - '{$.productInfo.product#get_processing_level_from_s2_id}'
+        cloudCover:
+          - '{{"stringInputValues": [{{"name": "cloudCover", "value": "{cloudCover}"}}]}}'
+          - '$.extraInformation.cloudCover'
+        productIdentifier:
+          - '{{"stringInputValues": [{{"name": "productIdentifier", "value": "{productIdentifier}"}}]}}'
+          - '$.null'
     S1_SAR_GRD:
       productType: EO:ESA:DAT:SENTINEL-1:SAR
+      providerProductType: "GRD"
       metadata_mapping:
         id:
-          - '{{"stringChoiceValues": [{{"name": "productType", "value": {id#split_id_into_s1_params}["productType"]}}, {{"name": "sensorMode", "value": {id#split_id_into_s1_params}["sensorMode"]}}, {{"name": "processingLevel", "value": {id#split_id_into_s1_params}["processingLevel"]}}], "dateRangeSelectValues": [{{"name": "position", "start": {id#split_id_into_s1_params}["startDate"], "end": {id#split_id_into_s1_params}["endDate"]}}]}}'
+          - '{{"stringChoiceValues": [{{"name": "productType", "value": "GRD"}}, {{"name": "sensorMode", "value": {id#split_id_into_s1_params}["sensorMode"]}}, {{"name": "processingLevel", "value": {id#split_id_into_s1_params}["processingLevel"]}}], "dateRangeSelectValues": [{{"name": "position", "start": {id#split_id_into_s1_params}["startDate"], "end": {id#split_id_into_s1_params}["endDate"]}}]}}'
           - '{$.productInfo.product#remove_extension}'
+        startTimeFromAscendingNode:
+          - '{{"dateRangeSelectValues": [{{"name": "position", "start": "{startTimeFromAscendingNode#to_iso_utc_datetime}", "end": "{completionTimeFromAscendingNode#to_iso_utc_datetime}"}}]}}'
+          - '$.productInfo.productStartDate'
+        completionTimeFromAscendingNode:
+          - '{{"dateRangeSelectValues": [{{"name": "position", "start": "{startTimeFromAscendingNode#to_iso_utc_datetime}", "end": "{completionTimeFromAscendingNode#to_iso_utc_datetime}"}}]}}'
+          - '$.productInfo.productEndDate'
+        providerProductType:
+          - '{{"stringChoiceValues": [{{"name": "productType", "value": "{providerProductType}"}}]}}'
+          - '$.null'
         processingLevel:
-          - '{{"stringChoiceValues": [{{"name": "processingLevel", "value": "{processingLevel}"}}, {{"name": "sensorMode", "value": "{sensorMode}"}}]}}'
+          - '{{"stringChoiceValues": [{{"name": "processingLevel", "value": "{processingLevel}"}}]}}'
           - '{$.productInfo.product#get_processing_level_from_s1_id}'
         sensorMode:
-          - '{{"stringChoiceValues": [{{"name": "processingLevel", "value": "{processingLevel}"}}, {{"name": "sensorMode", "value": "{sensorMode}"}}]}}'
+          - '{{"stringChoiceValues": [{{"name": "sensorMode", "value": "{sensorMode}"}}]}}'
           - '{$.productInfo.product#get_sensor_mode_from_s1_id}'
-    S1_SAR_SLC:
-      productType: EO:ESA:DAT:EODC-SENTINEL-1:L1_SLC
+        swath:
+          - '{{"stringChoiceValues": [{{"name": "swath", "value": "{swath}"}}]}}'
+          - '$.null'
+        timeliness:
+          - '{{"stringChoiceValues": [{{"name": "timeliness", "value": "{timeliness}"}}]}}'
+          - '$.null'
+        orbitDirection:
+          - '{{"stringChoiceValues": [{{"name": "orbitDirection", "value": "{orbitDirection}"}}]}}'
+          - '$.null'
+        polarisation:
+          - '{{"stringChoiceValues": [{{"name": "polarisation", "value": "{polarisation}"}}]}}'
+          - '$.null'
+        relativeOrbitNumber:
+          - '{{"stringInputValues": [{{"name": "relativeOrbitNumber", "value": "{relativeOrbitNumber}"}}]}}'
+          - '$.null'
+        missionTakeId:
+          - '{{"stringInputValues": [{{"name": "missionTakeId", "value": "{missionTakeId}"}}]}}'
+          - '$.null'
+    S1_SAR_RAW:
+      productType: EO:ESA:DAT:SENTINEL-1:SAR
+      providerProductType: "RAW"
       metadata_mapping:
         id:
-          - '{{"stringChoiceValues": [{{"name": "mode", "value": {id#split_id_into_s1_params}["sensorMode"]}}, {{"name": "polarisation", "value": {id#split_id_into_s1_params}["polarisation"]}}], "dateRangeSelectValues": [{{"name": "time", "start": {id#split_id_into_s1_params}["startDate"], "end": {id#split_id_into_s1_params}["endDate"]}}], "boundingBoxValues": [{{"name": "bbox", "bbox": [-90, -180, 90, 180]}}]}}'
+          - '{{"stringChoiceValues": [{{"name": "productType", "value": "RAW"}}, {{"name": "sensorMode", "value": {id#split_id_into_s1_params}["sensorMode"]}}, {{"name": "processingLevel", "value": {id#split_id_into_s1_params}["processingLevel"]}}], "dateRangeSelectValues": [{{"name": "position", "start": {id#split_id_into_s1_params}["startDate"], "end": {id#split_id_into_s1_params}["endDate"]}}]}}'
           - '{$.productInfo.product#remove_extension}'
         startTimeFromAscendingNode:
-          - '{{"dateRangeSelectValues": [{{"name": "time", "start": "{startTimeFromAscendingNode#to_iso_utc_datetime}", "end": "{completionTimeFromAscendingNode#to_iso_utc_datetime}"}}]}}'
+          - '{{"dateRangeSelectValues": [{{"name": "position", "start": "{startTimeFromAscendingNode#to_iso_utc_datetime}", "end": "{completionTimeFromAscendingNode#to_iso_utc_datetime}"}}]}}'
           - '$.productInfo.productStartDate'
         completionTimeFromAscendingNode:
-          - '{{"dateRangeSelectValues": [{{"name": "time", "start": "{startTimeFromAscendingNode#to_iso_utc_datetime}", "end": "{completionTimeFromAscendingNode#to_iso_utc_datetime}"}}]}}'
+          - '{{"dateRangeSelectValues": [{{"name": "position", "start": "{startTimeFromAscendingNode#to_iso_utc_datetime}", "end": "{completionTimeFromAscendingNode#to_iso_utc_datetime}"}}]}}'
           - '$.productInfo.productEndDate'
+        providerProductType:
+          - '{{"stringChoiceValues": [{{"name": "productType", "value": "{providerProductType}"}}]}}'
+          - '$.null'
+        processingLevel:
+          - '{{"stringChoiceValues": [{{"name": "processingLevel", "value": "{processingLevel}"}}]}}'
+          - '{$.productInfo.product#get_processing_level_from_s1_id}'
         sensorMode:
           - '{{"stringChoiceValues": [{{"name": "sensorMode", "value": "{sensorMode}"}}]}}'
           - '{$.productInfo.product#get_sensor_mode_from_s1_id}'
-    S3_OLCI_L2LRR:
-      productType: EO:ESA:DAT:SENTINEL-3:OL_2_LRR___
+        swath:
+          - '{{"stringChoiceValues": [{{"name": "swath", "value": "{swath}"}}]}}'
+          - '$.null'
+        timeliness:
+          - '{{"stringChoiceValues": [{{"name": "timeliness", "value": "{timeliness}"}}]}}'
+          - '$.null'
+        orbitDirection:
+          - '{{"stringChoiceValues": [{{"name": "orbitDirection", "value": "{orbitDirection}"}}]}}'
+          - '$.null'
+        polarisation:
+          - '{{"stringChoiceValues": [{{"name": "polarisation", "value": "{polarisation}"}}]}}'
+          - '$.null'
+        relativeOrbitNumber:
+          - '{{"stringInputValues": [{{"name": "relativeOrbitNumber", "value": "{relativeOrbitNumber}"}}]}}'
+          - '$.null'
+        missionTakeId:
+          - '{{"stringInputValues": [{{"name": "missionTakeId", "value": "{missionTakeId}"}}]}}'
+          - '$.null'
+    S1_SAR_OCN:
+      productType: EO:ESA:DAT:SENTINEL-1:SAR
+      providerProductType: "OCN"
       metadata_mapping:
         id:
-          - '{{"stringChoiceValues": [{{"name": "productType", "value": "LRR"}}, {{"name": "timeliness", "value": {id#split_id_into_s3_params}["timeliness"]}}], "dateRangeSelectValues": [{{"name": "position", "start": {id#split_id_into_s3_params}["startDate"], "end": {id#split_id_into_s3_params}["endDate"]}}]}}'
+          - '{{"stringChoiceValues": [{{"name": "productType", "value": "OCN"}}, {{"name": "sensorMode", "value": {id#split_id_into_s1_params}["sensorMode"]}}, {{"name": "processingLevel", "value": {id#split_id_into_s1_params}["processingLevel"]}}], "dateRangeSelectValues": [{{"name": "position", "start": {id#split_id_into_s1_params}["startDate"], "end": {id#split_id_into_s1_params}["endDate"]}}]}}'
           - '{$.productInfo.product#remove_extension}'
         startTimeFromAscendingNode:
-          - '{{"stringChoiceValues": [{{"name": "productType", "value": "LRR"}}], "dateRangeSelectValues": [{{"name": "position", "start": "{startTimeFromAscendingNode#to_iso_utc_datetime}", "end": "{completionTimeFromAscendingNode#to_iso_utc_datetime}"}}]}}'
+          - '{{"dateRangeSelectValues": [{{"name": "position", "start": "{startTimeFromAscendingNode#to_iso_utc_datetime}", "end": "{completionTimeFromAscendingNode#to_iso_utc_datetime}"}}]}}'
           - '$.productInfo.productStartDate'
         completionTimeFromAscendingNode:
-          - '{{"stringChoiceValues": [{{"name": "productType", "value": "LRR"}}], "dateRangeSelectValues": [{{"name": "position", "start": "{startTimeFromAscendingNode#to_iso_utc_datetime}", "end": "{completionTimeFromAscendingNode#to_iso_utc_datetime}"}}]}}'
+          - '{{"dateRangeSelectValues": [{{"name": "position", "start": "{startTimeFromAscendingNode#to_iso_utc_datetime}", "end": "{completionTimeFromAscendingNode#to_iso_utc_datetime}"}}]}}'
           - '$.productInfo.productEndDate'
-    S3_OLCI_L2LFR:
-      productType: EO:ESA:DAT:SENTINEL-3:OL_2_LFR___
+        providerProductType:
+          - '{{"stringChoiceValues": [{{"name": "productType", "value": "{providerProductType}"}}]}}'
+          - '$.null'
+        processingLevel:
+          - '{{"stringChoiceValues": [{{"name": "processingLevel", "value": "{processingLevel}"}}]}}'
+          - '{$.productInfo.product#get_processing_level_from_s1_id}'
+        sensorMode:
+          - '{{"stringChoiceValues": [{{"name": "sensorMode", "value": "{sensorMode}"}}]}}'
+          - '{$.productInfo.product#get_sensor_mode_from_s1_id}'
+        swath:
+          - '{{"stringChoiceValues": [{{"name": "swath", "value": "{swath}"}}]}}'
+          - '$.null'
+        timeliness:
+          - '{{"stringChoiceValues": [{{"name": "timeliness", "value": "{timeliness}"}}]}}'
+          - '$.null'
+        orbitDirection:
+          - '{{"stringChoiceValues": [{{"name": "orbitDirection", "value": "{orbitDirection}"}}]}}'
+          - '$.null'
+        polarisation:
+          - '{{"stringChoiceValues": [{{"name": "polarisation", "value": "{polarisation}"}}]}}'
+          - '$.null'
+        relativeOrbitNumber:
+          - '{{"stringInputValues": [{{"name": "relativeOrbitNumber", "value": "{relativeOrbitNumber}"}}]}}'
+          - '$.null'
+        missionTakeId:
+          - '{{"stringInputValues": [{{"name": "missionTakeId", "value": "{missionTakeId}"}}]}}'
+          - '$.null'
+    S1_SAR_SLC:
+      productType: EO:ESA:DAT:SENTINEL-1:SAR
+      providerProductType: SLC
       metadata_mapping:
         id:
-          - '{{"stringChoiceValues": [{{"name": "productType", "value": "OL_2_LFR___"}}, {{"name": "timeliness", "value": {id#split_id_into_s3_params}["timeliness"]}}], "dateRangeSelectValues": [{{"name": "position", "start": {id#split_id_into_s3_params}["startDate"], "end": {id#split_id_into_s3_params}["endDate"]}}]}}'
+          - '{{"stringChoiceValues": [{{"name": "productType", "value": "SLC"}}, {{"name": "sensorMode", "value": {id#split_id_into_s1_params}["sensorMode"]}}, {{"name": "processingLevel", "value": {id#split_id_into_s1_params}["processingLevel"]}}], "dateRangeSelectValues": [{{"name": "position", "start": {id#split_id_into_s1_params}["startDate"], "end": {id#split_id_into_s1_params}["endDate"]}}]}}'
           - '{$.productInfo.product#remove_extension}'
         startTimeFromAscendingNode:
-          - '{{"stringChoiceValues": [{{"name": "productType", "value": "OL_2_LFR___"}}], "dateRangeSelectValues": [{{"name": "position", "start": "{startTimeFromAscendingNode#to_iso_utc_datetime}", "end": "{completionTimeFromAscendingNode#to_iso_utc_datetime}"}}]}}'
+          - '{{"dateRangeSelectValues": [{{"name": "position", "start": "{startTimeFromAscendingNode#to_iso_utc_datetime}", "end": "{completionTimeFromAscendingNode#to_iso_utc_datetime}"}}]}}'
           - '$.productInfo.productStartDate'
         completionTimeFromAscendingNode:
-          - '{{"stringChoiceValues": [{{"name": "productType", "value": "OL_2_LFR___"}}], "dateRangeSelectValues": [{{"name": "position", "start": "{startTimeFromAscendingNode#to_iso_utc_datetime}", "end": "{completionTimeFromAscendingNode#to_iso_utc_datetime}"}}]}}'
+          - '{{"dateRangeSelectValues": [{{"name": "position", "start": "{startTimeFromAscendingNode#to_iso_utc_datetime}", "end": "{completionTimeFromAscendingNode#to_iso_utc_datetime}"}}]}}'
           - '$.productInfo.productEndDate'
+        providerProductType:
+          - '{{"stringChoiceValues": [{{"name": "productType", "value": "{providerProductType}"}}]}}'
+          - '$.null'
+        processingLevel:
+          - '{{"stringChoiceValues": [{{"name": "processingLevel", "value": "{processingLevel}"}}]}}'
+          - '{$.productInfo.product#get_processing_level_from_s1_id}'
+        sensorMode:
+          - '{{"stringChoiceValues": [{{"name": "sensorMode", "value": "{sensorMode}"}}]}}'
+          - '{$.productInfo.product#get_sensor_mode_from_s1_id}'
+        swath:
+          - '{{"stringChoiceValues": [{{"name": "swath", "value": "{swath}"}}]}}'
+          - '$.null'
+        timeliness:
+          - '{{"stringChoiceValues": [{{"name": "timeliness", "value": "{timeliness}"}}]}}'
+          - '$.null'
+        orbitDirection:
+          - '{{"stringChoiceValues": [{{"name": "orbitDirection", "value": "{orbitDirection}"}}]}}'
+          - '$.null'
+        polarisation:
+          - '{{"stringChoiceValues": [{{"name": "polarisation", "value": "{polarisation}"}}]}}'
+          - '$.null'
+        relativeOrbitNumber:
+          - '{{"stringInputValues": [{{"name": "relativeOrbitNumber", "value": "{relativeOrbitNumber}"}}]}}'
+          - '$.null'
+        missionTakeId:
+          - '{{"stringInputValues": [{{"name": "missionTakeId", "value": "{missionTakeId}"}}]}}'
+          - '$.null'
+    S3_OLCI_L2LRR:
+      productType: EO:ESA:DAT:SENTINEL-3:OL_2_LRR___
+      providerProductType: LRR
+      processingLevel: 2
+      metadata_mapping:
+        id:
+          - '{{"stringChoiceValues": [{{"name": "productType", "value": "LRR"}}, {{"name": "timeliness", "value": {id#split_id_into_s3_params}["timeliness"]}}], "dateRangeSelectValues": [{{"name": "position", "start": {id#split_id_into_s3_params}["startDate"], "end": {id#split_id_into_s3_params}["endDate"]}}]}}'
+          - '{$.productInfo.product#remove_extension}'
+        providerProductType:
+          - '{{"stringChoiceValues": [{{"name": "productType", "value": "{providerProductType}"}}]}}'
+          - '$.null'
+        processingLevel:
+          - '{{"stringChoiceValues": [{{"name": "processingLevel", "value": "{processingLevel}"}}]}}'
+          - '2'
+        timeliness:
+          - '{{"stringChoiceValues": [{{"name": "timeliness", "value": "{timeliness}"}}]}}'
+          - '$.null'
+        orbitDirection:
+          - '{{"stringChoiceValues": [{{"name": "orbitDirection", "value": "{orbitDirection}"}}]}}'
+          - '$.null'
+    S3_OLCI_L2LFR:
+      productType: EO:ESA:DAT:SENTINEL-3:OL_2_LFR___
+      providerProductType: OL_2_LFR___
+      processingLevel: 2
+      metadata_mapping:
+        id:
+          - '{{"stringChoiceValues": [{{"name": "productType", "value": "OL_2_LFR___"}}, {{"name": "timeliness", "value": {id#split_id_into_s3_params}["timeliness"]}}], "dateRangeSelectValues": [{{"name": "position", "start": {id#split_id_into_s3_params}["startDate"], "end": {id#split_id_into_s3_params}["endDate"]}}]}}'
+          - '{$.productInfo.product#remove_extension}'
+        providerProductType:
+          - '{{"stringChoiceValues": [{{"name": "productType", "value": "{providerProductType}"}}]}}'
+          - '$.null'
+        processingLevel:
+          - '{{"stringChoiceValues": [{{"name": "processingLevel", "value": "{processingLevel}"}}]}}'
+          - '2'
+        timeliness:
+          - '{{"stringChoiceValues": [{{"name": "timeliness", "value": "{timeliness}"}}]}}'
+          - '$.null'
+        orbitDirection:
+          - '{{"stringChoiceValues": [{{"name": "orbitDirection", "value": "{orbitDirection}"}}]}}'
+          - '$.null'
     S3_SY_SYN:
       productType: EO:ESA:DAT:SENTINEL-3:SYNERGY
+      processingLevel: 2
       metadata_mapping:
         id:
           - '{{"stringChoiceValues": [{{"name": "timeliness", "value": {id#split_id_into_s3_params}["timeliness"]}}, {{"name": "productType", "value": {id#split_id_into_s3_params}["productType"]}}], "dateRangeSelectValues": [{{"name": "position", "start": {id#split_id_into_s3_params}["startDate"], "end": {id#split_id_into_s3_params}["endDate"]}}]}}'
           - '{$.productInfo.product#remove_extension}'
+        providerProductType:
+          - '{{"stringChoiceValues": [{{"name": "productType", "value": "{providerProductType}"}}]}}'
+          - '$.null'
+        processingLevel:
+          - '{{"stringChoiceValues": [{{"name": "processingLevel", "value": "{processingLevel}"}}]}}'
+          - '2'
+        timeliness:
+          - '{{"stringChoiceValues": [{{"name": "timeliness", "value": "{timeliness}"}}]}}'
+          - '$.null'
+        orbitDirection:
+          - '{{"stringChoiceValues": [{{"name": "orbitDirection", "value": "{orbitDirection}"}}]}}'
+          - '$.null'
+        cloudCover:
+          - '{{"stringInputValues": [{{"name": "cloudCover", "value": "{cloudCover}"}}]}}'
+          - '$.extraInformation.cloudCover'
       # additional filtering to only return the desired product types (defining datasetId EO:ESA:DAT:SENTINEL-3:SYNERGY is not enough for that)
       custom_filters:
         filter_attribute: "$.productInfo.product"
@@ -3489,56 +3676,110 @@
         filter_clause: "in ['SY_2_AOD___', 'SY_2_V10___', 'SY_2_VGP___', 'SY_2_SYN___', 'SY_2_VG1___']"
     S3_LAN:
       productType: EO:ESA:DAT:SENTINEL-3:SR_2_LAN___
+      providerProductType: SR_2_LAN___
+      processingLevel: 2
       metadata_mapping:
         id:
           - '{{"stringChoiceValues": [{{"name": "productType", "value": "SR_2_LAN___"}}, {{"name": "timeliness", "value": {id#split_id_into_s3_params}["timeliness"]}}], "dateRangeSelectValues": [{{"name": "position", "start": {id#split_id_into_s3_params}["startDate"], "end": {id#split_id_into_s3_params}["endDate"]}}]}}'
           - '{$.productInfo.product#remove_extension}'
-        startTimeFromAscendingNode:
-          - '{{"stringChoiceValues": [{{"name": "productType", "value": "SR_2_LAN___"}}], "dateRangeSelectValues": [{{"name": "position", "start": "{startTimeFromAscendingNode#to_iso_utc_datetime}", "end": "{completionTimeFromAscendingNode#to_iso_utc_datetime}"}}]}}'
-          - '$.productInfo.productStartDate'
-        completionTimeFromAscendingNode:
-          - '{{"stringChoiceValues": [{{"name": "productType", "value": "SR_2_LAN___"}}], "dateRangeSelectValues": [{{"name": "position", "start": "{startTimeFromAscendingNode#to_iso_utc_datetime}", "end": "{completionTimeFromAscendingNode#to_iso_utc_datetime}"}}]}}'
-          - '$.productInfo.productEndDate'
+        providerProductType:
+          - '{{"stringChoiceValues": [{{"name": "productType", "value": "{providerProductType}"}}]}}'
+          - '$.null'
+        processingLevel:
+          - '{{"stringChoiceValues": [{{"name": "processingLevel", "value": "{processingLevel}"}}]}}'
+          - '2'
+        timeliness:
+          - '{{"stringChoiceValues": [{{"name": "timeliness", "value": "{timeliness}"}}]}}'
+          - '$.null'
+        orbitDirection:
+          - '{{"stringChoiceValues": [{{"name": "orbitDirection", "value": "{orbitDirection}"}}]}}'
+          - '$.null'
     S3_SLSTR_L2:
       productType: EO:ESA:DAT:SENTINEL-3:SL_2_LST___
+      providerProductType: SL_2_LST___
+      processingLevel: 2
       metadata_mapping:
         id:
           - '{{"stringChoiceValues": [{{"name": "productType", "value": "SL_2_LST___"}}, {{"name": "timeliness", "value": {id#split_id_into_s3_params}["timeliness"]}}], "dateRangeSelectValues": [{{"name": "position", "start": {id#split_id_into_s3_params}["startDate"], "end": {id#split_id_into_s3_params}["endDate"]}}]}}'
           - '{$.productInfo.product#remove_extension}'
-        startTimeFromAscendingNode:
-          - '{{"stringChoiceValues": [{{"name": "productType", "value": "SL_2_LST___"}}], "dateRangeSelectValues": [{{"name": "position", "start": "{startTimeFromAscendingNode#to_iso_utc_datetime}", "end": "{completionTimeFromAscendingNode#to_iso_utc_datetime}"}}]}}'
-          - '$.productInfo.productStartDate'
-        completionTimeFromAscendingNode:
-          - '{{"stringChoiceValues": [{{"name": "productType", "value": "SL_2_LST___"}}], "dateRangeSelectValues": [{{"name": "position", "start": "{startTimeFromAscendingNode#to_iso_utc_datetime}", "end": "{completionTimeFromAscendingNode#to_iso_utc_datetime}"}}]}}'
-          - '$.productInfo.productEndDate'
+        providerProductType:
+          - '{{"stringChoiceValues": [{{"name": "productType", "value": "{providerProductType}"}}]}}'
+          - '$.null'
+        processingLevel:
+          - '{{"stringChoiceValues": [{{"name": "processingLevel", "value": "{processingLevel}"}}]}}'
+          - '2'
+        timeliness:
+          - '{{"stringChoiceValues": [{{"name": "timeliness", "value": "{timeliness}"}}]}}'
+          - '$.null'
+        orbitDirection:
+          - '{{"stringChoiceValues": [{{"name": "orbitDirection", "value": "{orbitDirection}"}}]}}'
+          - '$.null'
     S3_SLSTR_L2AOD:
       productType: EO:EUM:DAT:SENTINEL-3:0416
+      providerProductType: SL_2_AOD___
+      timeliness: NR
       metadata_mapping:
         id:
           - '{{"stringChoiceValues": [{{"name": "type", "value": "SL_2_AOD___"}}, {{"name": "timeliness", "value": "NR"}}, {{"name": "sat", "value": {id#split_id_into_s3_params}["sat"]}}], "dateRangeSelectValues": [{{"name": "position", "start": {id#split_id_into_s3_params}["startDate"], "end": {id#split_id_into_s3_params}["endDate"]}}]}}'
           - '{$.productInfo.product#remove_extension}'
-        startTimeFromAscendingNode:
-          - '{{"stringChoiceValues": [{{"name": "type", "value": "SL_2_AOD___"}}], "dateRangeSelectValues": [{{"name": "position", "start": "{startTimeFromAscendingNode#to_iso_utc_datetime}", "end": "{completionTimeFromAscendingNode#to_iso_utc_datetime}"}}]}}'
-          - '$.productInfo.productStartDate'
-        completionTimeFromAscendingNode:
-          - '{{"stringChoiceValues": [{{"name": "type", "value": "SL_2_AOD___"}}], "dateRangeSelectValues": [{{"name": "position", "start": "{startTimeFromAscendingNode#to_iso_utc_datetime}", "end": "{completionTimeFromAscendingNode#to_iso_utc_datetime}"}}]}}'
-          - '$.productInfo.productEndDate'
+        providerProductType:
+          - '{{"stringChoiceValues": [{{"name": "type", "value": "{providerProductType}"}}]}}'
+          - '$.null'
+        platform:
+          - '{{"stringChoiceValues": [{{"name": "sat", "value": "{platform}"}}]}}'
+          - '$.null'
+        timeliness:
+          - '{{"stringChoiceValues": [{{"name": "timeliness", "value": "{timeliness}"}}]}}'
+          - '$.null'
+        orbitDirection:
+          - '{{"stringChoiceValues": [{{"name": "orbitdir", "value": "{orbitDirection}"}}]}}'
+          - '$.null'
+        relativeOrbitNumber:
+          - '{{"stringInputValues": [{{"name": "relorbit", "value": "{relativeOrbitNumber}"}}]}}'
+          - '$.null'
+        orbitNumber:
+          - '{{"stringInputValues": [{{"name": "orbit", "value": "{orbitNumber}"}}]}}'
+          - '$.null'
+        cycleNumber:
+          - '{{"stringInputValues": [{{"name": "cycle", "value": "{cycleNumber}"}}]}}'
+          - '$.null'
         defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))' # geometry is not available for this product type
     S3_SLSTR_L2FRP:
       productType: EO:EUM:DAT:SENTINEL-3:0417
+      providerProductType: SL_2_FRP___
+      timeliness: NR
       metadata_mapping:
         id:
           - '{{"stringChoiceValues": [{{"name": "type", "value": "SL_2_FRP___"}}, {{"name": "timeliness", "value": "NR"}}, {{"name": "sat", "value": {id#split_id_into_s3_params}["sat"]}}], "dateRangeSelectValues": [{{"name": "position", "start": {id#split_id_into_s3_params}["startDate"], "end": {id#split_id_into_s3_params}["endDate"]}}]}}'
           - '{$.productInfo.product#remove_extension}'
-        startTimeFromAscendingNode:
-          - '{{"stringChoiceValues": [{{"name": "type", "value": "SL_2_FRP___"}}], "dateRangeSelectValues": [{{"name": "position", "start": "{startTimeFromAscendingNode#to_iso_utc_datetime}", "end": "{completionTimeFromAscendingNode#to_iso_utc_datetime}"}}]}}'
-          - '$.productInfo.productStartDate'
-        completionTimeFromAscendingNode:
-          - '{{"stringChoiceValues": [{{"name": "type", "value": "SL_2_FRP___"}}], "dateRangeSelectValues": [{{"name": "position", "start": "{startTimeFromAscendingNode#to_iso_utc_datetime}", "end": "{completionTimeFromAscendingNode#to_iso_utc_datetime}"}}]}}'
-          - '$.productInfo.productEndDate'
+        providerProductType:
+          - '{{"stringChoiceValues": [{{"name": "type", "value": "{providerProductType}"}}]}}'
+          - '$.null'
+        platform:
+          - '{{"stringChoiceValues": [{{"name": "sat", "value": "{platform}"}}]}}'
+          - '$.null'
+        timeliness:
+          - '{{"stringChoiceValues": [{{"name": "timeliness", "value": "{timeliness}"}}]}}'
+          - '$.null'
+        orbitDirection:
+          - '{{"stringChoiceValues": [{{"name": "orbitdir", "value": "{orbitDirection}"}}]}}'
+          - '$.null'
+        fire:
+          - '{{"stringChoiceValues": [{{"name": "fire", "value": "{fire}"}}]}}'
+          - '$.null'
+        relativeOrbitNumber:
+          - '{{"stringInputValues": [{{"name": "relorbit", "value": "{relativeOrbitNumber}"}}]}}'
+          - '$.null'
+        orbitNumber:
+          - '{{"stringInputValues": [{{"name": "orbit", "value": "{orbitNumber}"}}]}}'
+          - '$.null'
+        cycleNumber:
+          - '{{"stringInputValues": [{{"name": "cycle", "value": "{cycleNumber}"}}]}}'
+          - '$.null'
         defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))' # geometry is not available for this product type
     S3_EFR:
       productType: EO:EUM:DAT:SENTINEL-3:OL_1_EFR___
+      providerProductType: OL_1_EFR___
       metadata_mapping:
         productType:
           - '{{"datasetId": "EO:EUM:DAT:SENTINEL-3:0577"}}'
@@ -3546,15 +3787,31 @@
         id:
           - '{{"stringChoiceValues": [{{"name": "type", "value": "OL_1_EFR___"}}, {{"name": "timeliness", "value": "NT"}}, {{"name": "sat", "value": {id#split_id_into_s3_params}["sat"]}}], "dateRangeSelectValues": [{{"name": "position", "start": {id#split_id_into_s3_params}["startDate"], "end": {id#split_id_into_s3_params}["endDate"]}}]}}'
           - '{$.productInfo.product#remove_extension}'
-        startTimeFromAscendingNode:
-          - '{{"stringChoiceValues": [{{"name": "type", "value": "OL_1_EFR___"}}], "dateRangeSelectValues": [{{"name": "position", "start": "{startTimeFromAscendingNode#to_iso_utc_datetime}", "end": "{completionTimeFromAscendingNode#to_iso_utc_datetime}"}}]}}'
-          - '$.productInfo.productStartDate'
-        completionTimeFromAscendingNode:
-          - '{{"stringChoiceValues": [{{"name": "type", "value": "OL_1_EFR___"}}], "dateRangeSelectValues": [{{"name": "position", "start": "{startTimeFromAscendingNode#to_iso_utc_datetime}", "end": "{completionTimeFromAscendingNode#to_iso_utc_datetime}"}}]}}'
-          - '$.productInfo.productEndDate'
+        providerProductType:
+          - '{{"stringChoiceValues": [{{"name": "type", "value": "{providerProductType}"}}]}}'
+          - '$.null'
+        platform:
+          - '{{"stringChoiceValues": [{{"name": "sat", "value": "{platform}"}}]}}'
+          - '$.null'
+        timeliness:
+          - '{{"stringChoiceValues": [{{"name": "timeliness", "value": "{timeliness}"}}]}}'
+          - '$.null'
+        orbitDirection:
+          - '{{"stringChoiceValues": [{{"name": "orbitdir", "value": "{orbitDirection}"}}]}}'
+          - '$.null'
+        relativeOrbitNumber:
+          - '{{"stringInputValues": [{{"name": "relorbit", "value": "{relativeOrbitNumber}"}}]}}'
+          - '$.null'
+        orbitNumber:
+          - '{{"stringInputValues": [{{"name": "orbit", "value": "{orbitNumber}"}}]}}'
+          - '$.null'
+        cycleNumber:
+          - '{{"stringInputValues": [{{"name": "cycle", "value": "{cycleNumber}"}}]}}'
+          - '$.null'
         defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))' # geometry is not available for this product type
     S3_ERR:
       productType: EO:EUM:DAT:SENTINEL-3:OL_1_ERR___
+      providerProductType: OL_1_ERR___
       metadata_mapping:
         productType:
           - '{{"datasetId": "EO:EUM:DAT:SENTINEL-3:0578"}}'
@@ -3562,116 +3819,495 @@
         id:
           - '{{"stringChoiceValues": [{{"name": "type", "value": "OL_1_ERR___"}}, {{"name": "timeliness", "value": "NT"}}, {{"name": "sat", "value": {id#split_id_into_s3_params}["sat"]}}], "dateRangeSelectValues": [{{"name": "position", "start": {id#split_id_into_s3_params}["startDate"], "end": {id#split_id_into_s3_params}["endDate"]}}]}}'
           - '{$.productInfo.product#remove_extension}'
-        startTimeFromAscendingNode:
-          - '{{"stringChoiceValues": [{{"name": "type", "value": "OL_1_ERR___"}}], "dateRangeSelectValues": [{{"name": "position", "start": "{startTimeFromAscendingNode#to_iso_utc_datetime}", "end": "{completionTimeFromAscendingNode#to_iso_utc_datetime}"}}]}}'
-          - '$.productInfo.productStartDate'
-        completionTimeFromAscendingNode:
-          - '{{"stringChoiceValues": [{{"name": "type", "value": "OL_1_ERR___"}}], "dateRangeSelectValues": [{{"name": "position", "start": "{startTimeFromAscendingNode#to_iso_utc_datetime}", "end": "{completionTimeFromAscendingNode#to_iso_utc_datetime}"}}]}}'
-          - '$.productInfo.productEndDate'
+        providerProductType:
+          - '{{"stringChoiceValues": [{{"name": "type", "value": "{providerProductType}"}}]}}'
+          - '$.null'
+        platform:
+          - '{{"stringChoiceValues": [{{"name": "sat", "value": "{platform}"}}]}}'
+          - '$.null'
+        timeliness:
+          - '{{"stringChoiceValues": [{{"name": "timeliness", "value": "{timeliness}"}}]}}'
+          - '$.null'
+        orbitDirection:
+          - '{{"stringChoiceValues": [{{"name": "orbitdir", "value": "{orbitDirection}"}}]}}'
+          - '$.null'
+        relativeOrbitNumber:
+          - '{{"stringInputValues": [{{"name": "relorbit", "value": "{relativeOrbitNumber}"}}]}}'
+          - '$.null'
+        orbitNumber:
+          - '{{"stringInputValues": [{{"name": "orbit", "value": "{orbitNumber}"}}]}}'
+          - '$.null'
+        cycleNumber:
+          - '{{"stringInputValues": [{{"name": "cycle", "value": "{cycleNumber}"}}]}}'
+          - '$.null'
         defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))' # geometry is not available for this product type
     S3_OLCI_L2WFR:
       productType: EO:EUM:DAT:SENTINEL-3:OL_2_WFR___
+      providerProductType: OL_2_WFR___
       metadata_mapping:
         id:
           - '{{"stringChoiceValues": [{{"name": "type", "value": "OL_2_WFR___"}}, {{"name": "timeliness", "value": {id#split_id_into_s3_params}["timeliness"]}}, {{"name": "sat", "value": {id#split_id_into_s3_params}["sat"]}}], "dateRangeSelectValues": [{{"name": "position", "start": {id#split_id_into_s3_params}["startDate"], "end": {id#split_id_into_s3_params}["endDate"]}}]}}'
           - '{$.productInfo.product#remove_extension}'
-        startTimeFromAscendingNode:
-          - '{{"stringChoiceValues": [{{"name": "type", "value": "OL_2_WFR___"}}], "dateRangeSelectValues": [{{"name": "position", "start": "{startTimeFromAscendingNode#to_iso_utc_datetime}", "end": "{completionTimeFromAscendingNode#to_iso_utc_datetime}"}}]}}'
-          - '$.productInfo.productStartDate'
-        completionTimeFromAscendingNode:
-          - '{{"stringChoiceValues": [{{"name": "type", "value": "OL_2_WFR___"}}], "dateRangeSelectValues": [{{"name": "position", "start": "{startTimeFromAscendingNode#to_iso_utc_datetime}", "end": "{completionTimeFromAscendingNode#to_iso_utc_datetime}"}}]}}'
-          - '$.productInfo.productEndDate'
+        providerProductType:
+          - '{{"stringChoiceValues": [{{"name": "type", "value": "{providerProductType}"}}]}}'
+          - '$.null'
+        platform:
+          - '{{"stringChoiceValues": [{{"name": "sat", "value": "{platform}"}}]}}'
+          - '$.null'
+        timeliness:
+          - '{{"stringChoiceValues": [{{"name": "timeliness", "value": "{timeliness}"}}]}}'
+          - '$.null'
+        orbitDirection:
+          - '{{"stringChoiceValues": [{{"name": "orbitdir", "value": "{orbitDirection}"}}]}}'
+          - '$.null'
+        relativeOrbitNumber:
+          - '{{"stringInputValues": [{{"name": "relorbit", "value": "{relativeOrbitNumber}"}}]}}'
+          - '$.null'
+        orbitNumber:
+          - '{{"stringInputValues": [{{"name": "orbit", "value": "{orbitNumber}"}}]}}'
+          - '$.null'
+        cycleNumber:
+          - '{{"stringInputValues": [{{"name": "cycle", "value": "{cycleNumber}"}}]}}'
+          - '$.null'
         defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))' # geometry is not available for this product type
     S3_OLCI_L2WRR:
       productType: EO:EUM:DAT:SENTINEL-3:OL_2_WRR___
+      providerProductType: OL_2_WRR___
       metadata_mapping:
         id:
           - '{{"stringChoiceValues": [{{"name": "type", "value": "OL_2_WRR___"}}, {{"name": "timeliness", "value": {id#split_id_into_s3_params}["timeliness"]}}, {{"name": "sat", "value": {id#split_id_into_s3_params}["sat"]}}], "dateRangeSelectValues": [{{"name": "position", "start": {id#split_id_into_s3_params}["startDate"], "end": {id#split_id_into_s3_params}["endDate"]}}]}}'
           - '{$.productInfo.product#remove_extension}'
-        startTimeFromAscendingNode:
-          - '{{"stringChoiceValues": [{{"name": "type", "value": "OL_2_WRR___"}}], "dateRangeSelectValues": [{{"name": "position", "start": "{startTimeFromAscendingNode#to_iso_utc_datetime}", "end": "{completionTimeFromAscendingNode#to_iso_utc_datetime}"}}]}}'
-          - '$.productInfo.productStartDate'
-        completionTimeFromAscendingNode:
-          - '{{"stringChoiceValues": [{{"name": "type", "value": "OL_2_WRR___"}}], "dateRangeSelectValues": [{{"name": "position", "start": "{startTimeFromAscendingNode#to_iso_utc_datetime}", "end": "{completionTimeFromAscendingNode#to_iso_utc_datetime}"}}]}}'
-          - '$.productInfo.productEndDate'
-        defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))' # geometry is not available for this product type
-    S3_SRA:
-      productType: EO:EUM:DAT:SENTINEL-3:SR_1_SRA___
-      metadata_mapping:
-        id:
-          - '{{"stringChoiceValues": [{{"name": "type", "value": "SR_1_SRA___"}}, {{"name": "timeliness", "value": {id#split_id_into_s3_params}["timeliness"]}}, {{"name": "sat", "value": {id#split_id_into_s3_params}["sat"]}}], "dateRangeSelectValues": [{{"name": "position", "start": {id#split_id_into_s3_params}["startDate"], "end": {id#split_id_into_s3_params}["endDate"]}}]}}'
-          - '{$.productInfo.product#remove_extension}'
-        startTimeFromAscendingNode:
-          - '{{"stringChoiceValues": [{{"name": "type", "value": "SR_1_SRA___"}}], "dateRangeSelectValues": [{{"name": "position", "start": "{startTimeFromAscendingNode#to_iso_utc_datetime}", "end": "{completionTimeFromAscendingNode#to_iso_utc_datetime}"}}]}}'
-          - '$.productInfo.productStartDate'
-        completionTimeFromAscendingNode:
-          - '{{"stringChoiceValues": [{{"name": "type", "value": "SR_1_SRA___"}}], "dateRangeSelectValues": [{{"name": "position", "start": "{startTimeFromAscendingNode#to_iso_utc_datetime}", "end": "{completionTimeFromAscendingNode#to_iso_utc_datetime}"}}]}}'
-          - '$.productInfo.productEndDate'
+        providerProductType:
+          - '{{"stringChoiceValues": [{{"name": "type", "value": "{providerProductType}"}}]}}'
+          - '$.null'
+        platform:
+          - '{{"stringChoiceValues": [{{"name": "sat", "value": "{platform}"}}]}}'
+          - '$.null'
+        timeliness:
+          - '{{"stringChoiceValues": [{{"name": "timeliness", "value": "{timeliness}"}}]}}'
+          - '$.null'
+        orbitDirection:
+          - '{{"stringChoiceValues": [{{"name": "orbitdir", "value": "{orbitDirection}"}}]}}'
+          - '$.null'
+        relativeOrbitNumber:
+          - '{{"stringInputValues": [{{"name": "relorbit", "value": "{relativeOrbitNumber}"}}]}}'
+          - '$.null'
+        orbitNumber:
+          - '{{"stringInputValues": [{{"name": "orbit", "value": "{orbitNumber}"}}]}}'
+          - '$.null'
+        cycleNumber:
+          - '{{"stringInputValues": [{{"name": "cycle", "value": "{cycleNumber}"}}]}}'
+          - '$.null'
         defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))' # geometry is not available for this product type
-    S3_SRA_A:
-      productType: EO:EUM:DAT:SENTINEL-3:SR_1_SRA_A_
+    S3_OLCI_L2WFR_BC003:
+      productType: EO:EUM:DAT:SENTINEL-3:0556
+      providerProductType: OL_2_WFR___
+      timeliness: NT
       metadata_mapping:
         id:
-          - '{{"stringChoiceValues": [{{"name": "type", "value": "SR_1_SRA_A_"}}, {{"name": "timeliness", "value": {id#split_id_into_s3_params}["timeliness"]}}, {{"name": "sat", "value": {id#split_id_into_s3_params}["sat"]}}], "dateRangeSelectValues": [{{"name": "position", "start": {id#split_id_into_s3_params}["startDate"], "end": {id#split_id_into_s3_params}["endDate"]}}]}}'
+          - '{{"stringChoiceValues": [{{"name": "type", "value": "OL_2_WFR___"}}, {{"name": "timeliness", "value": {id#split_id_into_s3_params}["timeliness"]}}, {{"name": "sat", "value": {id#split_id_into_s3_params}["sat"]}}], "dateRangeSelectValues": [{{"name": "position", "start": {id#split_id_into_s3_params}["startDate"], "end": {id#split_id_into_s3_params}["endDate"]}}]}}'
           - '{$.productInfo.product#remove_extension}'
-        startTimeFromAscendingNode:
-          - '{{"stringChoiceValues": [{{"name": "type", "value": "SR_1_SRA_A_"}}], "dateRangeSelectValues": [{{"name": "position", "start": "{startTimeFromAscendingNode#to_iso_utc_datetime}", "end": "{completionTimeFromAscendingNode#to_iso_utc_datetime}"}}]}}'
-          - '$.productInfo.productStartDate'
-        completionTimeFromAscendingNode:
-          - '{{"stringChoiceValues": [{{"name": "type", "value": "SR_1_SRA_A_"}}], "dateRangeSelectValues": [{{"name": "position", "start": "{startTimeFromAscendingNode#to_iso_utc_datetime}", "end": "{completionTimeFromAscendingNode#to_iso_utc_datetime}"}}]}}'
-          - '$.productInfo.productEndDate'
+        providerProductType:
+          - '{{"stringChoiceValues": [{{"name": "type", "value": "{providerProductType}"}}]}}'
+          - '$.null'
+        platform:
+          - '{{"stringChoiceValues": [{{"name": "sat", "value": "{platform}"}}]}}'
+          - '$.null'
+        timeliness:
+          - '{{"stringChoiceValues": [{{"name": "timeliness", "value": "{timeliness}"}}]}}'
+          - '$.null'
+        relativeOrbitNumber:
+          - '{{"stringInputValues": [{{"name": "relorbit", "value": "{relativeOrbitNumber}"}}]}}'
+          - '$.null'
+        orbitNumber:
+          - '{{"stringInputValues": [{{"name": "orbit", "value": "{orbitNumber}"}}]}}'
+          - '$.null'
+        cycleNumber:
+          - '{{"stringInputValues": [{{"name": "cycle", "value": "{cycleNumber}"}}]}}'
+          - '$.null'
+        defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))' # geometry is not available for this product type
+    S3_OLCI_L2WRR_BC003:
+      productType: EO:EUM:DAT:SENTINEL-3:0557
+      providerProductType: OL_2_WRR___
+      timeliness: NT
+      metadata_mapping:
+        id:
+          - '{{"stringChoiceValues": [{{"name": "type", "value": "OL_2_WRR___"}}, {{"name": "timeliness", "value": {id#split_id_into_s3_params}["timeliness"]}}, {{"name": "sat", "value": {id#split_id_into_s3_params}["sat"]}}], "dateRangeSelectValues": [{{"name": "position", "start": {id#split_id_into_s3_params}["startDate"], "end": {id#split_id_into_s3_params}["endDate"]}}]}}'
+          - '{$.productInfo.product#remove_extension}'
+        providerProductType:
+          - '{{"stringChoiceValues": [{{"name": "type", "value": "{providerProductType}"}}]}}'
+          - '$.null'
+        platform:
+          - '{{"stringChoiceValues": [{{"name": "sat", "value": "{platform}"}}]}}'
+          - '$.null'
+        timeliness:
+          - '{{"stringChoiceValues": [{{"name": "timeliness", "value": "{timeliness}"}}]}}'
+          - '$.null'
+        relativeOrbitNumber:
+          - '{{"stringInputValues": [{{"name": "relorbit", "value": "{relativeOrbitNumber}"}}]}}'
+          - '$.null'
+        orbitNumber:
+          - '{{"stringInputValues": [{{"name": "orbit", "value": "{orbitNumber}"}}]}}'
+          - '$.null'
+        cycleNumber:
+          - '{{"stringInputValues": [{{"name": "cycle", "value": "{cycleNumber}"}}]}}'
+          - '$.null'
+        defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))' # geometry is not available for this product type
+    S3_SRA:
+      productType: EO:EUM:DAT:SENTINEL-3:SR_1_SRA___
+      providerProductType: SR_1_SRA___
+      metadata_mapping:
+        id:
+          - '{{"stringChoiceValues": [{{"name": "type", "value": "SR_1_SRA___"}}, {{"name": "timeliness", "value": {id#split_id_into_s3_params}["timeliness"]}}, {{"name": "sat", "value": {id#split_id_into_s3_params}["sat"]}}], "dateRangeSelectValues": [{{"name": "position", "start": {id#split_id_into_s3_params}["startDate"], "end": {id#split_id_into_s3_params}["endDate"]}}]}}'
+          - '{$.productInfo.product#remove_extension}'
+        providerProductType:
+          - '{{"stringChoiceValues": [{{"name": "type", "value": "{providerProductType}"}}]}}'
+          - '$.null'
+        platform:
+          - '{{"stringChoiceValues": [{{"name": "sat", "value": "{platform}"}}]}}'
+          - '$.null'
+        timeliness:
+          - '{{"stringChoiceValues": [{{"name": "timeliness", "value": "{timeliness}"}}]}}'
+          - '$.null'
+        orbitDirection:
+          - '{{"stringChoiceValues": [{{"name": "orbitdir", "value": "{orbitDirection}"}}]}}'
+          - '$.null'
+        relativeOrbitNumber:
+          - '{{"stringInputValues": [{{"name": "relorbit", "value": "{relativeOrbitNumber}"}}]}}'
+          - '$.null'
+        orbitNumber:
+          - '{{"stringInputValues": [{{"name": "orbit", "value": "{orbitNumber}"}}]}}'
+          - '$.null'
+        cycleNumber:
+          - '{{"stringInputValues": [{{"name": "cycle", "value": "{cycleNumber}"}}]}}'
+          - '$.null'
+        defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))' # geometry is not available for this product type
+    S3_SRA_A:
+      productType: EO:EUM:DAT:SENTINEL-3:SR_1_SRA_A_
+      providerProductType: SR_1_SRA_A_
+      metadata_mapping:
+        id:
+          - '{{"stringChoiceValues": [{{"name": "type", "value": "SR_1_SRA_A_"}}, {{"name": "timeliness", "value": {id#split_id_into_s3_params}["timeliness"]}}, {{"name": "sat", "value": {id#split_id_into_s3_params}["sat"]}}], "dateRangeSelectValues": [{{"name": "position", "start": {id#split_id_into_s3_params}["startDate"], "end": {id#split_id_into_s3_params}["endDate"]}}]}}'
+          - '{$.productInfo.product#remove_extension}'
+        providerProductType:
+          - '{{"stringChoiceValues": [{{"name": "type", "value": "{providerProductType}"}}]}}'
+          - '$.null'
+        platform:
+          - '{{"stringChoiceValues": [{{"name": "sat", "value": "{platform}"}}]}}'
+          - '$.null'
+        timeliness:
+          - '{{"stringChoiceValues": [{{"name": "timeliness", "value": "{timeliness}"}}]}}'
+          - '$.null'
+        orbitDirection:
+          - '{{"stringChoiceValues": [{{"name": "orbitdir", "value": "{orbitDirection}"}}]}}'
+          - '$.null'
+        relativeOrbitNumber:
+          - '{{"stringInputValues": [{{"name": "relorbit", "value": "{relativeOrbitNumber}"}}]}}'
+          - '$.null'
+        orbitNumber:
+          - '{{"stringInputValues": [{{"name": "orbit", "value": "{orbitNumber}"}}]}}'
+          - '$.null'
+        cycleNumber:
+          - '{{"stringInputValues": [{{"name": "cycle", "value": "{cycleNumber}"}}]}}'
+          - '$.null'
         defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))' # geometry is not available for this product type
     S3_SRA_BS:
       productType: EO:EUM:DAT:SENTINEL-3:SR_1_SRA_BS
+      providerProductType: SR_1_SRA_BS
       metadata_mapping:
         id:
           - '{{"stringChoiceValues": [{{"name": "type", "value": "SR_1_SRA_BS"}}, {{"name": "timeliness", "value": {id#split_id_into_s3_params}["timeliness"]}}, {{"name": "sat", "value": {id#split_id_into_s3_params}["sat"]}}], "dateRangeSelectValues": [{{"name": "position", "start": {id#split_id_into_s3_params}["startDate"], "end": {id#split_id_into_s3_params}["endDate"]}}]}}'
           - '{$.productInfo.product#remove_extension}'
-        startTimeFromAscendingNode:
-          - '{{"stringChoiceValues": [{{"name": "type", "value": "SR_1_SRA_BS"}}], "dateRangeSelectValues": [{{"name": "position", "start": "{startTimeFromAscendingNode#to_iso_utc_datetime}", "end": "{completionTimeFromAscendingNode#to_iso_utc_datetime}"}}]}}'
-          - '$.productInfo.productStartDate'
-        completionTimeFromAscendingNode:
-          - '{{"stringChoiceValues": [{{"name": "type", "value": "SR_1_SRA_BS"}}], "dateRangeSelectValues": [{{"name": "position", "start": "{startTimeFromAscendingNode#to_iso_utc_datetime}", "end": "{completionTimeFromAscendingNode#to_iso_utc_datetime}"}}]}}'
-          - '$.productInfo.productEndDate'
+        providerProductType:
+          - '{{"stringChoiceValues": [{{"name": "type", "value": "{providerProductType}"}}]}}'
+          - '$.null'
+        platform:
+          - '{{"stringChoiceValues": [{{"name": "sat", "value": "{platform}"}}]}}'
+          - '$.null'
+        timeliness:
+          - '{{"stringChoiceValues": [{{"name": "timeliness", "value": "{timeliness}"}}]}}'
+          - '$.null'
+        orbitDirection:
+          - '{{"stringChoiceValues": [{{"name": "orbitdir", "value": "{orbitDirection}"}}]}}'
+          - '$.null'
+        relativeOrbitNumber:
+          - '{{"stringInputValues": [{{"name": "relorbit", "value": "{relativeOrbitNumber}"}}]}}'
+          - '$.null'
+        orbitNumber:
+          - '{{"stringInputValues": [{{"name": "orbit", "value": "{orbitNumber}"}}]}}'
+          - '$.null'
+        cycleNumber:
+          - '{{"stringInputValues": [{{"name": "cycle", "value": "{cycleNumber}"}}]}}'
+          - '$.null'
+        defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))' # geometry is not available for this product type
+    S3_SRA_1A_BC004:
+      productType: EO:EUM:DAT:SENTINEL-3:0583
+      providerProductType: SR_1_SRA_A_
+      metadata_mapping:
+        id:
+          - '{{"stringChoiceValues": [{{"name": "type", "value": "SR_1_SRA_A_"}}, {{"name": "timeliness", "value": {id#split_id_into_s3_params}["timeliness"]}}, {{"name": "sat", "value": {id#split_id_into_s3_params}["sat"]}}], "dateRangeSelectValues": [{{"name": "position", "start": {id#split_id_into_s3_params}["startDate"], "end": {id#split_id_into_s3_params}["endDate"]}}]}}'
+          - '{$.productInfo.product#remove_extension}'
+        providerProductType:
+          - '{{"stringChoiceValues": [{{"name": "type", "value": "{providerProductType}"}}]}}'
+          - '$.null'
+        platform:
+          - '{{"stringChoiceValues": [{{"name": "sat", "value": "{platform}"}}]}}'
+          - '$.null'
+        timeliness:
+          - '{{"stringChoiceValues": [{{"name": "timeliness", "value": "{timeliness}"}}]}}'
+          - '$.null'
+        relativeOrbitNumber:
+          - '{{"stringInputValues": [{{"name": "relorbit", "value": "{relativeOrbitNumber}"}}]}}'
+          - '$.null'
+        orbitNumber:
+          - '{{"stringInputValues": [{{"name": "orbit", "value": "{orbitNumber}"}}]}}'
+          - '$.null'
+        cycleNumber:
+          - '{{"stringInputValues": [{{"name": "cycle", "value": "{cycleNumber}"}}]}}'
+          - '$.null'
+        defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))' # geometry is not available for this product type
+    S3_SRA_1B_BC004:
+      productType: EO:EUM:DAT:SENTINEL-3:0584
+      providerProductType: SR_1_SRA___
+      metadata_mapping:
+        id:
+          - '{{"stringChoiceValues": [{{"name": "type", "value": "SR_1_SRA___"}}, {{"name": "timeliness", "value": {id#split_id_into_s3_params}["timeliness"]}}, {{"name": "sat", "value": {id#split_id_into_s3_params}["sat"]}}], "dateRangeSelectValues": [{{"name": "position", "start": {id#split_id_into_s3_params}["startDate"], "end": {id#split_id_into_s3_params}["endDate"]}}]}}'
+          - '{$.productInfo.product#remove_extension}'
+        providerProductType:
+          - '{{"stringChoiceValues": [{{"name": "type", "value": "{providerProductType}"}}]}}'
+          - '$.null'
+        platform:
+          - '{{"stringChoiceValues": [{{"name": "sat", "value": "{platform}"}}]}}'
+          - '$.null'
+        timeliness:
+          - '{{"stringChoiceValues": [{{"name": "timeliness", "value": "{timeliness}"}}]}}'
+          - '$.null'
+        relativeOrbitNumber:
+          - '{{"stringInputValues": [{{"name": "relorbit", "value": "{relativeOrbitNumber}"}}]}}'
+          - '$.null'
+        orbitNumber:
+          - '{{"stringInputValues": [{{"name": "orbit", "value": "{orbitNumber}"}}]}}'
+          - '$.null'
+        cycleNumber:
+          - '{{"stringInputValues": [{{"name": "cycle", "value": "{cycleNumber}"}}]}}'
+          - '$.null'
+        defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))' # geometry is not available for this product type
+    S3_SRA_BS_BC004:
+      productType: EO:EUM:DAT:SENTINEL-3:0585
+      providerProductType: SR_1_SRA_BS
+      metadata_mapping:
+        id:
+          - '{{"stringChoiceValues": [{{"name": "type", "value": "SR_1_SRA_BS"}}, {{"name": "timeliness", "value": {id#split_id_into_s3_params}["timeliness"]}}, {{"name": "sat", "value": {id#split_id_into_s3_params}["sat"]}}], "dateRangeSelectValues": [{{"name": "position", "start": {id#split_id_into_s3_params}["startDate"], "end": {id#split_id_into_s3_params}["endDate"]}}]}}'
+          - '{$.productInfo.product#remove_extension}'
+        providerProductType:
+          - '{{"stringChoiceValues": [{{"name": "type", "value": "{providerProductType}"}}]}}'
+          - '$.null'
+        platform:
+          - '{{"stringChoiceValues": [{{"name": "sat", "value": "{platform}"}}]}}'
+          - '$.null'
+        timeliness:
+          - '{{"stringChoiceValues": [{{"name": "timeliness", "value": "{timeliness}"}}]}}'
+          - '$.null'
+        relativeOrbitNumber:
+          - '{{"stringInputValues": [{{"name": "relorbit", "value": "{relativeOrbitNumber}"}}]}}'
+          - '$.null'
+        orbitNumber:
+          - '{{"stringInputValues": [{{"name": "orbit", "value": "{orbitNumber}"}}]}}'
+          - '$.null'
+        cycleNumber:
+          - '{{"stringInputValues": [{{"name": "cycle", "value": "{cycleNumber}"}}]}}'
+          - '$.null'
         defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))' # geometry is not available for this product type
     S3_WAT:
       productType: EO:EUM:DAT:SENTINEL-3:SR_2_WAT___
+      providerProductType: SR_2_WAT___
       metadata_mapping:
         id:
           - '{{"stringChoiceValues": [{{"name": "type", "value": "SR_2_WAT___"}}, {{"name": "timeliness", "value": {id#split_id_into_s3_params}["timeliness"]}}, {{"name": "sat", "value": {id#split_id_into_s3_params}["sat"]}}], "dateRangeSelectValues": [{{"name": "position", "start": {id#split_id_into_s3_params}["startDate"], "end": {id#split_id_into_s3_params}["endDate"]}}]}}'
           - '{$.productInfo.product#remove_extension}'
-        startTimeFromAscendingNode:
-          - '{{"stringChoiceValues": [{{"name": "type", "value": "SR_2_WAT___"}}], "dateRangeSelectValues": [{{"name": "position", "start": "{startTimeFromAscendingNode#to_iso_utc_datetime}", "end": "{completionTimeFromAscendingNode#to_iso_utc_datetime}"}}]}}'
-          - '$.productInfo.productStartDate'
-        completionTimeFromAscendingNode:
-          - '{{"stringChoiceValues": [{{"name": "type", "value": "SR_2_WAT___"}}], "dateRangeSelectValues": [{{"name": "position", "start": "{startTimeFromAscendingNode#to_iso_utc_datetime}", "end": "{completionTimeFromAscendingNode#to_iso_utc_datetime}"}}]}}'
-          - '$.productInfo.productEndDate'
+        providerProductType:
+          - '{{"stringChoiceValues": [{{"name": "type", "value": "{providerProductType}"}}]}}'
+          - '$.null'
+        platform:
+          - '{{"stringChoiceValues": [{{"name": "sat", "value": "{platform}"}}]}}'
+          - '$.null'
+        timeliness:
+          - '{{"stringChoiceValues": [{{"name": "timeliness", "value": "{timeliness}"}}]}}'
+          - '$.null'
+        orbitDirection:
+          - '{{"stringChoiceValues": [{{"name": "orbitdir", "value": "{orbitDirection}"}}]}}'
+          - '$.null'
+        relativeOrbitNumber:
+          - '{{"stringInputValues": [{{"name": "relorbit", "value": "{relativeOrbitNumber}"}}]}}'
+          - '$.null'
+        orbitNumber:
+          - '{{"stringInputValues": [{{"name": "orbit", "value": "{orbitNumber}"}}]}}'
+          - '$.null'
+        cycleNumber:
+          - '{{"stringInputValues": [{{"name": "cycle", "value": "{cycleNumber}"}}]}}'
+          - '$.null'
+        defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))' # geometry is not available for this product type
+    S3_WAT_BC004:
+      productType: EO:EUM:DAT:SENTINEL-3:0586
+      providerProductType: SR_2_WAT___
+      timeliness: NT
+      metadata_mapping:
+        id:
+          - '{{"stringChoiceValues": [{{"name": "type", "value": "SR_2_WAT___"}}, {{"name": "timeliness", "value": {id#split_id_into_s3_params}["timeliness"]}}, {{"name": "sat", "value": {id#split_id_into_s3_params}["sat"]}}], "dateRangeSelectValues": [{{"name": "position", "start": {id#split_id_into_s3_params}["startDate"], "end": {id#split_id_into_s3_params}["endDate"]}}]}}'
+          - '{$.productInfo.product#remove_extension}'
+        providerProductType:
+          - '{{"stringChoiceValues": [{{"name": "type", "value": "{providerProductType}"}}]}}'
+          - '$.null'
+        platform:
+          - '{{"stringChoiceValues": [{{"name": "sat", "value": "{platform}"}}]}}'
+          - '$.null'
+        timeliness:
+          - '{{"stringChoiceValues": [{{"name": "timeliness", "value": "{timeliness}"}}]}}'
+          - '$.null'
+        relativeOrbitNumber:
+          - '{{"stringInputValues": [{{"name": "relorbit", "value": "{relativeOrbitNumber}"}}]}}'
+          - '$.null'
+        orbitNumber:
+          - '{{"stringInputValues": [{{"name": "orbit", "value": "{orbitNumber}"}}]}}'
+          - '$.null'
+        cycleNumber:
+          - '{{"stringInputValues": [{{"name": "cycle", "value": "{cycleNumber}"}}]}}'
+          - '$.null'
         defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))' # geometry is not available for this product type
     S3_SLSTR_L1RBT:
       productType: EO:EUM:DAT:SENTINEL-3:SL_1_RBT___
+      providerProductType: SL_1_RBT___
       metadata_mapping:
         id:
           - '{{"stringChoiceValues": [{{"name": "type", "value": "SL_1_RBT___"}}, {{"name": "timeliness", "value": {id#split_id_into_s3_params}["timeliness"]}}, {{"name": "sat", "value": {id#split_id_into_s3_params}["sat"]}}], "dateRangeSelectValues": [{{"name": "position", "start": {id#split_id_into_s3_params}["startDate"], "end": {id#split_id_into_s3_params}["endDate"]}}]}}'
           - '{$.productInfo.product#remove_extension}'
-        startTimeFromAscendingNode:
-          - '{{"stringChoiceValues": [{{"name": "type", "value": "SL_1_RBT___"}}], "dateRangeSelectValues": [{{"name": "position", "start": "{startTimeFromAscendingNode#to_iso_utc_datetime}", "end": "{completionTimeFromAscendingNode#to_iso_utc_datetime}"}}]}}'
-          - '$.productInfo.productStartDate'
-        completionTimeFromAscendingNode:
-          - '{{"stringChoiceValues": [{{"name": "type", "value": "SL_1_RBT___"}}], "dateRangeSelectValues": [{{"name": "position", "start": "{startTimeFromAscendingNode#to_iso_utc_datetime}", "end": "{completionTimeFromAscendingNode#to_iso_utc_datetime}"}}]}}'
-          - '$.productInfo.productEndDate'
+        providerProductType:
+          - '{{"stringChoiceValues": [{{"name": "type", "value": "{providerProductType}"}}]}}'
+          - '$.null'
+        platform:
+          - '{{"stringChoiceValues": [{{"name": "sat", "value": "{platform}"}}]}}'
+          - '$.null'
+        timeliness:
+          - '{{"stringChoiceValues": [{{"name": "timeliness", "value": "{timeliness}"}}]}}'
+          - '$.null'
+        orbitDirection:
+          - '{{"stringChoiceValues": [{{"name": "orbitdir", "value": "{orbitDirection}"}}]}}'
+          - '$.null'
+        relativeOrbitNumber:
+          - '{{"stringInputValues": [{{"name": "relorbit", "value": "{relativeOrbitNumber}"}}]}}'
+          - '$.null'
+        orbitNumber:
+          - '{{"stringInputValues": [{{"name": "orbit", "value": "{orbitNumber}"}}]}}'
+          - '$.null'
+        cycleNumber:
+          - '{{"stringInputValues": [{{"name": "cycle", "value": "{cycleNumber}"}}]}}'
+          - '$.null'
+        defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))' # geometry is not available for this product type
+    S3_SLSTR_L1RBT_BC004:
+      productType: EO:EUM:DAT:SENTINEL-3:0615
+      providerProductType: SL_1_RBT___
+      metadata_mapping:
+        id:
+          - '{{"stringChoiceValues": [{{"name": "type", "value": "SL_1_RBT___"}}, {{"name": "timeliness", "value": {id#split_id_into_s3_params}["timeliness"]}}, {{"name": "sat", "value": {id#split_id_into_s3_params}["sat"]}}], "dateRangeSelectValues": [{{"name": "position", "start": {id#split_id_into_s3_params}["startDate"], "end": {id#split_id_into_s3_params}["endDate"]}}]}}'
+          - '{$.productInfo.product#remove_extension}'
+        providerProductType:
+          - '{{"stringChoiceValues": [{{"name": "type", "value": "{providerProductType}"}}]}}'
+          - '$.null'
+        platform:
+          - '{{"stringChoiceValues": [{{"name": "sat", "value": "{platform}"}}]}}'
+          - '$.null'
+        timeliness:
+          - '{{"stringChoiceValues": [{{"name": "timeliness", "value": "{timeliness}"}}]}}'
+          - '$.null'
+        relativeOrbitNumber:
+          - '{{"stringInputValues": [{{"name": "relorbit", "value": "{relativeOrbitNumber}"}}]}}'
+          - '$.null'
+        orbitNumber:
+          - '{{"stringInputValues": [{{"name": "orbit", "value": "{orbitNumber}"}}]}}'
+          - '$.null'
+        cycleNumber:
+          - '{{"stringInputValues": [{{"name": "cycle", "value": "{cycleNumber}"}}]}}'
+          - '$.null'
         defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))' # geometry is not available for this product type
     S3_SLSTR_L2WST:
       productType: EO:EUM:DAT:SENTINEL-3:SL_2_WST___
+      providerProductType: SL_2_WST___
       metadata_mapping:
         id:
           - '{{"stringChoiceValues": [{{"name": "type", "value": "SL_2_WST___"}}, {{"name": "timeliness", "value": {id#split_id_into_s3_params}["timeliness"]}}, {{"name": "sat", "value": {id#split_id_into_s3_params}["sat"]}}], "dateRangeSelectValues": [{{"name": "position", "start": {id#split_id_into_s3_params}["startDate"], "end": {id#split_id_into_s3_params}["endDate"]}}]}}'
           - '{$.productInfo.product#remove_extension}'
+        providerProductType:
+          - '{{"stringChoiceValues": [{{"name": "type", "value": "{providerProductType}"}}]}}'
+          - '$.null'
+        platform:
+          - '{{"stringChoiceValues": [{{"name": "sat", "value": "{platform}"}}]}}'
+          - '$.null'
+        timeliness:
+          - '{{"stringChoiceValues": [{{"name": "timeliness", "value": "{timeliness}"}}]}}'
+          - '$.null'
+        orbitDirection:
+          - '{{"stringChoiceValues": [{{"name": "orbitdir", "value": "{orbitDirection}"}}]}}'
+          - '$.null'
+        relativeOrbitNumber:
+          - '{{"stringInputValues": [{{"name": "relorbit", "value": "{relativeOrbitNumber}"}}]}}'
+          - '$.null'
+        orbitNumber:
+          - '{{"stringInputValues": [{{"name": "orbit", "value": "{orbitNumber}"}}]}}'
+          - '$.null'
+        cycleNumber:
+          - '{{"stringInputValues": [{{"name": "cycle", "value": "{cycleNumber}"}}]}}'
+          - '$.null'
+        defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))' # geometry is not available for this product type
+    S3_SLSTR_L2WST_BC003:
+      productType: EO:EUM:DAT:SENTINEL-3:0582
+      providerProductType: SL_2_WST___
+      timeliness: NT
+      platform: Sentinel-3A
+      metadata_mapping:
+        id:
+          - '{{"stringChoiceValues": [{{"name": "type", "value": "SL_2_WST___"}}, {{"name": "timeliness", "value": {id#split_id_into_s3_params}["timeliness"]}}, {{"name": "sat", "value": {id#split_id_into_s3_params}["sat"]}}], "dateRangeSelectValues": [{{"name": "position", "start": {id#split_id_into_s3_params}["startDate"], "end": {id#split_id_into_s3_params}["endDate"]}}]}}'
+          - '{$.productInfo.product#remove_extension}'
+        providerProductType:
+          - '{{"stringChoiceValues": [{{"name": "type", "value": "{providerProductType}"}}]}}'
+          - '$.null'
+        platform:
+          - '{{"stringChoiceValues": [{{"name": "sat", "value": "{platform}"}}]}}'
+          - '$.null'
+        timeliness:
+          - '{{"stringChoiceValues": [{{"name": "timeliness", "value": "{timeliness}"}}]}}'
+          - '$.null'
+        relativeOrbitNumber:
+          - '{{"stringInputValues": [{{"name": "relorbit", "value": "{relativeOrbitNumber}"}}]}}'
+          - '$.null'
+        orbitNumber:
+          - '{{"stringInputValues": [{{"name": "orbit", "value": "{orbitNumber}"}}]}}'
+          - '$.null'
+        cycleNumber:
+          - '{{"stringInputValues": [{{"name": "cycle", "value": "{cycleNumber}"}}]}}'
+          - '$.null'
+        defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))' # geometry is not available for this product type
+    S3_OLCI_L4BALTIC:
+      productType: EO:MO:DAT:OCEANCOLOUR_BAL_BGC_L4_NRT_009_132:cmems_obs-oc_bal_bgc-plankton_nrt_l4-olci-300m_P1M_202207
+      variable:
+        - lat
+        - CHL
+        - lon
+        - CHL_count
+        - time
+        - CHL_error
+      metadata_mapping:
+        id:
+          - '{{"dateRangeSelectValues": [{{"name": "time", "start": {id#get_dates_from_string}["startDate"], "end": {id#get_dates_from_string}["endDate"]}}]}}'
+          - '{$.productInfo.product#remove_extension}'
         startTimeFromAscendingNode:
-          - '{{"stringChoiceValues": [{{"name": "type", "value": "SL_2_WST___"}}], "dateRangeSelectValues": [{{"name": "position", "start": "{startTimeFromAscendingNode#to_iso_utc_datetime}", "end": "{completionTimeFromAscendingNode#to_iso_utc_datetime}"}}]}}'
+          - '{{"dateRangeSelectValues": [{{"name": "time", "start": "{startTimeFromAscendingNode#to_iso_utc_datetime}", "end": "{completionTimeFromAscendingNode#to_iso_utc_datetime}"}}]}}'
           - '$.productInfo.productStartDate'
         completionTimeFromAscendingNode:
-          - '{{"stringChoiceValues": [{{"name": "type", "value": "SL_2_WST___"}}], "dateRangeSelectValues": [{{"name": "position", "start": "{startTimeFromAscendingNode#to_iso_utc_datetime}", "end": "{completionTimeFromAscendingNode#to_iso_utc_datetime}"}}]}}'
+          - '{{"dateRangeSelectValues": [{{"name": "time", "start": "{startTimeFromAscendingNode#to_iso_utc_datetime}", "end": "{completionTimeFromAscendingNode#to_iso_utc_datetime}"}}]}}'
           - '$.productInfo.productEndDate'
+        variable:
+          - '{{"multiStringSelectValues": [{{"name": "variables", "value": {variable}}}]}}'
+          - '$.null'
         defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))' # geometry is not available for this product type
     S5P_L1B2_IR_ALL:
       productType: EO:ESA:DAT:SENTINEL-5P:TROPOMI
@@ -3682,6 +4318,180 @@
         processingLevel:
           - '{{"stringChoiceValues": [{{"name": "processingLevel", "value": "{processingLevel}"}}]}}'
           - '{$.productInfo.product#get_processing_level_from_s5p_id}'
+        providerProductType:
+          - '{{"stringChoiceValues": [{{"name": "productType", "value": "{providerProductType}"}}]}}'
+          - '$.null'
+        processingMode:
+          - '{{"stringChoiceValues": [{{"name": "processingMode", "value": "{processingMode}"}}]}}'
+          - '$.null'
+    S6_P4_L1AHR_F06:
+      productType: EO:EUM:DAT:0236
+      platform: Sentinel-6A
+      providerProductType: P4_1A_HR_____
+      timeliness: NT
+      metadata_mapping:
+        id:
+          - '{{"stringChoiceValues": [{{"name": "type", "value": "P4_1A_HR_____"}}, {{"name": "timeliness", "value": "NT"}}, {{"name": "sat", "value": "Sentinel-6A"}}], "dateRangeSelectValues": [{{"name": "position", "start": {id#split_id_into_s3_params}["startDate"], "end": {id#split_id_into_s3_params}["endDate"]}}]}}'
+          - '{$.productInfo.product#remove_extension}'
+        providerProductType:
+          - '{{"stringChoiceValues": [{{"name": "type", "value": "{providerProductType}"}}]}}'
+          - '$.null'
+        platform:
+          - '{{"stringChoiceValues": [{{"name": "sat", "value": "{platform}"}}]}}'
+          - '$.null'
+        timeliness:
+          - '{{"stringChoiceValues": [{{"name": "timeliness", "value": "{timeliness}"}}]}}'
+          - '$.null'
+        relativeOrbitNumber:
+          - '{{"stringInputValues": [{{"name": "relorbit", "value": "{relativeOrbitNumber}"}}]}}'
+          - '$.null'
+        orbitNumber:
+          - '{{"stringInputValues": [{{"name": "orbit", "value": "{orbitNumber}"}}]}}'
+          - '$.null'
+        cycleNumber:
+          - '{{"stringInputValues": [{{"name": "cycle", "value": "{cycleNumber}"}}]}}'
+          - '$.null'
+        defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))' # geometry is not available for this product type
+    S6_P4_L1BLR_F06:
+      productType: EO:EUM:DAT:0237
+      platform: Sentinel-6A
+      providerProductType: P4_1B_LR_____
+      timeliness: NT
+      metadata_mapping:
+        id:
+          - '{{"stringChoiceValues": [{{"name": "type", "value": "P4_1B_LR_____"}}, {{"name": "timeliness", "value": "NT"}}, {{"name": "sat", "value": "Sentinel-6A"}}], "dateRangeSelectValues": [{{"name": "position", "start": {id#split_id_into_s3_params}["startDate"], "end": {id#split_id_into_s3_params}["endDate"]}}]}}'
+          - '{$.productInfo.product#remove_extension}'
+        providerProductType:
+          - '{{"stringChoiceValues": [{{"name": "type", "value": "{providerProductType}"}}]}}'
+          - '$.null'
+        platform:
+          - '{{"stringChoiceValues": [{{"name": "sat", "value": "{platform}"}}]}}'
+          - '$.null'
+        timeliness:
+          - '{{"stringChoiceValues": [{{"name": "timeliness", "value": "{timeliness}"}}]}}'
+          - '$.null'
+        relativeOrbitNumber:
+          - '{{"stringInputValues": [{{"name": "relorbit", "value": "{relativeOrbitNumber}"}}]}}'
+          - '$.null'
+        orbitNumber:
+          - '{{"stringInputValues": [{{"name": "orbit", "value": "{orbitNumber}"}}]}}'
+          - '$.null'
+        cycleNumber:
+          - '{{"stringInputValues": [{{"name": "cycle", "value": "{cycleNumber}"}}]}}'
+          - '$.null'
+        defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))' # geometry is not available for this product type
+    S6_P4_L1BAHR_F06:
+      productType: EO:EUM:DAT:0238
+      platform: Sentinel-6A
+      providerProductType: P4_1B_HR_____
+      timeliness: NT
+      metadata_mapping:
+        id:
+          - '{{"stringChoiceValues": [{{"name": "type", "value": "P4_1B_HR_____"}}, {{"name": "timeliness", "value": "NT"}}, {{"name": "sat", "value": "Sentinel-6A"}}], "dateRangeSelectValues": [{{"name": "position", "start": {id#split_id_into_s3_params}["startDate"], "end": {id#split_id_into_s3_params}["endDate"]}}]}}'
+          - '{$.productInfo.product#remove_extension}'
+        providerProductType:
+          - '{{"stringChoiceValues": [{{"name": "type", "value": "{providerProductType}"}}]}}'
+          - '$.null'
+        platform:
+          - '{{"stringChoiceValues": [{{"name": "sat", "value": "{platform}"}}]}}'
+          - '$.null'
+        timeliness:
+          - '{{"stringChoiceValues": [{{"name": "timeliness", "value": "{timeliness}"}}]}}'
+          - '$.null'
+        relativeOrbitNumber:
+          - '{{"stringInputValues": [{{"name": "relorbit", "value": "{relativeOrbitNumber}"}}]}}'
+          - '$.null'
+        orbitNumber:
+          - '{{"stringInputValues": [{{"name": "orbit", "value": "{orbitNumber}"}}]}}'
+          - '$.null'
+        cycleNumber:
+          - '{{"stringInputValues": [{{"name": "cycle", "value": "{cycleNumber}"}}]}}'
+          - '$.null'
+        defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))' # geometry is not available for this product type
+    S6_P4_L2LR_F06:
+      productType: EO:EUM:DAT:0239
+      platform: Sentinel-6A
+      providerProductType: P4_2__LR_____
+      timeliness: NT
+      metadata_mapping:
+        id:
+          - '{{"stringChoiceValues": [{{"name": "type", "value": "P4_2__LR_____"}}, {{"name": "timeliness", "value": "NT"}}, {{"name": "sat", "value": "Sentinel-6A"}}], "dateRangeSelectValues": [{{"name": "position", "start": {id#split_id_into_s3_params}["startDate"], "end": {id#split_id_into_s3_params}["endDate"]}}]}}'
+          - '{$.productInfo.product#remove_extension}'
+        providerProductType:
+          - '{{"stringChoiceValues": [{{"name": "type", "value": "{providerProductType}"}}]}}'
+          - '$.null'
+        platform:
+          - '{{"stringChoiceValues": [{{"name": "sat", "value": "{platform}"}}]}}'
+          - '$.null'
+        timeliness:
+          - '{{"stringChoiceValues": [{{"name": "timeliness", "value": "{timeliness}"}}]}}'
+          - '$.null'
+        relativeOrbitNumber:
+          - '{{"stringInputValues": [{{"name": "relorbit", "value": "{relativeOrbitNumber}"}}]}}'
+          - '$.null'
+        orbitNumber:
+          - '{{"stringInputValues": [{{"name": "orbit", "value": "{orbitNumber}"}}]}}'
+          - '$.null'
+        cycleNumber:
+          - '{{"stringInputValues": [{{"name": "cycle", "value": "{cycleNumber}"}}]}}'
+          - '$.null'
+        defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))' # geometry is not available for this product type
+    S6_P4_L2HR_F06:
+      productType: EO:EUM:DAT:0240
+      platform: Sentinel-6A
+      providerProductType: P4_2__HR_____
+      timeliness: NT
+      metadata_mapping:
+        id:
+          - '{{"stringChoiceValues": [{{"name": "type", "value": "P4_2__HR_____"}}, {{"name": "timeliness", "value": "NT"}}, {{"name": "sat", "value": "Sentinel-6A"}}], "dateRangeSelectValues": [{{"name": "position", "start": {id#split_id_into_s3_params}["startDate"], "end": {id#split_id_into_s3_params}["endDate"]}}]}}'
+          - '{$.productInfo.product#remove_extension}'
+        providerProductType:
+          - '{{"stringChoiceValues": [{{"name": "type", "value": "{providerProductType}"}}]}}'
+          - '$.null'
+        platform:
+          - '{{"stringChoiceValues": [{{"name": "sat", "value": "{platform}"}}]}}'
+          - '$.null'
+        timeliness:
+          - '{{"stringChoiceValues": [{{"name": "timeliness", "value": "{timeliness}"}}]}}'
+          - '$.null'
+        relativeOrbitNumber:
+          - '{{"stringInputValues": [{{"name": "relorbit", "value": "{relativeOrbitNumber}"}}]}}'
+          - '$.null'
+        orbitNumber:
+          - '{{"stringInputValues": [{{"name": "orbit", "value": "{orbitNumber}"}}]}}'
+          - '$.null'
+        cycleNumber:
+          - '{{"stringInputValues": [{{"name": "cycle", "value": "{cycleNumber}"}}]}}'
+          - '$.null'
+        defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))' # geometry is not available for this product type
+    S6_AMR_L2_F06:
+      productType: EO:EUM:DAT:0241
+      platform: Sentinel-6A
+      providerProductType: MW_2__AMR____
+      timeliness: NT
+      metadata_mapping:
+        id:
+          - '{{"stringChoiceValues": [{{"name": "type", "value": "MW_2__AMR____"}}, {{"name": "timeliness", "value": "NT"}}, {{"name": "sat", "value": "Sentinel-6A"}}], "dateRangeSelectValues": [{{"name": "position", "start": {id#split_id_into_s3_params}["startDate"], "end": {id#split_id_into_s3_params}["endDate"]}}]}}'
+          - '{$.productInfo.product#remove_extension}'
+        providerProductType:
+          - '{{"stringChoiceValues": [{{"name": "type", "value": "{providerProductType}"}}]}}'
+          - '$.null'
+        platform:
+          - '{{"stringChoiceValues": [{{"name": "sat", "value": "{platform}"}}]}}'
+          - '$.null'
+        timeliness:
+          - '{{"stringChoiceValues": [{{"name": "timeliness", "value": "{timeliness}"}}]}}'
+          - '$.null'
+        relativeOrbitNumber:
+          - '{{"stringInputValues": [{{"name": "relorbit", "value": "{relativeOrbitNumber}"}}]}}'
+          - '$.null'
+        orbitNumber:
+          - '{{"stringInputValues": [{{"name": "orbit", "value": "{orbitNumber}"}}]}}'
+          - '$.null'
+        cycleNumber:
+          - '{{"stringInputValues": [{{"name": "cycle", "value": "{cycleNumber}"}}]}}'
+          - '$.null'
+        defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))' # geometry is not available for this product type
     COP_DEM_GLO30_DGED:
       productType: EO:DEM:DAT:COP-DEM_GLO-30-DGED__2022_1
       metadata_mapping:


Test patch:
diff --git a/tests/units/test_core.py b/tests/units/test_core.py
index 78d47024..1fa2ac35 100644
--- a/tests/units/test_core.py
+++ b/tests/units/test_core.py
@@ -168,8 +168,8 @@ class TestCore(TestCoreBase):
             "sara",
             "wekeo",
         ],
-        "S1_SAR_OCN": ["cop_dataspace", "creodias", "onda", "peps", "sara"],
-        "S1_SAR_RAW": ["cop_dataspace", "creodias", "onda"],
+        "S1_SAR_OCN": ["cop_dataspace", "creodias", "onda", "peps", "sara", "wekeo"],
+        "S1_SAR_RAW": ["cop_dataspace", "creodias", "onda", "wekeo"],
         "S1_SAR_SLC": [
             "cop_dataspace",
             "creodias",
@@ -203,6 +203,7 @@ class TestCore(TestCoreBase):
             "sara",
             "wekeo",
         ],
+        "S2_MSI_L2AP": ["wekeo"],
         "S2_MSI_L2A_COG": ["earth_search_cog"],
         "S2_MSI_L2A_MAJA": ["theia"],
         "S2_MSI_L2B_MAJA_SNOW": ["theia"],
@@ -255,6 +256,21 @@ class TestCore(TestCoreBase):
         "S3_SY_VG1": ["cop_dataspace", "creodias", "onda", "sara"],
         "S3_SY_VGP": ["cop_dataspace", "creodias", "onda", "sara"],
         "S3_WAT": ["cop_dataspace", "creodias", "onda", "sara", "wekeo"],
+        "S3_OLCI_L2WFR_BC003": ["wekeo"],
+        "S3_OLCI_L2WRR_BC003": ["wekeo"],
+        "S3_SRA_1A_BC004": ["wekeo"],
+        "S3_SRA_1B_BC004": ["wekeo"],
+        "S3_SRA_BS_BC004": ["wekeo"],
+        "S3_WAT_BC004": ["wekeo"],
+        "S3_SLSTR_L1RBT_BC004": ["wekeo"],
+        "S3_SLSTR_L2WST_BC003": ["wekeo"],
+        "S3_OLCI_L4BALTIC": ["wekeo"],
+        "S6_P4_L1AHR_F06": ["wekeo"],
+        "S6_P4_L1BLR_F06": ["wekeo"],
+        "S6_P4_L1BAHR_F06": ["wekeo"],
+        "S6_P4_L2LR_F06": ["wekeo"],
+        "S6_P4_L2HR_F06": ["wekeo"],
+        "S6_AMR_L2_F06": ["wekeo"],
         "S5P_L1B2_IR_ALL": ["wekeo"],
         "S5P_L1B_IR_SIR": ["cop_dataspace", "creodias"],
         "S5P_L1B_IR_UVN": ["cop_dataspace", "creodias"],
@@ -1243,6 +1259,7 @@ class TestCoreSearch(TestCoreBase):
         expected = [
             "S2_MSI_L1C",
             "S2_MSI_L2A",
+            "S2_MSI_L2AP",
             "S2_MSI_L2A_COG",
             "S2_MSI_L2A_MAJA",
             "S2_MSI_L2B_MAJA_SNOW",
diff --git a/tests/units/test_metadata_mapping.py b/tests/units/test_metadata_mapping.py
index 4522f8c8..8b692244 100644
--- a/tests/units/test_metadata_mapping.py
+++ b/tests/units/test_metadata_mapping.py
@@ -498,3 +498,19 @@ class TestMetadataFormatter(unittest.TestCase):
         self.assertEqual(
             format_metadata(to_format, date="2023-01-31T23:59"), str(["23:00"])
         )
+
+    def test_convert_get_dates_from_string(self):
+        to_format = "{text#get_dates_from_string}"
+        self.assertEqual(
+            format_metadata(to_format, text="20231019-20231020"),
+            str(
+                {"startDate": "2023-10-19T00:00:00Z", "endDate": "2023-10-20T00:00:00Z"}
+            ),
+        )
+        to_format = "{text#get_dates_from_string(_)}"
+        self.assertEqual(
+            format_metadata(to_format, text="20231019_20231020"),
+            str(
+                {"startDate": "2023-10-19T00:00:00Z", "endDate": "2023-10-20T00:00:00Z"}
+            ),
+        )