diff options
| -rw-r--r-- | archaeological_finds/tests.py | 12 | ||||
| -rw-r--r-- | archaeological_finds/urls.py | 6 | ||||
| -rw-r--r-- | archaeological_finds/views.py | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/archaeological_finds/tests.py b/archaeological_finds/tests.py index 73e3f6f45..47ac7e72c 100644 --- a/archaeological_finds/tests.py +++ b/archaeological_finds/tests.py @@ -2544,14 +2544,12 @@ class GeomaticTest(FindInit, TestCase): "type": "Feature", "geometry": {"type": "Point", "coordinates": [2.0, 43.0]}, } - res = base_find.get_geo_items(get_polygons=True) - self.assertEqual(dic, res) - res = base_find.get_geo_items(get_polygons=False) + res = base_find.get_geo_items() self.assertEqual(dic, res) # test API find = base_find.find.all()[0] - response = self.client.get(reverse("api-get-geo-items", kwargs={"pk": find.pk})) + response = self.client.get(reverse("api-get-geo-point", kwargs={"pk": find.pk})) self.assertEqual(response.status_code, 200) self.assertIn(json.dumps(dic).encode("utf-8"), response.content) @@ -2593,14 +2591,16 @@ class GeomaticTest(FindInit, TestCase): # test API response = self.client.get( reverse( - "api-get-geo-items", kwargs={"pk": base_find.pk, "get_polygons": True} + "api-get-geo-polygons", + kwargs={"pk": base_find.pk, "get_polygons": True}, ) ) self.assertEqual(response.status_code, 200) self.assertIn(json.dumps(dict_poly).encode("utf-8"), response.content) response = self.client.get( reverse( - "api-get-geo-items", kwargs={"pk": base_find.pk, "get_polygons": False} + "api-get-geo-polygons", + kwargs={"pk": base_find.pk, "get_polygons": False}, ) ) self.assertEqual(response.status_code, 200) diff --git a/archaeological_finds/urls.py b/archaeological_finds/urls.py index fa55694e0..06b0d4b42 100644 --- a/archaeological_finds/urls.py +++ b/archaeological_finds/urls.py @@ -574,18 +574,18 @@ urlpatterns = [ ), url(r"api/public/find/$", views.PublicFindAPI.as_view(), name="api-public-find"), url( - r"api/ishtar/base-finds/geo/polygons/(?P<pk>[0-9]+)/(?P<get_polygons>(True|False)/)?$", + r"api/ishtar/base-finds/geo/polygons/(?P<pk>[0-9]+)/(?P<get_polygons>(True|False)/?)?$", check_rights(["view_find", "view_own_find"])( views.get_geo_items, ), - name="api-get-geo-items", + name="api-get-geo-polygons", ), url( r"api/ishtar/base-finds/geo/point/(?P<pk>[0-9]+)/$", check_rights(["view_find", "view_own_find"])( views.get_geo_items, ), - name="api-get-geo-items", + name="api-get-geo-point", ), ] diff --git a/archaeological_finds/views.py b/archaeological_finds/views.py index 436037b3a..a29c7d274 100644 --- a/archaeological_finds/views.py +++ b/archaeological_finds/views.py @@ -1338,7 +1338,7 @@ class PublicFindAPI(APIView): return Response(serializer.data) -def get_geo_items(request, pk, get_polygons, current_right=None): +def get_geo_items(request, pk, get_polygons="False", current_right=None): base_find = models.BaseFind.objects.get(pk=pk) if not base_find: return Http404() |