summaryrefslogtreecommitdiff
path: root/chimere/feeds.py
diff options
context:
space:
mode:
Diffstat (limited to 'chimere/feeds.py')
-rw-r--r--chimere/feeds.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/chimere/feeds.py b/chimere/feeds.py
index 53444ac..2a62da3 100644
--- a/chimere/feeds.py
+++ b/chimere/feeds.py
@@ -29,7 +29,7 @@ from django.utils.translation import ugettext as _
from django.shortcuts import get_object_or_404
-from chimere.models import Category, SubCategory, Marker, Area
+from chimere.models import Category, SubCategory, Marker, Map
class BaseFeed(Feed):
"""
@@ -64,7 +64,7 @@ class LatestPOIsByCategory(BaseFeed):
title_template = "chimere/feeds/rss_title.html"
description_template = "chimere/feeds/rss_descr.html"
- def get_object(self, request, category_id, area_name=''):
+ def get_object(self, request, category_id, map_name=''):
return get_object_or_404(Category, id=category_id)
def title(self, obj):
@@ -99,7 +99,7 @@ class LatestPOIsBySubCategory(BaseFeed):
title_template = "chimere/feeds/rss_title.html"
description_template = "chimere/feeds/rss_descr.html"
- def get_object(self, request, category_id, area_name=''):
+ def get_object(self, request, category_id, map_name=''):
return get_object_or_404(SubCategory, id=category_id)
def title(self, obj):
@@ -149,7 +149,7 @@ class LatestPOIsByZone(BaseFeed):
lower_right_lat = 0
lower_right_lon = 0
- def get_object(self, request, area, area_name=''):
+ def get_object(self, request, area, map_name=''):
"""
Get the extra url. Parameters are the coordinates of the zone (the
upper left and lower right points)
@@ -207,8 +207,8 @@ class LatestPOIsByZoneID(BaseFeed):
title_template = "chimere/feeds/rss_title.html"
description_template = "chimere/feeds/rss_descr.html"
- def get_object(self, request, area_id, area_name=''):
- return get_object_or_404(Area, id=area_id)
+ def get_object(self, request, map_id, map_name=''):
+ return get_object_or_404(Map, id=map_id)
def title(self, obj):
return settings.PROJECT_NAME + u" - " + \
@@ -217,7 +217,7 @@ class LatestPOIsByZoneID(BaseFeed):
def link(self, obj):
if not obj:
raise FeedDoesNotExist
- return reverse('chimere:feeds-areaid', args=['', obj.id])
+ return reverse('chimere:feeds-mapid', args=['', obj.id])
def items(self, obj):
q = Marker.objects.filter(available_date__isnull=False, status='A')