JS: Use settings.py default zoom defined with CHIMERE_DEFAULT_ZOOM

6 files changed, 18 insertions, 4 deletions

diff --git a/chimere/main/views.py b/chimere/main/views.py
index 25ad630..190adb7 100644
--- a/chimere/main/views.py
+++ b/chimere/main/views.py
@@ -90,6 +90,7 @@ def index(request, area_name=None, default_area=None, simple=False):
                          'welcome':welcome(request, display_welcome),
                          'areas':areas, 'map_layer':settings.MAP_LAYER,
                          'dynamic_categories':settings.DYNAMIC_CATEGORIES,
+                         'p_zoom':settings.CHIMERE_DEFAULT_ZOOM,
                         })
     # manage permalink
     if request.GET:
@@ -137,6 +138,7 @@ def edit(request, area_name=""):
                   'action_selected':('contribute', 'edit'),
                   'error_message':'',
                   'map_layer':settings.MAP_LAYER,
+                  'p_zoom':settings.CHIMERE_DEFAULT_ZOOM,
                   'form':form,
                   'dated':settings.DAYS_BEFORE_EVENT,
                   'extra_head':form.media,
diff --git a/chimere/main/widgets.py b/chimere/main/widgets.py
index 1af6637..6fed7ef 100644
--- a/chimere/main/widgets.py
+++ b/chimere/main/widgets.py
@@ -44,6 +44,7 @@ def getMapJS(area_name=''):
     js += u"var centerLonLat = new OpenLayers.LonLat(%f,\
 %f).transform(epsg_display_projection, epsg_projection);\n" % \
                                                          settings.DEFAULT_CENTER
+    js += u"var p_zoom = %s;\n" % settings.CHIMERE_DEFAULT_ZOOM
     js += u"var media_path = '%s';\n" % settings.MEDIA_URL
     js += u"var map_layer = %s;\n" % settings.MAP_LAYER
     js += u"var restricted_extent;\n"
diff --git a/chimere/settings.py.example b/chimere/settings.py.example
index 5a1d1fe..7761d05 100644
--- a/chimere/settings.py.example
+++ b/chimere/settings.py.example
@@ -21,6 +21,8 @@ GPSBABEL_OPTIONS = 'simplify,crosstrack,error=0.005k' # simplify with an
 ## chimere specific ##
 # center of the map
 DEFAULT_CENTER = (-1.679444, 48.114722)
+# default zoom
+CHIMERE_DEFAULT_ZOOM = "13"
 # projection used by the main map
 # most public map providers use spherical mercator : 900913
 EPSG_PROJECTION = 900913
diff --git a/chimere/static/edit_area.js b/chimere/static/edit_area.js
index 7695e6b..95f0121 100644
--- a/chimere/static/edit_area.js
+++ b/chimere/static/edit_area.js
@@ -47,6 +47,9 @@ function init(){
     map.events.register('moveend', map, updateForm);
     /* zoom to the appropriate extent */
     if (!zoomToCurrentExtent(map)){
-        map.setCenter(centerLonLat, 12);
+        if(p_zoom)
+            map.setCenter(centerLonLat, p_zoom);
+        else
+            map.setCenter(centerLonLat, 12);
     }
 }
diff --git a/chimere/static/edit_map.js b/chimere/static/edit_map.js
index 5000b75..7449a26 100644
--- a/chimere/static/edit_map.js
+++ b/chimere/static/edit_map.js
@@ -79,7 +79,10 @@ function init(){
     map.events.register('click', map, setMarker);
     /* zoom to the appropriate extent */
     if (!zoomToCurrentExtent(map)){
-        map.setCenter(centerLonLat, 12);
+        if(p_zoom)
+            map.setCenter(centerLonLat, p_zoom);
+        else
+            map.setCenter(centerLonLat, 12);
     }
 }
 
diff --git a/chimere/static/main_map.js b/chimere/static/main_map.js
index eabb1c7..606bd96 100644
--- a/chimere/static/main_map.js
+++ b/chimere/static/main_map.js
@@ -503,8 +503,11 @@ function init(){
     }
     /* if from a permalink */
     if (p_zoom) {
-        var p_centerLonLat = new OpenLayers.LonLat(p_lon, p_lat);
-        p_centerLonLat.transform(epsg_display_projection, epsg_projection);
+        var p_centerLonLat = centerLonLat;
+        if(p_lon){
+            var p_centerLonLat = new OpenLayers.LonLat(p_lon, p_lat);
+            p_centerLonLat.transform(epsg_display_projection, epsg_projection);
+        }
         map.setCenter(p_centerLonLat, p_zoom);
         if (p_display_submited) {
             document.getElementById('display_submited_check').checked = true;