Skip to content

Update Natural Earth URL #1833

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.

Sign up for GitHub

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

Merged
dopplershift merged 2 commits into from
Sep 1, 2021
Merged

Update Natural Earth URL #1833

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
534040d
update natural earth url
rcomer Sep 1, 2021
c3f4e57
update comment
rcomer Sep 1, 2021
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
9 changes: 4 additions & 5 deletions lib/cartopy/io/shapereader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,11 +295,10 @@ class NEShpDownloader(Downloader):
"""
FORMAT_KEYS = ('config', 'resolution', 'category', 'name')

# Define the NaturalEarth URL template. The natural earth website
# returns a 302 status if accessing directly, so we use the naciscdn
# URL directly.
_NE_URL_TEMPLATE = ('https://naciscdn.org/naturalearth/{resolution}'
'/{category}/ne_{resolution}_{name}.zip')
# Define the NaturalEarth URL template. Shapefiles are hosted on AWS since
# 2021: https://github.com/nvkelso/natural-earth-vector/issues/445
_NE_URL_TEMPLATE = ('https://naturalearth.s3.amazonaws.com/'
'{resolution}_{category}/ne_{resolution}_{name}.zip')

def __init__(self,
url_template=_NE_URL_TEMPLATE,
Expand Down