Skip to content

Commit

Permalink
Merge pull request #1833 from rcomer/natural-earth-url
Browse files Browse the repository at this point in the history
Update Natural Earth URL
  • Loading branch information
dopplershift committed Sep 1, 2021
2 parents 05672e4 + c3f4e57 commit af814c3
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions lib/cartopy/io/shapereader.py
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

0 comments on commit af814c3

Please sign in to comment.