Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Update broken Copernicus CDS and ADS URLs #1182

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions catalog/ECMWF/ECMWF_CAMS_NRT.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ local self_ee_catalog_url = ee_const.ee_catalog_url + basename;
links: ee.standardLinks(subdir, id) + [
{
rel: ee_const.rel.license,
href: 'https://ads.atmosphere.copernicus.eu/api/v2/terms/static/licence-to-use-copernicus-products.pdf',
href: 'https://object-store.os-api.cci2.ecmwf.int/cci2-prod-catalogue/licences/licence-to-use-copernicus-products/licence-to-use-copernicus-products_b4b9451f54cffa16ecef5c912c9cebd6979925a956e3fa677976e0cf198c2c18.pdf',
type: ee_const.media_type.pdf,
},
],
Expand All @@ -57,7 +57,7 @@ local self_ee_catalog_url = ee_const.ee_catalog_url + basename;
providers: [
ee.producer_provider(
'European Centre for Medium-Range Weather Forecasts (ECMWF)',
'https://ads.atmosphere.copernicus.eu/cdsapp#!/dataset/cams-global-atmospheric-composition-forecasts'),
'https://ads.atmosphere.copernicus.eu/datasets/cams-global-atmospheric-composition-forecasts'),
ee.host_provider(self_ee_catalog_url),
],
extent: ee.extent_global('2016-06-22T12:00:00Z', null),
Expand Down Expand Up @@ -297,7 +297,7 @@ local self_ee_catalog_url = ee_const.ee_catalog_url + basename;
programme, i.e., Sentinel mission data and Copernicus service information.

See the
[full COPERNICUS data license](https://ads.atmosphere.copernicus.eu/api/v2/terms/static/licence-to-use-copernicus-products.pdf).
[full COPERNICUS data license](https://object-store.os-api.cci2.ecmwf.int/cci2-prod-catalogue/licences/licence-to-use-copernicus-products/licence-to-use-copernicus-products_b4b9451f54cffa16ecef5c912c9cebd6979925a956e3fa677976e0cf198c2c18.pdf).

The license clauses with attribution requirements are shown below:

Expand Down
4 changes: 2 additions & 2 deletions catalog/ECMWF/ECMWF_ERA5_DAILY.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ local self_ee_catalog_url = ee_const.ee_catalog_url + basename;
'wind',
],
providers: [
ee.producer_provider('ECMWF / Copernicus Climate Change Service', 'https://cds.climate.copernicus.eu/cdsapp#!/dataset/reanalysis-era5-single-levels'),
ee.producer_provider('ECMWF / Copernicus Climate Change Service', 'https://cds.climate.copernicus.eu/datasets/reanalysis-era5-single-levels'),
ee.host_provider(self_ee_catalog_url),
],
extent: ee.extent_global('1979-01-02T00:00:00Z', null),
Expand Down Expand Up @@ -314,7 +314,7 @@ local self_ee_catalog_url = ee_const.ee_catalog_url + basename;
},
'sci:citation': |||
Copernicus Climate Change Service (C3S) (2017): ERA5: Fifth generation of ECMWF atmospheric reanalyses of the global climate.
Copernicus Climate Change Service Climate Data Store (CDS), (date of access), [https://cds.climate.copernicus.eu/cdsapp#!/home](https://cds.climate.copernicus.eu/cdsapp#!/home)
Copernicus Climate Change Service Climate Data Store (CDS), (date of access), [https://cds.climate.copernicus.eu](https://cds.climate.copernicus.eu)
|||,
'gee:interval': {
type: 'cadence',
Expand Down
2 changes: 1 addition & 1 deletion catalog/ECMWF/ECMWF_ERA5_LAND_DAILY_AGGR.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ local self_ee_catalog_url = ee_const.ee_catalog_url + basename;
providers: [
ee.producer_provider(
'Daily Aggregates: Google and Copernicus Climate Data Store',
'https://cds.climate.copernicus.eu/cdsapp'
'https://cds.climate.copernicus.eu'
),
ee.host_provider(self_ee_catalog_url),
],
Expand Down
4 changes: 2 additions & 2 deletions catalog/ECMWF/ECMWF_ERA5_LAND_HOURLY.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@ local self_ee_catalog_url = ee_const.ee_catalog_url + basename;

ERA5-Land data is available from 1950 to three months from real-time. More
information can be found at the
[Copernicus Climate Data Store](https://cds.climate.copernicus.eu/cdsapp#!/dataset/reanalysis-era5-land?tab=overview).
[Copernicus Climate Data Store](https://cds.climate.copernicus.eu/datasets/reanalysis-era5-land?tab=overview).
|||,
license: license.id,
links: ee.standardLinks(subdir, id),
keywords: era5_land.keywords,
providers: [
ee.producer_provider(
'Copernicus Climate Data Store',
'https://cds.climate.copernicus.eu/cdsapp#!/dataset/reanalysis-era5-land?tab=overview'
'https://cds.climate.copernicus.eu/datasets/reanalysis-era5-land?tab=overview'
),
ee.host_provider(self_ee_catalog_url),
],
Expand Down
4 changes: 2 additions & 2 deletions catalog/ECMWF/ECMWF_ERA5_LAND_MONTHLY.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@ local license = spdx.proprietary;

ERA5-Land data is available from 1950 to three months from real-time. More
information can be found at the
[Copernicus Climate Data Store](https://cds.climate.copernicus.eu/cdsapp#!/dataset/reanalysis-era5-land-monthly-means?tab=overview).
[Copernicus Climate Data Store](https://cds.climate.copernicus.eu/datasets/reanalysis-era5-land-monthly-means?tab=overview).
|||,
license: license.id,
links: ee.standardLinks(subdir, id) + version_config.version_links,
keywords: era5_land.keywords,
providers: [
ee.producer_provider(
'Copernicus Climate Data Store',
'https://cds.climate.copernicus.eu/cdsapp#!/dataset/reanalysis-era5-land-monthly-means?tab=overview'
'https://cds.climate.copernicus.eu/datasets/reanalysis-era5-land-monthly-means?tab=overview'
),
ee.host_provider(version_config.ee_catalog_url),
],
Expand Down
2 changes: 1 addition & 1 deletion catalog/ECMWF/ECMWF_ERA5_LAND_MONTHLY_AGGR.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ local license = spdx.proprietary;
providers: [
ee.producer_provider(
'Monthly Aggregates: Google and Copernicus Climate Data Store',
'https://cds.climate.copernicus.eu/cdsapp'
'https://cds.climate.copernicus.eu'
),
ee.host_provider(version_config.ee_catalog_url),
],
Expand Down
2 changes: 1 addition & 1 deletion catalog/ECMWF/ECMWF_ERA5_LAND_MONTHLY_BY_HOUR.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ local self_ee_catalog_url = ee_const.ee_catalog_url + basename;
'wind',
],
providers: [
ee.producer_provider('Climate Data Store', 'https://cds.climate.copernicus.eu/cdsapp'),
ee.producer_provider('Climate Data Store', 'https://cds.climate.copernicus.eu'),
ee.host_provider(self_ee_catalog_url),
],
extent: ee.extent_global('1950-01-01T01:00:00Z', null),
Expand Down
6 changes: 3 additions & 3 deletions catalog/ECMWF/ECMWF_ERA5_MONTHLY.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ local self_ee_catalog_url = ee_const.ee_catalog_url + basename;

ERA5 data is available from 1940 to three months from real-time, the version in the EE Data Catalog is available from 1979. More information
and more ERA5 atmospheric parameters can be found at the
[Copernicus Climate Data Store](https://cds.climate.copernicus.eu/cdsapp#!/dataset/reanalysis-era5-single-levels-monthly-means?tab=overview).
[Copernicus Climate Data Store](https://cds.climate.copernicus.eu/datasets/reanalysis-era5-single-levels-monthly-means?tab=overview).

Provider's Note: Monthly aggregates have been calculated based on the ERA5 hourly values
of each parameter.
Expand All @@ -60,7 +60,7 @@ local self_ee_catalog_url = ee_const.ee_catalog_url + basename;
'wind',
],
providers: [
ee.producer_provider('ECMWF / Copernicus Climate Change Service', 'https://cds.climate.copernicus.eu/cdsapp#!/dataset/reanalysis-era5-single-levels-monthly-means?tab=overview'),
ee.producer_provider('ECMWF / Copernicus Climate Change Service', 'https://cds.climate.copernicus.eu/datasets/reanalysis-era5-single-levels-monthly-means?tab=overview'),
ee.host_provider(self_ee_catalog_url),
],
extent: ee.extent_global('1979-01-01T00:00:00Z', null),
Expand Down Expand Up @@ -310,7 +310,7 @@ local self_ee_catalog_url = ee_const.ee_catalog_url + basename;
},
'sci:citation': |||
Copernicus Climate Change Service (C3S) (2017): ERA5: Fifth generation of ECMWF atmospheric reanalyses of the global climate.
Copernicus Climate Change Service Climate Data Store (CDS), (date of access), [https://cds.climate.copernicus.eu/cdsapp#!/home](https://cds.climate.copernicus.eu/cdsapp#!/home)
Copernicus Climate Change Service Climate Data Store (CDS), (date of access), [https://cds.climate.copernicus.eu](https://cds.climate.copernicus.eu)
|||,
'gee:interval': {
type: 'cadence',
Expand Down
Loading