Improve area management

1 files changed, 12 insertions, 10 deletions

diff --git a/chimere/views.py b/chimere/views.py
index 489d235..8c1250d 100644
--- a/chimere/views.py
+++ b/chimere/views.py
@@ -66,7 +66,8 @@ def get_base_response(area_name=""):
     base_response_dct['JQUERY_CSS_URLS'] = settings.JQUERY_CSS_URLS
     return base_response_dct
 
-def index(request, area_name=None, default_area=None, simple=False):
+def index(request, area_name=None, default_area=None, simple=False,
+          zoomout=None):
     """
     Main page
     """
@@ -85,15 +86,16 @@ def index(request, area_name=None, default_area=None, simple=False):
         try:
             default_area = Area.objects.get(urn=area_name)
         except Area.DoesNotExist:
-            # Do not return an error
-            pass
-    response_dct.update({'actions':actions, 'action_selected':('view',),
-                         'error_message':'', 'default_area':default_area,
-                         'news_visible': news_visible,
-                         'areas_visible': settings.CHIMERE_DISPLAY_AREAS,
-                         'map_layer':settings.CHIMERE_DEFAULT_MAP_LAYER,
-                         'dynamic_categories':settings.CHIMERE_DYNAMIC_CATEGORIES,
-                        })
+            return redirect(reverse('chimere:index'))
+    response_dct.update({
+        'actions':actions, 'action_selected':('view',),
+         'error_message':'', 'default_area':default_area,
+         'news_visible': news_visible,
+         'areas_visible': settings.CHIMERE_DISPLAY_AREAS,
+         'map_layer':settings.CHIMERE_DEFAULT_MAP_LAYER,
+         'dynamic_categories':settings.CHIMERE_DYNAMIC_CATEGORIES,
+         'zoomout':zoomout
+        })
     tpl = 'chimere/main_map.html'
     if simple:
         tpl = 'chimere/main_map_simple.html'