Skip to content

Commit be8278b

Browse files
jericksjericks
committed
Fix natural earth download urls
1 parent 6fa84a2 commit be8278b

File tree

5 files changed

+15
-16
lines changed

5 files changed

+15
-16
lines changed

‎examples/layer_sqlite.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import static geoscript.GeoScript.unzip
1010
// Download data from natural earth
1111
File dir = new File("naturalearth")
1212
[
13-
[name: "countries", url: "http://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/cultural/ne_110m_admin_0_countries.zip"],
14-
[name: "ocean", url: "http://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/physical/ne_110m_ocean.zip"]
13+
[name: "countries", url: "https://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/cultural/ne_110m_admin_0_countries.zip"],
14+
[name: "ocean", url: "https://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/physical/ne_110m_ocean.zip"]
1515
].each { Map item ->
1616
unzip(download(new URL(item.url), new File(dir, "${item.name}.zip"), overwrite: false))
1717
}

‎examples/map_cube.groovy

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import static geoscript.GeoScript.unzip
99
// Download data from natural earth
1010
File dir = new File("naturalearth")
1111
[
12-
[name: "countries", url: "http://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/cultural/ne_110m_admin_0_countries.zip"],
13-
[name: "ocean", url: "http://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/physical/ne_110m_ocean.zip"]
12+
[name: "countries", url: "https://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/cultural/ne_110m_admin_0_countries.zip"],
13+
[name: "ocean", url: "https://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/physical/ne_110m_ocean.zip"]
1414
].each { Map item ->
1515
unzip(download(new URL(item.url), new File(dir, "${item.name}.zip"), overwrite: false))
1616
}
@@ -27,6 +27,4 @@ countries.style = styleReader.read("stroke=black stroke-width=0.5 fill=white")
2727

2828
// Create a map cube
2929
MapCube mapCube = new MapCube(title: "The Earth Map Cube", source: "Natural Earth", drawOutline: true)
30-
mapCube.render([ocean, countries], new File("map_cube.png"))
31-
32-
30+
mapCube.render([ocean, countries], new File("map_cube.png"))

‎examples/naturalearth2mbtiles.groovy

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,12 @@ import static geoscript.GeoScript.unzip
1515
// Download data from natural earth
1616
File dataDir = new File("naturalearth")
1717
[
18-
[name: "countries", url: "http://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/cultural/ne_110m_admin_0_countries.zip"],
19-
[name: "ocean", url: "http://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/physical/ne_110m_ocean.zip"],
20-
[name: "places", url: "http://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/cultural/ne_110m_populated_places.zip"],
21-
[name: "rivers", url: "http://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/physical/ne_110m_rivers_lake_centerlines.zip"],
22-
[name: "states", url: "http://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/cultural/ne_110m_admin_1_states_provinces.zip"]
18+
19+
[name: "countries", url: "https://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/cultural/ne_110m_admin_0_countries.zip"],
20+
[name: "ocean", url: "https://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/physical/ne_110m_ocean.zip"],
21+
[name: "places", url: "https://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/cultural/ne_110m_populated_places.zip"],
22+
[name: "rivers", url: "https://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/physical/ne_110m_rivers_lake_centerlines.zip"],
23+
[name: "states", url: "https://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/cultural/ne_110m_admin_1_states_provinces.zip"]
2324

2425
].each { Map item ->
2526
println "Downloading ${item.name} from ${item.url}..."

‎examples/tiles_dbtiles.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ dir.mkdir()
1919
// Download data from natural earth
2020
File shpDir = new File("naturalearth")
2121
[
22-
[name: "countries", url: "http://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/cultural/ne_110m_admin_0_countries.zip"],
23-
[name: "ocean", url: "http://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/physical/ne_110m_ocean.zip"]
22+
[name: "countries", url: "https://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/cultural/ne_110m_admin_0_countries.zip"],
23+
[name: "ocean", url: "https://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/physical/ne_110m_ocean.zip"]
2424
].each { Map item ->
2525
unzip(download(new URL(item.url), new File(shpDir, "${item.name}.zip"), overwrite: false))
2626
}

‎examples/vectortiles_generate_world_pbf_mbtiles.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import static geoscript.GeoScript.unzip
1313
// Download data from natural earth
1414
File dataDir = new File("naturalearth")
1515
[
16-
[name: "countries", url: "http://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/cultural/ne_110m_admin_0_countries.zip"],
17-
[name: "ocean", url: "http://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/physical/ne_110m_ocean.zip"]
16+
[name: "countries", url: "https://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/cultural/ne_110m_admin_0_countries.zip"],
17+
[name: "ocean", url: "https://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/physical/ne_110m_ocean.zip"]
1818
].each { Map item ->
1919
unzip(download(new URL(item.url), new File(dataDir, "${item.name}.zip"), overwrite: false))
2020
}

0 commit comments

Comments
 (0)