Fix natural earth download urls

jericks · jericks · commit be8278b45892 · 2022-11-08T17:23:31.000-08:00
diff --git a/examples/layer_sqlite.groovy b/examples/layer_sqlite.groovy
@@ -10,8 +10,8 @@ import static geoscript.GeoScript.unzip
 // Download data from natural earth
 File dir = new File("naturalearth")
 [
-        [name: "countries", url: "http://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/cultural/ne_110m_admin_0_countries.zip"],
-        [name: "ocean",     url: "http://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/physical/ne_110m_ocean.zip"]
+        [name: "countries",  url: "https://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/cultural/ne_110m_admin_0_countries.zip"],
+        [name: "ocean",      url: "https://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/physical/ne_110m_ocean.zip"]
 ].each { Map item ->
     unzip(download(new URL(item.url), new File(dir, "${item.name}.zip"), overwrite: false))
 }
diff --git a/examples/map_cube.groovy b/examples/map_cube.groovy
@@ -9,8 +9,8 @@ import static geoscript.GeoScript.unzip
 // Download data from natural earth
 File dir = new File("naturalearth")
 [
-        [name: "countries", url: "http://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/cultural/ne_110m_admin_0_countries.zip"],
-        [name: "ocean",     url: "http://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/physical/ne_110m_ocean.zip"]
+        [name: "countries",  url: "https://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/cultural/ne_110m_admin_0_countries.zip"],
+        [name: "ocean",      url: "https://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/physical/ne_110m_ocean.zip"]
 ].each { Map item ->
     unzip(download(new URL(item.url), new File(dir, "${item.name}.zip"), overwrite: false))
 }
@@ -27,6 +27,4 @@ countries.style = styleReader.read("stroke=black stroke-width=0.5 fill=white")
 
 // Create a map cube
 MapCube mapCube = new MapCube(title: "The Earth Map Cube", source: "Natural Earth", drawOutline: true)
-mapCube.render([ocean, countries], new File("map_cube.png"))
-
-
+mapCube.render([ocean, countries], new File("map_cube.png"))
diff --git a/examples/naturalearth2mbtiles.groovy b/examples/naturalearth2mbtiles.groovy
@@ -15,11 +15,12 @@ import static geoscript.GeoScript.unzip
 // Download data from natural earth
 File dataDir = new File("naturalearth")
 [
-        [name: "countries", url: "http://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/cultural/ne_110m_admin_0_countries.zip"],
-        [name: "ocean",     url: "http://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/physical/ne_110m_ocean.zip"],
-        [name: "places",    url: "http://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/cultural/ne_110m_populated_places.zip"],
-        [name: "rivers",    url: "http://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/physical/ne_110m_rivers_lake_centerlines.zip"],
-        [name: "states",    url: "http://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/cultural/ne_110m_admin_1_states_provinces.zip"]
+
+        [name: "countries",  url: "https://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/cultural/ne_110m_admin_0_countries.zip"],
+        [name: "ocean",      url: "https://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/physical/ne_110m_ocean.zip"],
+        [name: "places",     url: "https://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/cultural/ne_110m_populated_places.zip"],
+        [name: "rivers",     url: "https://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/physical/ne_110m_rivers_lake_centerlines.zip"],
+        [name: "states",     url: "https://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/cultural/ne_110m_admin_1_states_provinces.zip"]
 
 ].each { Map item ->
     println "Downloading ${item.name} from ${item.url}..."
diff --git a/examples/tiles_dbtiles.groovy b/examples/tiles_dbtiles.groovy
@@ -19,8 +19,8 @@ dir.mkdir()
 // Download data from natural earth
 File shpDir = new File("naturalearth")
 [
-        [name: "countries", url: "http://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/cultural/ne_110m_admin_0_countries.zip"],
-        [name: "ocean",     url: "http://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/physical/ne_110m_ocean.zip"]
+        [name: "countries",  url: "https://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/cultural/ne_110m_admin_0_countries.zip"],
+        [name: "ocean",      url: "https://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/physical/ne_110m_ocean.zip"]
 ].each { Map item ->
     unzip(download(new URL(item.url), new File(shpDir, "${item.name}.zip"), overwrite: false))
 }
diff --git a/examples/vectortiles_generate_world_pbf_mbtiles.groovy b/examples/vectortiles_generate_world_pbf_mbtiles.groovy
@@ -13,8 +13,8 @@ import static geoscript.GeoScript.unzip
 // Download data from natural earth
 File dataDir = new File("naturalearth")
 [
-        [name: "countries", url: "http://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/cultural/ne_110m_admin_0_countries.zip"],
-        [name: "ocean",     url: "http://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/physical/ne_110m_ocean.zip"]
+        [name: "countries",  url: "https://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/cultural/ne_110m_admin_0_countries.zip"],
+        [name: "ocean",      url: "https://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/physical/ne_110m_ocean.zip"]
 ].each { Map item ->
     unzip(download(new URL(item.url), new File(dataDir, "${item.name}.zip"), overwrite: false))
 }

Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,8 @@ import static geoscript.GeoScript.unzip`
`10`	`10`	`// Download data from natural earth`
`11`	`11`	`File dir = new File("naturalearth")`
`12`	`12`	`[`
`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"]`
`15`	`15`	`].each { Map item ->`
`16`	`16`	`unzip(download(new URL(item.url), new File(dir, "${item.name}.zip"), overwrite: false))`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,8 @@ dir.mkdir()`
`19`	`19`	`// Download data from natural earth`
`20`	`20`	`File shpDir = new File("naturalearth")`
`21`	`21`	`[`
`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"]`
`24`	`24`	`].each { Map item ->`
`25`	`25`	`unzip(download(new URL(item.url), new File(shpDir, "${item.name}.zip"), overwrite: false))`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,8 @@ import static geoscript.GeoScript.unzip`
`13`	`13`	`// Download data from natural earth`
`14`	`14`	`File dataDir = new File("naturalearth")`
`15`	`15`	`[`
`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"]`
`18`	`18`	`].each { Map item ->`
`19`	`19`	`unzip(download(new URL(item.url), new File(dataDir, "${item.name}.zip"), overwrite: false))`
`20`	`20`	`}`