move leaflet settings to separate config file

related issue: rl-institut/WAM#74
rl-institut · Jul 4, 2019 · d9d7054 · d9d7054
1 parent b464800
commit d9d7054
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 33 deletions.
diff --git a/config/leaflet.py b/config/leaflet.py
@@ -0,0 +1,36 @@
+# Leaflet config: variable "LEAFLET_CONFIG" moved from settings.py to here
+# since it conflicts with other apps using django-leaflet package.
+# The leaflet config is now served via views.MapView() (uses settings override
+# feature of django-leaflet)
+# 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.eyJ1IjoibWFwYm94IiwiYSI6ImNpejY4NXVycTA2emYycXBndHRqcmZ3N3gifQ.rJcFIG214AriISLbB6B5aw',
+               {'attribution': '&copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>',
+                'id': 'mapbox.streets',
+                'minZoom': 9,
+                'maxZoom': 12,
+                }
+               ),
+              ('OSM B&W', 'http://{s}.www.toolserver.org/tiles/bw-mapnik/{z}/{x}/{y}.png',
+               {'attribution': '&copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>',
+                'minZoom': 9,
+                'maxZoom': 12,
+                }
+               ),
+              ('OSM', 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+               {'attribution': '&copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>',
+                'minZoom': 9,
+                'maxZoom': 12,
+                }),
+              ('OpenTopoMap', 'http://{s}.tile.opentopomap.org/{z}/{x}/{y}.png',
+               {'attribution': 'Data: &copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, Display: &copy <a href="http://opentopomap.org">OpenTopoMap</a> <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>',
+                'minZoom': 9,
+                'maxZoom': 12,
+                })
+              ],
+    'DEFAULT_CENTER': (51.834167, 12.237778),
+    'DEFAULT_ZOOM': 10,
+    'RESET_VIEW': False,
+    'NO_GLOBALS': False
+}
diff --git a/settings.py b/settings.py
@@ -3,36 +3,8 @@
     'djgeojson',
 ]
 
-# leaflet config
-LEAFLET_CONFIG = {
-    'TILES': [('Streets', 'https://api.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token=pk.eyJ1IjoibWFwYm94IiwiYSI6ImNpejY4NXVycTA2emYycXBndHRqcmZ3N3gifQ.rJcFIG214AriISLbB6B5aw',
-               {'attribution': '&copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>',
-                'id': 'mapbox.streets',
-                'minZoom': 9,
-                'maxZoom': 12,
-                }
-               ),
-              ('OSM B&W', 'http://{s}.www.toolserver.org/tiles/bw-mapnik/{z}/{x}/{y}.png',
-               {'attribution': '&copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>',
-                'minZoom': 9,
-                'maxZoom': 12,
-                }
-               ),
-              ('OSM', 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
-               {'attribution': '&copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>',
-                'minZoom': 9,
-                'maxZoom': 12,
-                }),
-              ('OpenTopoMap', 'http://{s}.tile.opentopomap.org/{z}/{x}/{y}.png',
-               {'attribution': 'Data: &copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, Display: &copy <a href="http://opentopomap.org">OpenTopoMap</a> <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>',
-                'minZoom': 9,
-                'maxZoom': 12,
-                })
-              ],
-    'DEFAULT_CENTER': (51.834167, 12.237778),
-    'DEFAULT_ZOOM': 10,
-    'RESET_VIEW': False,
-    'NO_GLOBALS': False,
-    #'SRID': 4326
-
-}
+# Leaflet config: variable "LEAFLET_CONFIG" moved to config/leaflet.py since it
+# conflicts with other apps using django-leaflet package.
+# The leaflet config is now served via views.MapView() (uses settings override
+# feature of django-leaflet)
+# Related issue: https://github.com/rl-institut/WAM/issues/74