Merge pull request #114 from rl-institut/fix/remove_mapbox_tiles

Fix/remove mapbox tiles
rl-institut · Oct 31, 2020 · be83efc · be83efc
2 parents 57448bc + a14c13e
commit be83efc
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/__init__.py b/__init__.py
@@ -1 +1 @@
-__version__ = '1.0.3'
+__version__ = '1.0.4'
diff --git a/config/leaflet.py b/config/leaflet.py
@@ -5,9 +5,8 @@
 # Related issue: https://github.com/rl-institut/WAM/issues/74
 
 LEAFLET_CONFIG = {
-    'TILES': [('Streets', 'https://api.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token=pk.eyJ1Ijoid2FtLXJsaSIsImEiOiJjanlpbTdsdXgwMHljM2JueGNrODZtbjB5In0.A7X6_rpw7hRehkulqMjpXw',
-               {'attribution': 'Tiles: &copy; <a href="https://www.mapbox.com/about/maps/" target="_blank" rel="noopener noreferrer">mapbox</a>, Data: &copy; <a href="http://openstreetmap.org" target="_blank" rel="noopener noreferrer">OpenStreetMap</a> contributors (<a href="https://www.mapbox.com/map-feedback/#/-74.5/40/10" target="_blank" rel="noopener noreferrer">improve this map</a>), <a href="http://creativecommons.org/licenses/by-sa/2.0/" target="_blank" rel="noopener noreferrer">CC-BY-SA</a>',
-                'id': 'mapbox.streets',
+    'TILES': [('OSM', 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+               {'attribution': '&copy; <a href="http://openstreetmap.org" target="_blank" rel="noopener noreferrer">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/" target="_blank" rel="noopener noreferrer">CC-BY-SA</a>',
                 'minZoom': 9,
                 'maxZoom': 12,
                 }
@@ -18,11 +17,6 @@
                 'maxZoom': 12,
                 }
                ),
-              ('OSM', 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
-               {'attribution': '&copy; <a href="http://openstreetmap.org" target="_blank" rel="noopener noreferrer">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/" target="_blank" rel="noopener noreferrer">CC-BY-SA</a>',
-                'minZoom': 9,
-                'maxZoom': 12,
-                }),
               ('OpenTopoMap', 'http://{s}.tile.opentopomap.org/{z}/{x}/{y}.png',
                {'attribution': 'Tiles: &copy <a href="http://opentopomap.org" target="_blank" rel="noopener noreferrer">OpenTopoMap</a>, Data: &copy; <a href="http://openstreetmap.org" target="_blank" rel="noopener noreferrer">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/" target="_blank" rel="noopener noreferrer">CC-BY-SA</a>',
                 'minZoom': 9,

diff --git a/doc/whats_new.rst b/doc/whats_new.rst
@@ -11,6 +11,7 @@ Eine Liste neuer Funktionen, Verbesserungen und Bugfixes für jedes Release.
     :backlinks: top
 
 .. include::  whatsnew/unreleased.rst
+.. include::  whatsnew/v1.0.4.rst
 .. include::  whatsnew/v1.0.3.rst
 .. include::  whatsnew/v1.0.2.rst
 .. include::  whatsnew/v1.0.1.rst

diff --git a/doc/whatsnew/v1.0.4.rst b/doc/whatsnew/v1.0.4.rst
@@ -0,0 +1,7 @@
+v1.0.4 (30. Oktober 2020)
+.........................
+
+Änderungen
+~~~~~~~~~~
+
+- Mapbox Tiles entfernt, new default: OSM