Merge pull request #199 from tahmed42/master

ocefpaf · ocefpaf · commit 9219daa9432e · 2015-08-24T12:57:06.000-03:00
Fix Stamen Toner URL to use .png as stated at maps.stamen.com. Update…
diff --git a/folium/templates/tiles/stamentoner/attr.txt b/folium/templates/tiles/stamentoner/attr.txt
@@ -1 +1 @@
-Map tiles by <a href="http://stamen.com">Stamen Design</a>, under <a href="http://creativecommons.org/licenses/by/3.0">CC BY 3.0</a>. Data by <a href="http://openstreetmap.org">OpenStreetMap</a>, under <a href="http://creativecommons.org/licenses/by-sa/3.0">CC BY SA</a>.
+Map tiles by <a href="http://stamen.com">Stamen Design</a>, under <a href="http://creativecommons.org/licenses/by/3.0">CC BY 3.0</a>. Data by <a href="http://openstreetmap.org">OpenStreetMap</a>, under <a href="http://www.openstreetmap.org/copyright">ODbL</a>.
diff --git a/folium/templates/tiles/stamentoner/tiles.txt b/folium/templates/tiles/stamentoner/tiles.txt
@@ -1 +1 @@
-https://stamen-tiles-{s}.a.ssl.fastly.net/toner/{z}/{x}/{y}.jpg
+https://stamen-tiles-{s}.a.ssl.fastly.net/toner/{z}/{x}/{y}.png

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-Map tiles by <a href="http://stamen.com">Stamen Design</a>, under <a href="http://creativecommons.org/licenses/by/3.0">CC BY 3.0</a>. Data by <a href="http://openstreetmap.org">OpenStreetMap</a>, under <a href="http://creativecommons.org/licenses/by-sa/3.0">CC BY SA</a>.`
	`1`	`+Map tiles by <a href="http://stamen.com">Stamen Design</a>, under <a href="http://creativecommons.org/licenses/by/3.0">CC BY 3.0</a>. Data by <a href="http://openstreetmap.org">OpenStreetMap</a>, under <a href="http://www.openstreetmap.org/copyright">ODbL</a>.`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-https://stamen-tiles-{s}.a.ssl.fastly.net/toner/{z}/{x}/{y}.jpg`
	`1`	`+https://stamen-tiles-{s}.a.ssl.fastly.net/toner/{z}/{x}/{y}.png`