summaryrefslogtreecommitdiff
path: root/chimere/models.py
diff options
context:
space:
mode:
Diffstat (limited to 'chimere/models.py')
-rw-r--r--chimere/models.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/chimere/models.py b/chimere/models.py
index 979ff43..5fca319 100644
--- a/chimere/models.py
+++ b/chimere/models.py
@@ -31,7 +31,7 @@ from django.contrib.gis.db import models
from django.contrib.gis.gdal import SpatialReference
from django.contrib import admin
from django.core.files import File
-from django.core.exceptions import ValidationError
+from django.core.exceptions import ValidationError, ObjectDoesNotExist
from django.core.urlresolvers import reverse
from django.db.models.signals import post_save, pre_save, m2m_changed
from django import forms
@@ -231,6 +231,8 @@ class Importer(models.Model):
blank=True, null=True)
srid = models.IntegerField(_(u"SRID"), blank=True, null=True)
zipped = models.BooleanField(_(u"Zipped file"), default=False)
+ source_file = models.FileField(_(u"Source file"),
+ upload_to='import_files', blank=True, null=True)
class Meta:
verbose_name = _(u"Importer")
@@ -723,7 +725,8 @@ post_save.connect(picturefile_post_save, sender=PictureFile)
class RouteFile(models.Model):
name = models.CharField(_(u"Name"), max_length=150)
- raw_file = models.FileField(_(u"Raw file (gpx or kml)"), upload_to='route_files')
+ raw_file = models.FileField(_(u"Raw file (gpx or kml)"),
+ upload_to='route_files')
simplified_file = models.FileField(_(u"Simplified file"),
upload_to='route_files', blank=True, null=True)
TYPE = (('K', _(u'KML')), ('G', _(u'GPX')))
@@ -802,7 +805,7 @@ class Route(GeographicItem):
@property
def geometry(self):
- return self.point.wkt
+ return self.route.wkt
def get_init_multi(self):
if not self.associated_marker.count():