Update osmcha and DRF-gis libraries

Author: willemarcel

osmchadjango/supervise/tests/test_views.py

@@ -3,7 +3,7 @@
 import xml.etree.ElementTree as ET
 
 from django.urls import reverse
-from django.contrib.gis.geos import MultiPolygon, Polygon, Point, LineString
+from django.contrib.gis.geos import MultiPolygon, Polygon, Point, LineString, GEOSGeometry
 
 from rest_framework.test import APITestCase
 from social_django.models import UserSocialAuth
@@ -228,10 +228,13 @@ def test_auto_user_field(self):
 
 class TestAoIDetailAPIViews(APITestCase):
     def setUp(self):
-        self.m_polygon = MultiPolygon(
-            Polygon(((0, 0), (0, 1), (1, 1), (0, 0))),
-            Polygon(((1, 1), (1, 2), (2, 2), (1, 1)))
-            )
+        self.m_polygon = {
+            "type": "MultiPolygon",
+            "coordinates": [
+                [ [ [ 0.0, 0.0 ], [ 0.0, 1.0 ], [ 1.0, 1.0 ], [ 0.0, 0.0 ] ] ],
+                [ [ [ 1.0, 1.0 ], [ 1.0, 2.0 ], [ 2.0, 2.0 ], [ 1.0, 1.0 ] ] ]
+                ]
+            }
         self.user = User.objects.create_user(
             username='test_user',
             email='[email protected]',
@@ -245,14 +248,14 @@ def setUp(self):
         self.aoi = AreaOfInterest.objects.create(
             name='Best place in the world',
             user=self.user,
-            geometry=self.m_polygon,
+            geometry=GEOSGeometry(f'{self.m_polygon}'),
             filters={
                 'editor': 'Potlatch 2',
                 'harmful': 'False',
                 'users': 'test',
                 'uids': '234,43',
                 'checked_by': 'qa_user',
-                'geometry': self.m_polygon.geojson
+                'geometry': self.m_polygon
                 },
             )
         self.m_polygon_2 = MultiPolygon(
@@ -290,7 +293,7 @@ def test_retrieve_detail_authenticated(self):
                 'users': 'test',
                 'uids': '234,43',
                 'checked_by': 'qa_user',
-                'geometry': self.m_polygon.geojson
+                'geometry': self.m_polygon
             }
             )
         self.assertEqual(

requirements/base.txt

@@ -17,7 +17,7 @@ social-auth-core==3.3.3
 
 # DRF and DRF-gis
 djangorestframework==3.11.2
-djangorestframework-gis==0.16
+djangorestframework-gis==0.17
 djangorestframework-csv==2.1.1
 django-filter==2.4.0
 django-cors-headers==3.7.0
@@ -42,7 +42,7 @@ redis>=2.10.5
 
 # Your custom requirements go here
 PyYAML==5.4.1
-osmcha==0.8.4
+osmcha==0.8.5
 
 # git python is required by the frontend management command
 GitPython==3.1.17