Fix restricted extent - Add restricted extent to area admin

9 files changed, 240 insertions, 26 deletions

diff --git a/chimere/default_settings.py b/chimere/default_settings.py
index 10a46aa..95db972 100644
--- a/chimere/default_settings.py
+++ b/chimere/default_settings.py
@@ -20,9 +20,6 @@ CHIMERE_EPSG_PROJECTION = 900913
 # projection displayed to the end user by openlayers
 # chimere use the same projection to save its data in the database
 CHIMERE_EPSG_DISPLAY_PROJECTION = 4326
-# to restrict the map to a defined bounding box set it here
-# (left, bottom, right, top)
-CHIMERE_RESTRICTED_EXTENT = None
 # dynamic load of categories on the main map
 CHIMERE_DYNAMIC_CATEGORIES = False
 # display of shortcuts for areas
diff --git a/chimere/migrations/0023_auto__add_field_area_restrict_to_extent.py b/chimere/migrations/0023_auto__add_field_area_restrict_to_extent.py
new file mode 100644
index 0000000..742793c
--- /dev/null
+++ b/chimere/migrations/0023_auto__add_field_area_restrict_to_extent.py
@@ -0,0 +1,211 @@
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        
+        # Adding field 'Area.restrict_to_extent'
+        db.add_column('chimere_area', 'restrict_to_extent', self.gf('django.db.models.fields.BooleanField')(default=False), keep_default=False)
+
+
+    def backwards(self, orm):
+        
+        # Deleting field 'Area.restrict_to_extent'
+        db.delete_column('chimere_area', 'restrict_to_extent')
+
+
+    models = {
+        'chimere.area': {
+            'Meta': {'ordering': "('order', 'name')", 'object_name': 'Area'},
+            'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'default': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),
+            'default_subcategories': ('chimere.widgets.SelectMultipleField', [], {'to': "orm['chimere.SubCategory']", 'symmetrical': 'False', 'blank': 'True'}),
+            'external_css': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'layers': ('chimere.widgets.SelectMultipleField', [], {'symmetrical': 'False', 'related_name': "'areas'", 'blank': 'True', 'through': "orm['chimere.AreaLayers']", 'to': "orm['chimere.Layer']"}),
+            'lower_right_corner': ('django.contrib.gis.db.models.fields.PointField', [], {'default': "'POINT(0 0)'"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
+            'order': ('django.db.models.fields.IntegerField', [], {}),
+            'restrict_to_extent': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'subcategories': ('chimere.widgets.SelectMultipleField', [], {'symmetrical': 'False', 'related_name': "'areas'", 'blank': 'True', 'db_table': "'chimere_subcategory_areas'", 'to': "orm['chimere.SubCategory']"}),
+            'upper_left_corner': ('django.contrib.gis.db.models.fields.PointField', [], {'default': "'POINT(0 0)'"}),
+            'urn': ('django.db.models.fields.SlugField', [], {'db_index': 'True', 'unique': 'True', 'max_length': '50', 'blank': 'True'}),
+            'welcome_message': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'})
+        },
+        'chimere.arealayers': {
+            'Meta': {'ordering': "('order',)", 'object_name': 'AreaLayers'},
+            'area': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['chimere.Area']"}),
+            'default': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'layer': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['chimere.Layer']"}),
+            'order': ('django.db.models.fields.IntegerField', [], {})
+        },
+        'chimere.category': {
+            'Meta': {'ordering': "['order']", 'object_name': 'Category'},
+            'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
+            'order': ('django.db.models.fields.IntegerField', [], {})
+        },
+        'chimere.color': {
+            'Meta': {'ordering': "['order']", 'object_name': 'Color'},
+            'code': ('django.db.models.fields.CharField', [], {'max_length': '6'}),
+            'color_theme': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['chimere.ColorTheme']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'order': ('django.db.models.fields.IntegerField', [], {})
+        },
+        'chimere.colortheme': {
+            'Meta': {'object_name': 'ColorTheme'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'})
+        },
+        'chimere.icon': {
+            'Meta': {'object_name': 'Icon'},
+            'height': ('django.db.models.fields.IntegerField', [], {}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
+            'width': ('django.db.models.fields.IntegerField', [], {})
+        },
+        'chimere.importer': {
+            'Meta': {'object_name': 'Importer'},
+            'categories': ('chimere.widgets.SelectMultipleField', [], {'to': "orm['chimere.SubCategory']", 'symmetrical': 'False'}),
+            'filtr': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'importer_type': ('django.db.models.fields.CharField', [], {'max_length': '4'}),
+            'source': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'srid': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'state': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'zipped': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'chimere.layer': {
+            'Meta': {'object_name': 'Layer'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'layer_code': ('django.db.models.fields.TextField', [], {'max_length': '300'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'})
+        },
+        'chimere.marker': {
+            'Meta': {'ordering': "('status', 'name')", 'object_name': 'Marker'},
+            'categories': ('chimere.widgets.SelectMultipleField', [], {'to': "orm['chimere.SubCategory']", 'symmetrical': 'False'}),
+            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'end_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'import_key': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'import_source': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'import_version': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
+            'point': ('chimere.widgets.PointField', [], {}),
+            'ref_item': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'submited_marker'", 'null': 'True', 'to': "orm['chimere.Marker']"}),
+            'route': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'associated_marker'", 'null': 'True', 'to': "orm['chimere.Route']"}),
+            'start_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'status': ('django.db.models.fields.CharField', [], {'max_length': '1'}),
+            'submiter_comment': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'submiter_email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
+            'submiter_session_key': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'})
+        },
+        'chimere.multimediafile': {
+            'Meta': {'object_name': 'MultimediaFile'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'marker': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'multimedia_files'", 'to': "orm['chimere.Marker']"}),
+            'miniature': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'multimedia_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['chimere.MultimediaType']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
+            'order': ('django.db.models.fields.IntegerField', [], {'default': '1'}),
+            'url': ('django.db.models.fields.URLField', [], {'max_length': '200'})
+        },
+        'chimere.multimediatype': {
+            'Meta': {'object_name': 'MultimediaType'},
+            'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'iframe': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'media_type': ('django.db.models.fields.CharField', [], {'max_length': '1'}),
+            'mime_type': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'})
+        },
+        'chimere.news': {
+            'Meta': {'object_name': 'News'},
+            'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'content': ('django.db.models.fields.TextField', [], {}),
+            'date': ('django.db.models.fields.DateField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '150'})
+        },
+        'chimere.picturefile': {
+            'Meta': {'object_name': 'PictureFile'},
+            'height': ('django.db.models.fields.IntegerField', [], {}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'marker': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'pictures'", 'to': "orm['chimere.Marker']"}),
+            'miniature': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
+            'order': ('django.db.models.fields.IntegerField', [], {'default': '1'}),
+            'picture': ('django.db.models.fields.files.ImageField', [], {'max_length': '100'}),
+            'width': ('django.db.models.fields.IntegerField', [], {})
+        },
+        'chimere.property': {
+            'Meta': {'object_name': 'Property'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'marker': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['chimere.Marker']"}),
+            'propertymodel': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['chimere.PropertyModel']"}),
+            'value': ('django.db.models.fields.TextField', [], {})
+        },
+        'chimere.propertymodel': {
+            'Meta': {'ordering': "('order',)", 'object_name': 'PropertyModel'},
+            'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
+            'order': ('django.db.models.fields.IntegerField', [], {}),
+            'type': ('django.db.models.fields.CharField', [], {'max_length': '1'})
+        },
+        'chimere.route': {
+            'Meta': {'ordering': "('status', 'name')", 'object_name': 'Route'},
+            'associated_file': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['chimere.RouteFile']", 'null': 'True', 'blank': 'True'}),
+            'categories': ('chimere.widgets.SelectMultipleField', [], {'to': "orm['chimere.SubCategory']", 'symmetrical': 'False'}),
+            'end_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'height': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'import_key': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'import_source': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'import_version': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
+            'picture': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+            'ref_item': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'submited_route'", 'null': 'True', 'to': "orm['chimere.Route']"}),
+            'route': ('chimere.widgets.RouteField', [], {}),
+            'start_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'status': ('django.db.models.fields.CharField', [], {'max_length': '1'}),
+            'submiter_comment': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'submiter_email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
+            'submiter_session_key': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'width': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'})
+        },
+        'chimere.routefile': {
+            'Meta': {'ordering': "('name',)", 'object_name': 'RouteFile'},
+            'file_type': ('django.db.models.fields.CharField', [], {'max_length': '1'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
+            'raw_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}),
+            'simplified_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'})
+        },
+        'chimere.subcategory': {
+            'Meta': {'ordering': "['category', 'order']", 'object_name': 'SubCategory'},
+            'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['chimere.Category']"}),
+            'color_theme': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['chimere.ColorTheme']", 'null': 'True', 'blank': 'True'}),
+            'icon': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['chimere.Icon']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'item_type': ('django.db.models.fields.CharField', [], {'max_length': '1'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
+            'order': ('django.db.models.fields.IntegerField', [], {})
+        },
+        'chimere.tinyurl': {
+            'Meta': {'object_name': 'TinyUrl'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'parameters': ('django.db.models.fields.CharField', [], {'max_length': '500'})
+        }
+    }
+
+    complete_apps = ['chimere']
diff --git a/chimere/models.py b/chimere/models.py
index f9a1e65..c286422 100644
--- a/chimere/models.py
+++ b/chimere/models.py
@@ -806,6 +806,8 @@ class Area(models.Model, SimpleArea):
        help_text=_(u"If no subcategory is set all subcategories are available"))
     external_css = models.URLField(_(u"Link to an external CSS"), blank=True,
                                    null=True)
+    restrict_to_extent = models.BooleanField(_(u"Restrict to the area extent"),
+                                             default=False)
     objects = models.GeoManager()
 
     def __unicode__(self):
diff --git a/chimere/templates/chimere/blocks/head_chimere.html b/chimere/templates/chimere/blocks/head_chimere.html
index d24a13a..4ef1ae1 100644
--- a/chimere/templates/chimere/blocks/head_chimere.html
+++ b/chimere/templates/chimere/blocks/head_chimere.html
@@ -21,8 +21,6 @@
     var restricted_extent;
     {% if area_name %}
     var area_name = '{{ area_name }}';{% endif %}
-    {% if RESTRICTED_EXTENT %}
-    restricted_extent = new OpenLayers.Bounds({{ RESTRICTED_EXTENT|join:"," }});{% endif %}
 
     $(function() {$( ".draggable" ).draggable({handle:"h2"});});
 </script>
diff --git a/chimere/templates/chimere/blocks/map_params.html b/chimere/templates/chimere/blocks/map_params.html
index bf1f3c1..59cd96c 100644
--- a/chimere/templates/chimere/blocks/map_params.html
+++ b/chimere/templates/chimere/blocks/map_params.html
@@ -18,7 +18,10 @@
     chimere_init_options["checked_categories"] = {{ p_checked_categories }};
     {% if area_id %}chimere_init_options['area_id'] = "{{area_id}}";{% endif %}
     {% if p_current_feature %}
-        chimere_init_options["display_feature"] = {{ p_current_feature }};
+    chimere_init_options["display_feature"] = {{ p_current_feature }};
+    {% endif %}
+    {% if restricted_extent %}{{ restricted_extent }}
+    chimere_init_options["restricted_extent"] = bounds;
     {% endif %}
     $("#map").chimere(chimere_init_options);
     {% if zoom %}
diff --git a/chimere/templatetags/chimere_tags.py b/chimere/templatetags/chimere_tags.py
index 7f22245..147edbd 100644
--- a/chimere/templatetags/chimere_tags.py
+++ b/chimere/templatetags/chimere_tags.py
@@ -91,7 +91,6 @@ def head_chimere(context):
             "EPSG_PROJECTION": settings.CHIMERE_EPSG_PROJECTION,
             "DEFAULT_CENTER": settings.CHIMERE_DEFAULT_CENTER,
             "DEFAULT_ZOOM": settings.CHIMERE_DEFAULT_ZOOM,
-            "RESTRICTED_EXTENT": settings.CHIMERE_RESTRICTED_EXTENT,
             "MAP_LAYER": settings.CHIMERE_DEFAULT_MAP_LAYER,
             "OSM_CSS_URLS": settings.OSM_CSS_URLS,
             "OSM_JS_URLS": settings.OSM_JS_URLS,
@@ -110,20 +109,34 @@ def map_params(context):
     area_name = context['area_name'] if 'area_name' in context else 'area_name'
     context_data['map_layers'] = ", ".join(get_map_layers(area_name))
     context_data['p_checked_categories'] = "[]"
+    area = None
     if area_name:
         try:
             area = Area.objects.get(urn=area_name)
-            context_data['area_id'] = area_name
-            if 'zoomout' in context and context['zoomout']:
-                context_data['zoom'] = "[%s]" % ",".join((
-                    unicode(area.upper_left_corner.x),
-                    unicode(area.upper_left_corner.y),
-                    unicode(area.lower_right_corner.x),
-                    unicode(area.lower_right_corner.y)))
-            context_data['p_checked_categories'] = unicode([subcategory.pk
-                        for subcategory in area.default_subcategories.all()])
         except ObjectDoesNotExist:
             pass
+    if not area:
+        try:
+            area = Area.objects.get(default=True)
+        except ObjectDoesNotExist:
+            pass
+    if area:
+        context_data['area_id'] = area_name
+        if 'zoomout' in context and context['zoomout']:
+            context_data['zoom'] = "[%s]" % ",".join((
+                unicode(area.upper_left_corner.x),
+                unicode(area.upper_left_corner.y),
+                unicode(area.lower_right_corner.x),
+                unicode(area.lower_right_corner.y)))
+        context_data['p_checked_categories'] = unicode([subcategory.pk
+                    for subcategory in area.default_subcategories.all()])
+        if area.restrict_to_extent:
+            context_data['restricted_extent'] = """
+var bounds = new OpenLayers.Bounds();
+bounds.extend(new OpenLayers.LonLat(%f, %f));
+bounds.extend(new OpenLayers.LonLat(%f, %f));
+""" % (area.upper_left_corner.x, area.upper_left_corner.y,
+       area.lower_right_corner.x, area.lower_right_corner.y)
     if 'request' not in context:
         return context_data
     request = context['request']
diff --git a/chimere/widgets.py b/chimere/widgets.py
index 8c0cfcd..2029858 100644
--- a/chimere/widgets.py
+++ b/chimere/widgets.py
@@ -48,11 +48,6 @@ def getMapJS(area_name=''):
 
     if area_name:
         js += u"var area_name='%s';\n" % area_name
-    if settings.CHIMERE_RESTRICTED_EXTENT:
-        restricted_extent_str = [str(coord) \
-                                for coord in settings.CHIMERE_RESTRICTED_EXTENT]
-        js += u"restricted_extent = new OpenLayers.Bounds(%s);\n" %\
-                                           ", ".join(restricted_extent_str)
     js = u"<script type='text/javascript'><!--\n"\
          u"%s// !--></script>\n" % js
     return js
diff --git a/docs/install.rst b/docs/install.rst
index 1f55839..426b62d 100644
--- a/docs/install.rst
+++ b/docs/install.rst
@@ -143,8 +143,6 @@ the more relevant fields are given below (at least check them)::
       for a Debian installation with gpsbabel installed)
     * CHIMERE_DEFAULT_ZOOM: default zoom on map
     * CHIMERE_DEFAULT_CENTER: center of the map
-    * CHIMERE_RESTRICTED_EXTENT: to restrict the map to a defined bounding box
-      set it here (left, bottom, right, top)
     * CHIMERE_DYNAMIC_CATEGORIES: dynamic load of categories on the main map
     * CHIMERE_DISPLAY_AREAS: display area's shortcuts
     * DATABASES: parameters for the database
diff --git a/example_project/settings.py b/example_project/settings.py
index 9b20a11..ddd8261 100644
--- a/example_project/settings.py
+++ b/example_project/settings.py
@@ -44,9 +44,6 @@ CHIMERE_EPSG_PROJECTION = 900913
 # projection displayed to the end user by openlayers
 # chimere use the same projection to save its data in the database
 CHIMERE_EPSG_DISPLAY_PROJECTION = 4326
-# to restrict the map to a defined bounding box set it here
-# (left, bottom, right, top)
-CHIMERE_RESTRICTED_EXTENT = None
 # dynamic load of categories on the main map
 CHIMERE_DYNAMIC_CATEGORIES = False
 # display of shortcuts for areas