Merge pull request #66 from batisteo/add_minzoom_maxzoom

Added minZoom and maxZoom to map initialization options.
makinacorpus · Mar 30, 2014 · cd4e05e · cd4e05e
2 parents c8702d3 + 7ab99d4
commit cd4e05e
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 2 deletions.
diff --git a/CHANGES b/CHANGES
@@ -5,7 +5,7 @@ CHANGELOG
 0.13.1 (unreleased)
 -------------------
 
-- Nothing changed yet.
+* Add minZoom and maxZoom to map initialization
 
 
 0.13.0 (2014-03-26)

diff --git a/README.rst b/README.rst
@@ -183,10 +183,12 @@ Initial map center and zoom level
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 In addition to limiting your maps with ``SPATIAL_EXTENT``, you can also specify
-initial map center and zoom level::
+initial map center, default, min and max zoom level::
 
     'DEFAULT_CENTER': (6.0, 45.0),
     'DEFAULT_ZOOM': 16,
+    'MIN_ZOOM': 3,
+    'MAX_ZOOM': 18,
 
 The tuple/list must contain (lat,lng) coords.
 

diff --git a/leaflet/__init__.py b/leaflet/__init__.py
@@ -29,6 +29,8 @@
     'ATTRIBUTION_PREFIX': None,
     'SPATIAL_EXTENT': None,
     'DEFAULT_ZOOM': None,
+    'MIN_ZOOM': None,
+    'MAX_ZOOM': None,
     'DEFAULT_CENTER': None,
     'SRID': None,
     'TILES_EXTENT': [],

diff --git a/leaflet/static/leaflet/leaflet.extras.js b/leaflet/static/leaflet/leaflet.extras.js
@@ -46,6 +46,8 @@ L.Map.DjangoMap = L.Map.extend({
         var djoptions = options.djoptions;
         options.zoom = djoptions.zoom;
         options.center = djoptions.center;
+        options.minZoom = djoptions.minzoom;
+        options.maxZoom = djoptions.maxzoom;
         // Translate to native options
         options = L.Util.extend(options,
                                 this._projectionOptions(djoptions));

diff --git a/leaflet/templatetags/leaflet_tags.py b/leaflet/templatetags/leaflet_tags.py
@@ -68,6 +68,8 @@ def leaflet_map(name, callback=None, fitextent=True, creatediv=True, loadevent='
         fitextent=fitextent,
         center=app_settings['DEFAULT_CENTER'],
         zoom=app_settings['DEFAULT_ZOOM'],
+        minzoom=app_settings['MIN_ZOOM'],
+        maxzoom=app_settings['MAX_ZOOM'],
         layers=[(six.text_type(label), url, attrs) for (label, url, attrs) in app_settings.get('TILES')],
         attributionprefix=app_settings.get('ATTRIBUTION_PREFIX'),
         scale=app_settings.get('SCALE'),