From 62d21b87b774c7aeb04ce4487cd180df3c6652fd Mon Sep 17 00:00:00 2001 From: Antonello Lobianco Date: Mon, 3 Jun 2024 11:47:56 +0200 Subject: [PATCH] Update WORLDCLIM_URI in shared.jl (#67) * Update WORLDCLIM_URI in shared.jl * Update test worldclim-bioclim.jl * Update worldclim-climate.jl * Update test worldclim-elevation.jl * Update test worldclim-weather.jl * Update test worldclim-bioclim.jl * Update test worldclim-climate.jl * Update test worldclim-elevation.jl * Update worldclim-weather.jl --- src/worldclim/shared.jl | 2 +- test/worldclim-bioclim.jl | 2 +- test/worldclim-climate.jl | 2 +- test/worldclim-elevation.jl | 2 +- test/worldclim-weather.jl | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/worldclim/shared.jl b/src/worldclim/shared.jl index 88684e1..8b0d099 100644 --- a/src/worldclim/shared.jl +++ b/src/worldclim/shared.jl @@ -8,7 +8,7 @@ See: [www.worldclim.org](https://www.worldclim.org) """ struct WorldClim{X} <: RasterDataSource end -const WORLDCLIM_URI = URI(scheme="https", host="biogeo.ucdavis.edu", path="/data/worldclim/v2.1") +const WORLDCLIM_URI = URI(scheme="https", host="geodata.ucdavis.edu", path="/climate/worldclim/2_1") resolutions(::Type{<:WorldClim}) = ("30s", "2.5m", "5m", "10m") defres(::Type{<:WorldClim}) = "10m" diff --git a/test/worldclim-bioclim.jl b/test/worldclim-bioclim.jl index 9b84dfa..99010cc 100644 --- a/test/worldclim-bioclim.jl +++ b/test/worldclim-bioclim.jl @@ -2,7 +2,7 @@ using RasterDataSources, URIs, Test, Dates using RasterDataSources: rastername, rasterpath, zipurl, zipname, zippath @testset "WorldClim BioClim" begin - zip_url = URI(scheme="https", host="biogeo.ucdavis.edu", path="/data/worldclim/v2.1/base/wc2.1_10m_bio.zip") + zip_url = URI(scheme="https", host="geodata.ucdavis.edu", path="/climate/worldclim/2_1/base/wc2.1_10m_bio.zip") @test zipurl(WorldClim{BioClim}, 2; res="10m") == zip_url @test zipname(WorldClim{BioClim}, 2; res="10m") == "wc2.1_10m_bio.zip" diff --git a/test/worldclim-climate.jl b/test/worldclim-climate.jl index 281ccea..9ddcd00 100644 --- a/test/worldclim-climate.jl +++ b/test/worldclim-climate.jl @@ -3,7 +3,7 @@ using RasterDataSources: rastername, rasterpath, zipurl, zipname, zippath @testset "WorldClim Climate" begin - zip_url = URI(scheme="https", host="biogeo.ucdavis.edu", path="/data/worldclim/v2.1/base/wc2.1_10m_wind.zip") + zip_url = URI(scheme="https", host="geodata.ucdavis.edu", path="/climate/worldclim/2_1/base/wc2.1_10m_wind.zip") @test zipurl(WorldClim{Climate}, :wind; res="10m") == zip_url @test zipname(WorldClim{Climate}, :wind; res="10m") == "wc2.1_10m_wind.zip" diff --git a/test/worldclim-elevation.jl b/test/worldclim-elevation.jl index 6075751..fa0c7a7 100644 --- a/test/worldclim-elevation.jl +++ b/test/worldclim-elevation.jl @@ -2,7 +2,7 @@ using RasterDataSources, URIs, Test, Dates using RasterDataSources: rastername, rasterpath, zipurl, zipname, zippath @testset "WorldClim Elevation" begin - zip_url = URI(scheme="https", host="biogeo.ucdavis.edu", path="/data/worldclim/v2.1/base/wc2.1_10m_elev.zip") + zip_url = URI(scheme="https", host="geodata.ucdavis.edu", path="/climate/worldclim/2_1/base/wc2.1_10m_elev.zip") @test zipurl(WorldClim{Elevation}, :elev; res="10m") == zip_url @test zipname(WorldClim{Elevation}, :elev; res="10m") == "wc2.1_10m_elev.zip" diff --git a/test/worldclim-weather.jl b/test/worldclim-weather.jl index ac4dfe4..e350d5b 100644 --- a/test/worldclim-weather.jl +++ b/test/worldclim-weather.jl @@ -9,7 +9,7 @@ using RasterDataSources: rastername, rasterpath, zipurl, zipname, zippath zip_file = joinpath(ENV["RASTERDATASOURCES_PATH"], "WorldClim", "Weather", "zips", "wc2.1_2.5m_prec_2010-2018.zip") @test zippath(WorldClim{Weather}, :prec; decade=Date(2010)) == zip_file @test zipurl(WorldClim{Weather}, :prec; decade=Date(2010)) == - URI(scheme="https", host="biogeo.ucdavis.edu", path="/data/worldclim/v2.1/hist/wc2.1_2.5m_prec_2010-2018.zip") + URI(scheme="https", host="geodata.ucdavis.edu", path="/climate/worldclim/2_1/hist/wc2.1_2.5m_prec_2010-2018.zip") @test zipname(WorldClim{Weather}, :prec; decade=Date(2010)) == "wc2.1_2.5m_prec_2010-2018.zip"