diff --git a/__init__.py b/__init__.py index 3f6fab6..8a81504 100644 --- 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 index 04b957b..763b28a 100644 --- 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: © mapbox, Data: © OpenStreetMap contributors (improve this map), CC-BY-SA', - 'id': 'mapbox.streets', + 'TILES': [('OSM', 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', + {'attribution': '© OpenStreetMap contributors, CC-BY-SA', 'minZoom': 9, 'maxZoom': 12, } @@ -18,11 +17,6 @@ 'maxZoom': 12, } ), - ('OSM', 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', - {'attribution': '© OpenStreetMap contributors, CC-BY-SA', - 'minZoom': 9, - 'maxZoom': 12, - }), ('OpenTopoMap', 'http://{s}.tile.opentopomap.org/{z}/{x}/{y}.png', {'attribution': 'Tiles: © OpenTopoMap, Data: © OpenStreetMap contributors, CC-BY-SA', 'minZoom': 9, diff --git a/doc/whats_new.rst b/doc/whats_new.rst index b2bd004..6c36927 100644 --- 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 new file mode 100644 index 0000000..adbf182 --- /dev/null +++ b/doc/whatsnew/v1.0.4.rst @@ -0,0 +1,7 @@ +v1.0.4 (30. Oktober 2020) +......................... + +Änderungen +~~~~~~~~~~ + +- Mapbox Tiles entfernt, new default: OSM