summaryrefslogtreecommitdiff
path: root/chimere/models.py
diff options
context:
space:
mode:
Diffstat (limited to 'chimere/models.py')
-rw-r--r--chimere/models.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/chimere/models.py b/chimere/models.py
index c286422..8b15f29 100644
--- a/chimere/models.py
+++ b/chimere/models.py
@@ -289,9 +289,8 @@ class Marker(GeographicItem):
verbose_name=_(u"Reference marker"), related_name='submited_marker')
point = PointField(_(u"Localisation"),
srid=settings.CHIMERE_EPSG_DISPLAY_PROJECTION)
- if 'chimere_rss' in settings.INSTALLED_APPS:
- available_date = models.DateTimeField(_(u"Available Date"), blank=True,
- null=True)
+ available_date = models.DateTimeField(_(u"Available Date"), blank=True,
+ null=True) # used by feeds
route = models.ForeignKey(u"Route", blank=True, null=True,
related_name='associated_marker')
description = models.TextField(_(u"Description"), blank=True, null=True)
@@ -833,7 +832,7 @@ class Area(models.Model, SimpleArea):
self.lower_right_corner.x, self.lower_right_corner.y,
self.upper_left_corner.x, self.lower_right_corner.y,
self.upper_left_corner.x, self.upper_left_corner.y,
- settings.EPSG_DISPLAY_PROJECTION
+ settings.CHIMERE_EPSG_DISPLAY_PROJECTION
)
sql = "ST_Contains(" + area + ", " + geometry + ")"
return sql