Basic integration of polygons

5 files changed, 640 insertions, 160 deletions

diff --git a/chimere/admin.py b/chimere/admin.py
index 3ea5b7b..e51bc3d 100644
--- a/chimere/admin.py
+++ b/chimere/admin.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Copyright (C) 2008-2015  Étienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
+# Copyright (C) 2008-2016  Étienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as
@@ -20,6 +20,9 @@
 """
 Settings for administration pages
 """
+
+from copy import deepcopy
+
 from django.conf import settings
 from django.contrib import admin, messages
 from django.contrib.admin import SimpleListFilter
@@ -38,7 +41,8 @@ except ImportError:
 
 from chimere.forms import MarkerAdminForm, RouteAdminForm, AreaAdminForm,\
     NewsAdminForm, CategoryAdminForm, ImporterAdminForm, OSMForm, \
-    PageAdminForm, PictureFileAdminForm, MultimediaFileAdminForm
+    PageAdminForm, PictureFileAdminForm, MultimediaFileAdminForm, \
+    PolygonAdminForm
 from chimere import models
 from chimere.models import Category, Icon, SubCategory, Marker, \
     PropertyModel, News, Route, Area, ColorTheme, Color, \
@@ -222,6 +226,15 @@ class AreaRouteListFilter(AreaMarkerListFilter):
         return queryset.filter(area.getIncludeRoute())
 
 
+class AreaPolygonListFilter(AreaMarkerListFilter):
+    def queryset(self, request, queryset):
+        try:
+            area = models.Area.objects.get(urn=self.value())
+        except models.Area.DoesNotExist:
+            return queryset
+        return queryset.filter(area.getIncludePolygon())
+
+
 class HasCategoriesListFilter(SimpleListFilter):
     title = _('Has categories')
     parameter_name = 'has_category'
@@ -275,6 +288,38 @@ def moderator_right(user, qs, geo_type='marker'):
             limited_for_user__user=user).all())
     return qs
 
+MARKER_FIELDSETS = [
+    [None, {
+        'fields': ['point', 'name', 'status', 'categories', 'description',
+                   'keywords', 'start_date', 'end_date']
+    }],
+    [_(u"Submitter"), {
+        'classes': ('collapse',),
+        'fields': ('submiter_name', 'submiter_email', 'submiter_comment')
+    }],
+    [_(u"Import"), {
+        'classes': ('collapse',),
+        'fields': ('not_for_osm', 'modified_since_import', 'import_source',
+                   'origin', 'license')
+    }],
+    [_(u"Associated items"), {
+        'classes': ('collapse',),
+        'fields': ['ref_item', 'route']
+    }]
+]
+
+ROUTE_FIELDSETS = deepcopy(MARKER_FIELDSETS)
+ROUTE_FIELDSETS[0][1]['fields'][0] = 'route'
+ROUTE_FIELDSETS[0][1]['fields'].pop(ROUTE_FIELDSETS[0][1]['fields'].index(
+    'description'))
+ROUTE_FIELDSETS[3][1]['fields'] = ('ref_item', 'associated_file',
+                                   'has_associated_marker')
+POLYGON_FIELDSETS = deepcopy(MARKER_FIELDSETS)
+POLYGON_FIELDSETS[0][1]['fields'][0] = 'polygon'
+POLYGON_FIELDSETS[0][1]['fields'].pop(POLYGON_FIELDSETS[0][1]['fields'].index(
+    'description'))
+POLYGON_FIELDSETS.pop(3)
+
 
 class MarkerAdmin(admin.ModelAdmin):
     """
@@ -292,20 +337,7 @@ class MarkerAdmin(admin.ModelAdmin):
         'submiter_email', 'submiter_comment', 'import_source',
         'submiter_name', 'ref_item', 'modified_since_import', 'route']
     form = MarkerAdminForm
-    fieldsets = ((None, {
-        'fields': ['point', 'name', 'status', 'categories', 'description',
-                   'keywords', 'start_date', 'end_date']
-    }), (_(u"Submitter"), {
-        'classes': ('collapse',),
-        'fields': ('submiter_name', 'submiter_email', 'submiter_comment')
-    }), (_(u"Import"), {
-        'classes': ('collapse',),
-        'fields': ('not_for_osm', 'modified_since_import', 'import_source',
-                   'origin', 'license')
-    }), (_(u"Associated items"), {
-        'classes': ('collapse',),
-        'fields': ('ref_item', 'route',)
-    }),)
+    fieldsets = MARKER_FIELDSETS
     inlines = [MultimediaInline, PictureInline]
     has_properties = True
 
@@ -372,20 +404,7 @@ class RouteAdmin(MarkerAdmin):
     readonly_fields = ('associated_file', 'ref_item', 'has_associated_marker')
     actions = [validate, disable, managed_modified, export_to_kml,
                export_to_shapefile, export_to_csv]
-    fieldsets = ((None, {
-        'fields': ['route', 'name', 'status', 'categories', 'start_date',
-                   'end_date']
-    }), (_(u"Submitter"), {
-        'classes': ('collapse',),
-        'fields': ('submiter_name', 'submiter_email', 'submiter_comment')
-    }), (_(u"Import"), {
-        'classes': ('collapse',),
-        'fields': ('modified_since_import', 'import_source', 'origin',
-                   'license')
-    }), (_(u"Associated items"), {
-        'classes': ('collapse',),
-        'fields': ('ref_item', 'associated_file', 'has_associated_marker')
-    }),)
+    fieldsets = ROUTE_FIELDSETS
     inlines = []
     has_properties = False
 
@@ -405,6 +424,23 @@ class RouteAdmin(MarkerAdmin):
                                 Route.objects.filter(pk=item_id))
 
 
+class PolygonAdmin(MarkerAdmin):
+    """
+    Specialized the Polygon field.
+    """
+    list_filter = ('status', AreaPolygonListFilter, 'categories')
+    form = PolygonAdminForm
+    actions = [validate, disable, managed_modified, export_to_kml,
+               export_to_shapefile, export_to_csv]
+    readonly_fields = [
+        'submiter_email', 'submiter_comment', 'import_source',
+        'submiter_name', 'ref_item', 'modified_since_import',]
+    exclude = ['submiter_session_key', 'import_key', 'import_version',
+               'ref_item']
+    inlines = []
+    fieldsets = POLYGON_FIELDSETS
+
+
 class LayerInline(admin.TabularInline):
     model = AreaLayers
     extra = 1
@@ -560,7 +596,8 @@ admin.site.register(News, NewsAdmin)
 admin.site.register(Category, CategoryAdmin)
 admin.site.register(Icon, IconAdmin)
 admin.site.register(Marker, MarkerAdmin)
-admin.site.register(Route, RouteAdmin)
+admin.site.register(models.Route, RouteAdmin)
+admin.site.register(models.Polygon, PolygonAdmin)
 if not settings.CHIMERE_HIDE_PROPERTYMODEL:
     admin.site.register(PropertyModel, PropertyModelAdmin)
 admin.site.register(Area, AreaAdmin)
diff --git a/chimere/forms.py b/chimere/forms.py
index 2cfa0ed..312512e 100644
--- a/chimere/forms.py
+++ b/chimere/forms.py
@@ -38,7 +38,7 @@ if hasattr(settings, 'CHIMERE_SEARCH_ENGINE') and \
 from chimere.models import Marker, Route, PropertyModel, Area,\
     News, Category, RouteFile, MultimediaFile, MultimediaType, \
     PictureFile, Importer, PropertyModelChoice, Page, IMPORTER_CHOICES, \
-    get_areas_for_user, SubCategoryUserLimit
+    get_areas_for_user, SubCategoryUserLimit, Polygon
 from chimere.widgets import AreaField, PointField, TextareaWidget, \
     FullTextareaWidget, DatePickerWidget, ButtonSelectWidget, NominatimWidget,\
     TextareaAdminWidget, ImportFiltrWidget, ImporterChoicesWidget, RE_XAPI
@@ -493,6 +493,14 @@ class RouteForm(RouteAdminForm):
         return new_route
 
 
+class PolygonAdminForm(RouteAdminForm):
+    """
+    Main form for polygon
+    """
+    class Meta:
+        model = Polygon
+
+
 class BaseFileForm(forms.ModelForm):
     id = forms.IntegerField(label=u"", widget=forms.HiddenInput(),
                             required=False)
diff --git a/chimere/migrations/0018_auto__add_polygon.py b/chimere/migrations/0018_auto__add_polygon.py
new file mode 100644
index 0000000..7fed4f0
--- /dev/null
+++ b/chimere/migrations/0018_auto__add_polygon.py
@@ -0,0 +1,397 @@
+# -*- coding: 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 model 'Polygon'
+        db.create_table('chimere_polygon', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')(max_length=150)),
+            ('submiter_session_key', self.gf('django.db.models.fields.CharField')(max_length=40, null=True, blank=True)),
+            ('submiter_name', self.gf('django.db.models.fields.CharField')(max_length=40, null=True, blank=True)),
+            ('submiter_email', self.gf('django.db.models.fields.EmailField')(max_length=75, null=True, blank=True)),
+            ('submiter_comment', self.gf('django.db.models.fields.TextField')(max_length=200, null=True, blank=True)),
+            ('status', self.gf('django.db.models.fields.CharField')(max_length=1)),
+            ('keywords', self.gf('django.db.models.fields.TextField')(max_length=200, null=True, blank=True)),
+            ('import_key', self.gf('django.db.models.fields.CharField')(max_length=200, null=True, blank=True)),
+            ('import_version', self.gf('django.db.models.fields.IntegerField')(null=True, blank=True)),
+            ('import_source', self.gf('django.db.models.fields.CharField')(max_length=200, null=True, blank=True)),
+            ('modified_since_import', self.gf('django.db.models.fields.BooleanField')(default=True)),
+            ('not_for_osm', self.gf('django.db.models.fields.BooleanField')(default=False)),
+            ('origin', self.gf('django.db.models.fields.CharField')(max_length=1000, null=True, blank=True)),
+            ('license', self.gf('django.db.models.fields.CharField')(max_length=1000, null=True, blank=True)),
+            ('start_date', self.gf('django.db.models.fields.DateField')(null=True, blank=True)),
+            ('end_date', self.gf('django.db.models.fields.DateField')(null=True, blank=True)),
+            ('ref_item', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='submited_polygon', null=True, to=orm['chimere.Polygon'])),
+            ('polygon', self.gf('chimere.widgets.PolygonField')()),
+            ('picture', self.gf('django.db.models.fields.files.ImageField')(max_length=100, null=True, blank=True)),
+            ('height', self.gf('django.db.models.fields.IntegerField')(null=True, blank=True)),
+            ('width', self.gf('django.db.models.fields.IntegerField')(null=True, blank=True)),
+        ))
+        db.send_create_signal('chimere', ['Polygon'])
+
+        # Adding M2M table for field categories on 'Polygon'
+        db.create_table('chimere_polygon_categories', (
+            ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
+            ('polygon', models.ForeignKey(orm['chimere.polygon'], null=False)),
+            ('subcategory', models.ForeignKey(orm['chimere.subcategory'], null=False))
+        ))
+        db.create_unique('chimere_polygon_categories', ['polygon_id', 'subcategory_id'])
+
+
+    def backwards(self, orm):
+        # Deleting model 'Polygon'
+        db.delete_table('chimere_polygon')
+
+        # Removing M2M table for field categories on 'Polygon'
+        db.delete_table('chimere_polygon_categories')
+
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'chimere.aggregatedroute': {
+            'Meta': {'object_name': 'AggregatedRoute', 'db_table': "'chimere_aggregated_routes'", 'managed': 'False'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'route': ('django.contrib.gis.db.models.fields.MultiLineStringField', [], {}),
+            'status': ('django.db.models.fields.CharField', [], {'max_length': '1'}),
+            'subcategory': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['chimere.SubCategory']"})
+        },
+        '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'}),
+            'dynamic_categories': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', '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', [], {'unique': 'True'}),
+            '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', [], {'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'}),
+            'offset_x': ('django.db.models.fields.IntegerField', [], {'default': '10'}),
+            'offset_y': ('django.db.models.fields.IntegerField', [], {'default': '20'}),
+            'popup_offset_x': ('django.db.models.fields.IntegerField', [], {'default': '5'}),
+            'popup_offset_y': ('django.db.models.fields.IntegerField', [], {'default': '20'}),
+            'width': ('django.db.models.fields.IntegerField', [], {})
+        },
+        'chimere.importer': {
+            'Meta': {'object_name': 'Importer'},
+            'associate_marker_to_way': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'automatic_update': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'categories': ('chimere.widgets.SelectMultipleField', [], {'symmetrical': 'False', 'to': "orm['chimere.SubCategory']", 'null': 'True', 'blank': 'True'}),
+            'default_description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'default_localisation': ('chimere.widgets.PointField', [], {'null': 'True', 'blank': 'True'}),
+            'default_name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'default_status': ('django.db.models.fields.CharField', [], {'default': "'I'", 'max_length': '1'}),
+            'filtr': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'get_description': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'importer_type': ('django.db.models.fields.CharField', [], {'max_length': '4'}),
+            'license': ('django.db.models.fields.CharField', [], {'max_length': '1000', 'null': 'True', 'blank': 'True'}),
+            'origin': ('django.db.models.fields.CharField', [], {'max_length': '1000', 'null': 'True', 'blank': 'True'}),
+            'overwrite': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'source': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'source_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+            'source_file_alt': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+            'srid': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'state': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'zipped': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'chimere.importerkeycategories': {
+            'Meta': {'object_name': 'ImporterKeyCategories'},
+            'category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['chimere.SubCategory']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'importer': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'key_categories'", 'to': "orm['chimere.Importer']"}),
+            'key': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+        },
+        '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'},
+            'available_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            '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'}),
+            'is_front_page': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),
+            'keywords': ('django.db.models.fields.TextField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'license': ('django.db.models.fields.CharField', [], {'max_length': '1000', 'null': 'True', 'blank': 'True'}),
+            'modified_since_import': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
+            'not_for_osm': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'origin': ('django.db.models.fields.CharField', [], {'max_length': '1000', 'null': 'True', 'blank': 'True'}),
+            '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.TextField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'submiter_email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
+            'submiter_name': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'submiter_session_key': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'})
+        },
+        'chimere.multimediaextension': {
+            'Meta': {'object_name': 'MultimediaExtension'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'multimedia_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'extensions'", 'to': "orm['chimere.MultimediaType']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '6'})
+        },
+        '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']", 'null': 'True', 'blank': 'True'}),
+            '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': {'ordering': "['-date']", 'object_name': 'News'},
+            'areas': ('chimere.widgets.SelectMultipleField', [], {'symmetrical': 'False', 'to': "orm['chimere.Area']", 'null': 'True', 'blank': 'True'}),
+            'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'content': ('django.db.models.fields.TextField', [], {}),
+            'date': ('django.db.models.fields.DateField', [], {}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_front_page': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
+            'url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
+        },
+        'chimere.page': {
+            'Meta': {'ordering': "['order']", 'object_name': 'Page'},
+            'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'content': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'mnemonic': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
+            'order': ('django.db.models.fields.IntegerField', [], {'default': '10', 'null': 'True', 'blank': 'True'}),
+            'template_path': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '150'})
+        },
+        'chimere.picturefile': {
+            'Meta': {'object_name': 'PictureFile'},
+            'height': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            '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'}),
+            'thumbnailfile': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+            'thumbnailfile_height': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'thumbnailfile_width': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'width': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'})
+        },
+        'chimere.polygon': {
+            'Meta': {'ordering': "('status', 'name')", 'object_name': 'Polygon'},
+            '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'}),
+            'keywords': ('django.db.models.fields.TextField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'license': ('django.db.models.fields.CharField', [], {'max_length': '1000', 'null': 'True', 'blank': 'True'}),
+            'modified_since_import': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
+            'not_for_osm': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'origin': ('django.db.models.fields.CharField', [], {'max_length': '1000', 'null': 'True', 'blank': 'True'}),
+            'picture': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+            'polygon': ('chimere.widgets.PolygonField', [], {}),
+            'ref_item': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'submited_polygon'", 'null': 'True', 'to': "orm['chimere.Polygon']"}),
+            '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.TextField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'submiter_email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
+            'submiter_name': ('django.db.models.fields.CharField', [], {'max_length': '40', '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.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'}),
+            'mandatory': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
+            'order': ('django.db.models.fields.IntegerField', [], {}),
+            'subcategories': ('chimere.widgets.SelectMultipleField', [], {'symmetrical': 'False', 'related_name': "'properties'", 'blank': 'True', 'to': "orm['chimere.SubCategory']"}),
+            'type': ('django.db.models.fields.CharField', [], {'max_length': '1'})
+        },
+        'chimere.propertymodelchoice': {
+            'Meta': {'object_name': 'PropertyModelChoice'},
+            'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'propertymodel': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'choices'", 'to': "orm['chimere.PropertyModel']"}),
+            'value': ('django.db.models.fields.CharField', [], {'max_length': '150'})
+        },
+        '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'}),
+            'has_associated_marker': ('django.db.models.fields.BooleanField', [], {'default': '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'}),
+            'keywords': ('django.db.models.fields.TextField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'license': ('django.db.models.fields.CharField', [], {'max_length': '1000', 'null': 'True', 'blank': 'True'}),
+            'modified_since_import': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
+            'not_for_osm': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'origin': ('django.db.models.fields.CharField', [], {'max_length': '1000', 'null': 'True', 'blank': 'True'}),
+            '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.TextField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'submiter_email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
+            'submiter_name': ('django.db.models.fields.CharField', [], {'max_length': '40', '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'},
+            'as_layer': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'category': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'subcategories'", 'to': "orm['chimere.Category']"}),
+            'color_theme': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['chimere.ColorTheme']", 'null': 'True', 'blank': 'True'}),
+            'dated': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'hover_icon': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'subcat_hovered'", 'null': 'True', 'to': "orm['chimere.Icon']"}),
+            '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'}),
+            'keywords': ('django.db.models.fields.TextField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
+            'order': ('django.db.models.fields.IntegerField', [], {'default': '1000'}),
+            'routing_warn': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'submission': ('django.db.models.fields.BooleanField', [], {'default': 'True'})
+        },
+        'chimere.subcategoryuserlimit': {
+            'Meta': {'object_name': 'SubCategoryUserLimit'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'subcategory': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'limited_for_user'", 'to': "orm['chimere.SubCategory']"}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'subcategory_limit_to'", 'to': "orm['auth.User']"})
+        },
+        'chimere.tinyurl': {
+            'Meta': {'object_name': 'TinyUrl'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'parameters': ('django.db.models.fields.CharField', [], {'max_length': '500'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        }
+    }
+
+    complete_apps = ['chimere']
\ No newline at end of file
diff --git a/chimere/models.py b/chimere/models.py
index 94da386..cae9503 100644
--- a/chimere/models.py
+++ b/chimere/models.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Copyright (C) 2008-2015  Étienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
+# Copyright (C) 2008-2016  Étienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as
@@ -44,7 +44,7 @@ from django.template import defaultfilters
 from django.utils.translation import ugettext_lazy as _
 
 from chimere.widgets import HiddenPointChooserWidget, PointField, RouteField, \
-    SelectMultipleField, TextareaWidget, DatePickerWidget
+    SelectMultipleField, TextareaWidget, DatePickerWidget, PolygonField
 from chimere.utils import KMLManager, OSMManager, ShapefileManager, \
     GeoRSSManager, CSVManager, HtmlXsltManager, XMLXsltManager, JsonManager
 
@@ -244,6 +244,7 @@ class SubCategory(models.Model):
                                      default=True)
     TYPE = (('M', _(u'Marker')),
             ('R', _(u'Route')),
+            ('P', _(u'Polygon')),
             ('B', _(u'Both')),)
     item_type = models.CharField(_(u"Item type"), max_length=1, choices=TYPE)
     dated = models.BooleanField(_(u"Is dated"), default=False)
@@ -520,6 +521,94 @@ class GeographicItem(models.Model):
     class Meta:
         abstract = True
 
+    def __unicode__(self):
+        return self.name
+
+    def __init__(self, *args, **kwargs):
+        super(GeographicItem, self).__init__(*args, **kwargs)
+        # add read attributes for properties
+        for pm in self.all_properties():
+            attr_name = pm.getAttrName()
+            if not hasattr(self, attr_name):
+                val = ''
+                property = self.getProperty(pm)
+                if property:
+                    val = property.python_value
+                setattr(self, attr_name, val)
+            if not hasattr(self, attr_name + '_set'):
+                setattr(self, attr_name + '_set',
+                        property_setter(self.__class__, pm))
+
+    @property
+    def geometry(self):
+        return getattr(self, self.geom_attr).wkt
+
+    def getProperty(self, propertymodel, safe=None):
+        """Get the property of an associated property model.
+        If safe set to True, verify if the property is available
+        """
+        if safe and not propertymodel.available:
+            return
+        try:
+            property = Property.objects.get(propertymodel=propertymodel,
+                                            marker=self)
+        except Property.DoesNotExist:
+            return
+        return property
+
+    def getProperties(self):
+        """Get all the property availables
+        """
+        properties = []
+        for pm in PropertyModel.objects.filter(available=True):
+            property = self.getProperty(pm)
+            if property:
+                properties.append(property)
+        return properties
+
+    def setProperty(self, pm, value):
+        u"""
+        Set a property
+        """
+        properties = Property.objects.filter(marker=self,
+                                             propertymodel=pm).all()
+        # in case of multiple edition as the same time delete arbitrary
+        # the others
+        if len(properties) > 1:
+            for property in properties[1:]:
+                property.delete()
+        if pm.type == 'C' and value:
+            try:
+                value = str(int(value))
+            except ValueError:
+                choice = PropertyModelChoice.objects.filter(propertymodel=pm,
+                                                            value=value)
+                if choice.count():
+                    value = choice.all()[0].pk
+                else:
+                    choice = PropertyModelChoice.objects.create(
+                        value=value, propertymodel=pm)
+                    value = choice.pk
+        # new property
+        if not properties:
+            new_property = Property.objects.create(
+                marker=self, propertymodel=pm, value=value)
+            new_property.save()
+        else:
+            property = properties[0]
+            property.value = value
+            property.save()
+
+    def saveProperties(self, values):
+        """
+        Save properties
+        """
+        for propertymodel in PropertyModel.objects.filter(available=True):
+            val = u""
+            if unicode(propertymodel.id) in values:
+                val = values[unicode(propertymodel.id)]
+            self.setProperty(propertymodel, val)
+
     def get_key(self, key):
         key_vals = self.import_key.split(';')
         for k_v in key_vals:
@@ -592,23 +681,9 @@ class Marker(GeographicItem):
                                             null=True)
     objects = models.GeoManager()
 
-    def __unicode__(self):
-        return self.name
-
-    def __init__(self, *args, **kwargs):
-        super(Marker, self).__init__(*args, **kwargs)
-        # add read attributes for properties
-        for pm in self.all_properties():
-            attr_name = pm.getAttrName()
-            if not hasattr(self, attr_name):
-                val = ''
-                property = self.getProperty(pm)
-                if property:
-                    val = property.python_value
-                setattr(self, attr_name, val)
-            if not hasattr(self, attr_name + '_set'):
-                setattr(self, attr_name + '_set',
-                        property_setter(self.__class__, pm))
+    class Meta:
+        ordering = ('status', 'name')
+        verbose_name = _(u"Point of interest")
 
     def get_init_multi(self):
         multis = [forms.model_to_dict(multi)
@@ -649,17 +724,9 @@ class Marker(GeographicItem):
         return shortify(self.description)
 
     @property
-    def geometry(self):
-        return self.point.wkt
-
-    @property
     def geom_attr(self):
         return 'point'
 
-    class Meta:
-        ordering = ('status', 'name')
-        verbose_name = _(u"Point of interest")
-
     def getLatitude(self):
         '''Return the latitude
         '''
@@ -670,72 +737,6 @@ class Marker(GeographicItem):
         '''
         return self.point.x
 
-    def getProperty(self, propertymodel, safe=None):
-        """Get the property of an associated property model.
-        If safe set to True, verify if the property is available
-        """
-        if safe and not propertymodel.available:
-            return
-        try:
-            property = Property.objects.get(propertymodel=propertymodel,
-                                            marker=self)
-        except Property.DoesNotExist:
-            return
-        return property
-
-    def getProperties(self):
-        """Get all the property availables
-        """
-        properties = []
-        for pm in PropertyModel.objects.filter(available=True):
-            property = self.getProperty(pm)
-            if property:
-                properties.append(property)
-        return properties
-
-    def setProperty(self, pm, value):
-        u"""
-        Set a property
-        """
-        properties = Property.objects.filter(marker=self,
-                                             propertymodel=pm).all()
-        # in case of multiple edition as the same time delete arbitrary
-        # the others
-        if len(properties) > 1:
-            for property in properties[1:]:
-                property.delete()
-        if pm.type == 'C' and value:
-            try:
-                value = str(int(value))
-            except ValueError:
-                choice = PropertyModelChoice.objects.filter(propertymodel=pm,
-                                                            value=value)
-                if choice.count():
-                    value = choice.all()[0].pk
-                else:
-                    choice = PropertyModelChoice.objects.create(
-                        value=value, propertymodel=pm)
-                    value = choice.pk
-        # new property
-        if not properties:
-            new_property = Property.objects.create(
-                marker=self, propertymodel=pm, value=value)
-            new_property.save()
-        else:
-            property = properties[0]
-            property.value = value
-            property.save()
-
-    def saveProperties(self, values):
-        """
-        Save properties
-        """
-        for propertymodel in PropertyModel.objects.filter(available=True):
-            val = u""
-            if unicode(propertymodel.id) in values:
-                val = values[unicode(propertymodel.id)]
-            self.setProperty(propertymodel, val)
-
     def getGeoJSON(self, categories_id=[]):
         '''Return a GeoJSON string
         '''
@@ -1175,9 +1176,6 @@ class Route(GeographicItem):
                                                 default=True)
     objects = models.GeoManager()
 
-    def __unicode__(self):
-        return self.name
-
     class Meta:
         ordering = ('status', 'name')
         verbose_name = _(u"Route")
@@ -1205,10 +1203,6 @@ class Route(GeographicItem):
                         property_setter(self.__class__, pm))
 
     @property
-    def geometry(self):
-        return self.route.wkt
-
-    @property
     def geom_attr(self):
         return 'route'
 
@@ -1228,29 +1222,6 @@ class Route(GeographicItem):
                  for pict in self.associated_marker.all()[0].pictures.all()]
         return picts
 
-    def getProperty(self, propertymodel, safe=None):
-        """Get the property of an associated property model.
-        If safe set to True, verify if the property is available
-        """
-        if safe and not propertymodel.available:
-            return
-        try:
-            property = Property.objects.get(propertymodel=propertymodel,
-                                            marker=self)
-        except Property.DoesNotExist:
-            return
-        return property
-
-    def getProperties(self):
-        """Get all the property availables
-        """
-        properties = []
-        for pm in PropertyModel.objects.filter(available=True):
-            property = self.getProperty(pm)
-            if property:
-                properties.append(property)
-        return properties
-
     def getGeoJSON(self, color="#000"):
         '''Return a GeoJSON string
         '''
@@ -1262,11 +1233,6 @@ class Route(GeographicItem):
                                      "color": color}}
         return json.dumps(attributes)
 
-    def getTinyUrl(self):
-        parameters = 'current_feature=%d&checked_categories=%s' % (
-            self.id, self.categories[0].id)
-        return TinyUrl.getUrnByParameters(parameters)
-
 pre_save_route_values = {}
 
 
@@ -1370,6 +1336,44 @@ class AggregatedRoute(models.Model):
         return json.dumps(attributes)
 
 
+class Polygon(GeographicItem):
+    '''Polygon on the map
+    '''
+    ref_item = models.ForeignKey(
+        "Polygon", blank=True, null=True, verbose_name=_(u"Reference polygon"),
+        related_name='submited_polygon')
+    polygon = PolygonField(
+        _(u"Polygon"), srid=settings.CHIMERE_EPSG_DISPLAY_PROJECTION)
+    picture = models.ImageField(
+        _(u"Image"), upload_to='upload', blank=True, null=True,
+        height_field='height', width_field='width')
+    height = models.IntegerField(_(u"Height"), blank=True, null=True)
+    width = models.IntegerField(_(u"Width"), blank=True, null=True)
+    objects = models.GeoManager()
+
+    class Meta:
+        ordering = ('status', 'name')
+        verbose_name = _(u"Polygon")
+
+    @property
+    def geom_attr(self):
+        return 'polygon'
+
+    def getGeoJSON(self, color="#000", inner_color='#0F0'):
+        '''Return a GeoJSON string
+        '''
+        if '#' not in color:
+            color = '#' + color
+        if '#' not in inner_color:
+            color = '#' + inner_color
+        attributes = {"type": "Feature",
+                      "geometry": json.loads(self.route.geojson),
+                      "properties": {"pk": self.id, "name": self.name,
+                                     "color": color,
+                                     "inner_color": inner_color}}
+        return json.dumps(attributes)
+
+
 class SimplePoint:
     """
     Point in the map (not in the database)
@@ -1549,6 +1553,12 @@ class Area(models.Model, SimpleArea):
         """
         return Q(route__contained=self.getWkt())
 
+    def getIncludePolygon(self):
+        """
+        Get the sql statement for the test if the route is included in the area
+        """
+        return Q(polygon__contained=self.getWkt())
+
 pre_save_area_values = {}
 
 
diff --git a/chimere/widgets.py b/chimere/widgets.py
index f8bb11b..bffd42f 100644
--- a/chimere/widgets.py
+++ b/chimere/widgets.py
@@ -600,6 +600,33 @@ class AreaWidget(forms.TextInput):
             values.append(value)
         return values
 
+
+class PolygonChooserWidget(forms.TextInput):
+    """
+    Manage the edition of polygon on a map
+    """
+    class Media:
+        css = {
+            "all": settings.MAP_CSS_URLS +
+            ["%schimere/css/forms.css" % settings.STATIC_URL]
+        }
+        js = settings.MAP_JS_URLS + list(settings.JQUERY_JS_URLS) + \
+            ["%schimere/js/jquery.chimere.js" % settings.STATIC_URL]
+
+    def render(self, name, value, attrs=None, area_name='', initialized=True):
+        # To be done
+        return super(PolygonChooserWidget, self).render(name, value, attrs)
+
+
+class PolygonField(models.PolygonField):
+    '''
+    Set the widget for the form field
+    '''
+    def formfield(self, **keys):
+        defaults = {'widget': RouteChooserWidget}
+        keys.update(defaults)
+        return super(PolygonField, self).formfield(**keys)
+
 RE_XAPI = re.compile(
     '(node|way)\[(.*=.*)\]\[bbox='
     '(-*[0-9]*.[0-9]*,-*[0-9]*.[0-9]*,-*[0-9]*.[0-9]*,-*[0-9]*.[0-9]*)\]')
@@ -754,3 +781,4 @@ from south.modelsinspector import add_introspection_rules
 add_introspection_rules([], ["^chimere\.widgets\.PointField"])
 add_introspection_rules([], ["^chimere\.widgets\.SelectMultipleField"])
 add_introspection_rules([], ["^chimere\.widgets\.RouteField"])
+add_introspection_rules([], ["^chimere\.widgets\.PolygonField"])