Merge branch 'add-aoi-param-to-atom-link' into develop

Author: willemarcel

osmchadjango/supervise/tests/test_views.py

@@ -754,6 +754,11 @@ def test_aoi_changesets_feed_view(self):
         rss_data = ET.fromstring(response.content).getchildren()[0].getchildren()
         title = [i for i in rss_data if i.tag == 'title'][0]
         items = [i for i in rss_data if i.tag == 'item']
+        link = [i for i in items[0].getchildren() if i.tag == 'link'][0]
+        self.assertIn(
+            "?aoi=",
+            link.text
+            )
         self.assertEqual(
             title.text,
             'Changesets of Area of Interest {} by {}'.format(

osmchadjango/supervise/views.py

@@ -118,6 +118,7 @@ class AOIListChangesetsFeedView(Feed):
     """
 
     def get_object(self, request, pk):
+        self.feed_id = pk
         return AreaOfInterest.objects.get(pk=pk)
 
     def title(self, obj):
@@ -138,7 +139,10 @@ def item_geometry(self, item):
         return item.bbox
 
     def item_link(self, item):
-        return reverse('frontend:changeset-detail', args=[item.id])
+        return '{}{}'.format(reverse(
+            'frontend:changeset-detail',
+            args=[item.id]
+            ), '?aoi={}'.format(self.feed_id))
 
     def item_pubdate(self, item):
         return item.date