Merge pull request #315 from BibMartin/osm_odbl2

ocefpaf · ocefpaf · commit edb1c25030a1 · 2016-01-01T14:51:00.000-03:00
Bugfix in template/tiles/openstreetmap/attr.txt
diff --git a/folium/templates/tiles/openstreetmap/attr.txt b/folium/templates/tiles/openstreetmap/attr.txt
@@ -1,2 +1 @@
-Data by <a href="http://openstreetmap.org">OpenStreetMap</a>,
-under <a href="http://www.openstreetmap.org/copyright">ODbL</a>.
+Data by <a href="http://openstreetmap.org">OpenStreetMap</a>, under <a href="http://www.openstreetmap.org/copyright">ODbL</a>.
diff --git a/tests/test_folium.py b/tests/test_folium.py
@@ -514,7 +514,7 @@ def test_map_build(self):
             {'id': 'tile_layer_'+'0'*32,
              'address': 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
              'attr': ('Data by <a href="http://openstreetmap.org">OpenStreetMap'
-                      '</a>,\nunder '
+                      '</a>,under '
                       '<a href="http://www.openstreetmap.org/copyright">ODbL'
                       '</a>.'),
              'max_zoom': 20,

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`		`-Data by <a href="http://openstreetmap.org">OpenStreetMap</a>,`
`2`		`-under <a href="http://www.openstreetmap.org/copyright">ODbL</a>.`
	`1`	`+Data by <a href="http://openstreetmap.org">OpenStreetMap</a>, under <a href="http://www.openstreetmap.org/copyright">ODbL</a>.`