Fix feeds - remove BASE_URL ref

* fix area feeds
* fix url feeds
* temporary fix: pass Marker from BaseGeoManager to GeoManager to fix a strange
  error in area feeds using contained filter

1 files changed, 13 insertions, 11 deletions

diff --git a/chimere/feeds.py b/chimere/feeds.py
index 36364ad..d5ae5ef 100644
--- a/chimere/feeds.py
+++ b/chimere/feeds.py
@@ -23,6 +23,7 @@ from django.conf import settings
 from django.contrib.gis.geos import *
 from django.contrib.syndication.views import Feed, FeedDoesNotExist
 from django.core.exceptions import ObjectDoesNotExist
+from django.core.urlresolvers import reverse
 from django.utils.translation import ugettext as _
 
 from django.shortcuts import get_object_or_404
@@ -39,8 +40,9 @@ class BaseFeed(Feed):
         cat = 0
         if item.categories.all() and item.categories.all()[0]:
             cat = item.categories.all()[0].pk
-        return settings.BASE_URL + '?zoom=16&lat=%d&lon=%d&current_feature=%d'\
-            '&checked_categories=%d' % (coord.y, coord.x, item.id, cat)
+        return reverse('chimere:index') + '?zoom=16&lat=%d&lon=%d&'\
+        'current_feature=%d&checked_categories=%d' % (coord.y, coord.x, item.id,
+                                                      cat)
 
     def item_pubdate(self, item):
         """
@@ -73,7 +75,7 @@ class LatestPOIsByCategory(BaseFeed):
         """
         if not obj:
             raise FeedDoesNotExist
-        return settings.BASE_URL + 'rss/category/' + str(obj.id)
+        return reverse('chimere:feeds-cat', args=['', obj.id])
 
     def items(self, obj):
         """
@@ -103,7 +105,7 @@ class LatestPOIsBySubCategory(BaseFeed):
     def link(self, obj):
         if not obj:
             raise FeedDoesNotExist
-        return settings.BASE_URL + 'rss/subcategory/' + str(obj.id)
+        return reverse('chimere:feeds-subcat', args=['', obj.id])
 
     def items(self, obj):
         q = Marker.objects.filter(categories__id__exact=obj.id,
@@ -122,7 +124,7 @@ class LatestPOIs(BaseFeed):
         return settings.PROJECT_NAME + u" - " + _(u"Last points of interest")
 
     def link(self):
-        return settings.BASE_URL + 'rss/categories/'
+        return reverse('chimere:feeds-global')
 
     def description(self):
         return _("Latest points of interest from ") + settings.PROJECT_NAME
@@ -161,12 +163,12 @@ class LatestPOIsByZone(BaseFeed):
         lower_left_lat = lower_right_lat
         lower_left_lon = upper_left_lon
         # Define a Polygon with the 4 points of the zone.
-        areaBox = Polygon(((upper_left_lon, upper_left_lat), 
-                            (upper_right_lon, upper_right_lat), 
+        areaBox = Polygon(((upper_left_lon, upper_left_lat),
+                            (upper_right_lon, upper_right_lat),
                             (lower_right_lon, lower_right_lat),
                             (lower_left_lon, lower_left_lat),
                             (upper_left_lon, upper_left_lat)),
-                            srid=settings.EPSG_DISPLAY_PROJECTION)
+                            srid=settings.CHIMERE_EPSG_DISPLAY_PROJECTION)
         return areaBox
 
     def title(self, obj):
@@ -180,9 +182,9 @@ class LatestPOIsByZone(BaseFeed):
         """
         if not obj:
             raise FeedDoesNotExist
-        return settings.BASE_URL + 'rss/area/' \
-               + str(self.upper_left_lat) + '_' + str(self.upper_left_lon) + \
+        area = str(self.upper_left_lat) + '_' + str(self.upper_left_lon) + \
                '_' + str(self.lower_right_lat) + '_' + str(self.lower_right_lon)
+        return reverse('chimere:feeds-area', args=['', area])
 
     def items(self, obj):
         """
@@ -211,7 +213,7 @@ class LatestPOIsByZoneID(BaseFeed):
     def link(self, obj):
         if not obj:
             raise FeedDoesNotExist
-        return settings.BASE_URL + 'rss/areaid/' + str(obj.id)
+        return reverse('chimere:feeds-areaid', args=['', obj.id])
 
     def items(self, obj):
         sql = 'select * from "chimere_marker" where ' + obj.getIncludeSql()