url with get and display geo items

1 files changed, 31 insertions, 121 deletions

diff --git a/archaeological_finds/tests.py b/archaeological_finds/tests.py
index 6f4bcaea4..c2d1b3143 100644
--- a/archaeological_finds/tests.py
+++ b/archaeological_finds/tests.py
@@ -2584,11 +2584,11 @@ class GeomaticTest(FindInit, TestCase):
         self.assertEqual(dic_pt_f, res)
 
         # test API with point
-        response = self.client.get(reverse("api-get-geo-point", kwargs={"pk": 0}))
+        url_pts = reverse("api-get-geo-points")
+        url_polys = reverse("api-get-geo-polygons")
+        response = self.client.get(url_pts + "?pk=0")
         self.assertEqual(response.status_code, 404)
-        response = self.client.get(
-            reverse("api-get-geo-point", kwargs={"pk": base_find_pt.pk})
-        )
+        response = self.client.get(url_pts + "?pk=" + str(base_find_pt.pk))
         self.assertEqual(response.status_code, 200)
         self.assertIn(json.dumps(dic_pt_f).encode("utf-8"), response.content)
 
@@ -2616,31 +2616,15 @@ class GeomaticTest(FindInit, TestCase):
         self.assertEqual(dic_pt_pt_t, cr_pt_pt.get_geo_items(True))
 
         # test of API for point context record with point as base find
-        response = self.client.get(
-            reverse("api-get-geo-points-from-context", kwargs={"context_record_pk": 0})
-        )
+        response = self.client.get(url_pts + "?context_record_pk=0")
         self.assertEqual(response.status_code, 404)
-        response = self.client.get(
-            reverse(
-                "api-get-geo-points-from-context",
-                kwargs={"context_record_pk": cr_pt_pt.pk},
-            )
-        )
+        response = self.client.get(url_pts + "?context_record_pk=" + str(cr_pt_pt.pk))
         self.assertEqual(response.status_code, 200)
         self.assertIn(json.dumps(dic_pt_pt_f).encode("utf-8"), response.content)
 
-        response = self.client.get(
-            reverse(
-                "api-get-geo-polygons-from-context", kwargs={"context_record_pk": 0}
-            )
-        )
+        response = self.client.get(url_polys + "?context_record_pk=0")
         self.assertEqual(response.status_code, 404)
-        response = self.client.get(
-            reverse(
-                "api-get-geo-polygons-from-context",
-                kwargs={"context_record_pk": cr_pt_pt.pk},
-            )
-        )
+        response = self.client.get(url_polys + "?context_record_pk=" + str(cr_pt_pt.pk))
         self.assertEqual(response.status_code, 200)
         self.assertIn(json.dumps(dic_pt_pt_t).encode("utf-8"), response.content)
 
@@ -2694,30 +2678,16 @@ class GeomaticTest(FindInit, TestCase):
         self.assertEqual(dic_poly_pt_f, cr_poly_pt.get_geo_items(False))
 
         # test of API for point context record with multipolygon as base find
-        response = self.client.get(
-            reverse("api-get-geo-points-from-context", kwargs={"context_record_pk": 0})
-        )
+        response = self.client.get(url_pts + "?context_record_pk=0")
         self.assertEqual(response.status_code, 404)
-        response = self.client.get(
-            reverse(
-                "api-get-geo-points-from-context",
-                kwargs={"context_record_pk": cr_poly_pt.pk},
-            )
-        )
+        response = self.client.get(url_pts + "?context_record_pk=" + str(cr_poly_pt.pk))
         self.assertEqual(response.status_code, 200)
         self.assertIn(json.dumps(dic_poly_pt_f).encode("utf-8"), response.content)
 
-        response = self.client.get(
-            reverse(
-                "api-get-geo-polygons-from-context", kwargs={"context_record_pk": 0}
-            )
-        )
+        response = self.client.get(url_polys + "?context_record_pk=0")
         self.assertEqual(response.status_code, 404)
         response = self.client.get(
-            reverse(
-                "api-get-geo-polygons-from-context",
-                kwargs={"context_record_pk": cr_poly_pt.pk},
-            )
+            url_polys + "?context_record_pk=" + str(cr_poly_pt.pk)
         )
         self.assertEqual(response.status_code, 200)
         self.assertIn(json.dumps(dic_poly_pt_t).encode("utf-8"), response.content)
@@ -2739,22 +2709,12 @@ class GeomaticTest(FindInit, TestCase):
         self.assertEqual(dic_poly_f_from_poly, res_centroid)
 
         # test API with polygon
-        response = self.client.get(reverse("api-get-geo-polygons", kwargs={"pk": 0}))
+        response = self.client.get(url_polys + "?pk=0")
         self.assertEqual(response.status_code, 404)
-        response = self.client.get(
-            reverse(
-                "api-get-geo-polygons",
-                kwargs={"pk": base_find_poly.pk},
-            )
-        )
+        response = self.client.get(url_polys + "?pk=" + str(base_find_poly.pk))
         self.assertEqual(response.status_code, 200)
         self.assertEqual(dic_poly_t_from_poly, json.loads(response.content))
-        response = self.client.get(
-            reverse(
-                "api-get-geo-point",
-                kwargs={"pk": base_find_poly.pk},
-            )
-        )
+        response = self.client.get(url_pts + "?pk=" + str(base_find_poly.pk))
         self.assertEqual(response.status_code, 200)
         self.assertEqual(dic_poly_f_from_poly, json.loads(response.content))
 
@@ -2803,30 +2763,18 @@ class GeomaticTest(FindInit, TestCase):
         )
 
         # test of API for multipolygon context record with a multipolygon and a point as base find
-        response = self.client.get(
-            reverse("api-get-geo-points-from-context", kwargs={"context_record_pk": 0})
-        )
+        response = self.client.get(url_pts + "?context_record_pk=0")
         self.assertEqual(response.status_code, 404)
         response = self.client.get(
-            reverse(
-                "api-get-geo-points-from-context",
-                kwargs={"context_record_pk": cr_poly_poly_and_pt.pk},
-            )
+            url_pts + "?context_record_pk=" + str(cr_poly_poly_and_pt.pk)
         )
         self.assertEqual(response.status_code, 200)
         self.assertEqual(dic_poly_poly_and_pt_f, json.loads(response.content))
 
-        response = self.client.get(
-            reverse(
-                "api-get-geo-polygons-from-context", kwargs={"context_record_pk": 0}
-            )
-        )
+        response = self.client.get(url_polys + "?context_record_pk=0")
         self.assertEqual(response.status_code, 404)
         response = self.client.get(
-            reverse(
-                "api-get-geo-polygons-from-context",
-                kwargs={"context_record_pk": cr_poly_poly_and_pt.pk},
-            )
+            url_polys + "?context_record_pk=" + str(cr_poly_poly_and_pt.pk)
         )
         self.assertEqual(response.status_code, 200)
         self.assertEqual(dic_poly_poly_and_pt_t, json.loads(response.content))
@@ -2873,30 +2821,18 @@ class GeomaticTest(FindInit, TestCase):
         self.assertEqual(dic_pt_poly_and_pt_f, cr_pt_poly_and_pt.get_geo_items(False))
 
         # test of API for point context record with multipolygon as base find
-        response = self.client.get(
-            reverse("api-get-geo-points-from-context", kwargs={"context_record_pk": 0})
-        )
+        response = self.client.get(url_pts + "?context_record_pk=0")
         self.assertEqual(response.status_code, 404)
         response = self.client.get(
-            reverse(
-                "api-get-geo-points-from-context",
-                kwargs={"context_record_pk": cr_pt_poly_and_pt.pk},
-            )
+            url_pts + "?context_record_pk=" + str(cr_pt_poly_and_pt.pk)
         )
         self.assertEqual(response.status_code, 200)
         self.assertEqual(dic_pt_poly_and_pt_f, json.loads(response.content))
 
-        response = self.client.get(
-            reverse(
-                "api-get-geo-polygons-from-context", kwargs={"context_record_pk": 0}
-            )
-        )
+        response = self.client.get(url_polys + "?context_record_pk=0")
         self.assertEqual(response.status_code, 404)
         response = self.client.get(
-            reverse(
-                "api-get-geo-polygons-from-context",
-                kwargs={"context_record_pk": cr_pt_poly_and_pt.pk},
-            )
+            url_polys + "?context_record_pk=" + str(cr_pt_poly_and_pt.pk)
         )
         self.assertEqual(response.status_code, 200)
         self.assertEqual(dic_pt_poly_and_pt_t, json.loads(response.content))
@@ -2961,28 +2897,15 @@ class GeomaticTest(FindInit, TestCase):
         self.assertEqual(dic_pt_pt_and_poly_pt_and_poly_f, ope_pt.get_geo_items(False))
         self.assertEqual(dic_pt_pt_and_poly_pt_and_poly_t, ope_pt.get_geo_items(True))
 
-        response = self.client.get(
-            reverse("api-get-geo-polygons-from-operation", kwargs={"operation_pk": 0})
-        )
+        response = self.client.get(url_polys + "?operation_pk=0")
         self.assertEqual(response.status_code, 404)
-        response = self.client.get(
-            reverse(
-                "api-get-geo-polygons-from-operation",
-                kwargs={"operation_pk": ope_pt.pk},
-            )
-        )
+        response = self.client.get(url_polys + "?operation_pk=" + str(ope_pt.pk))
         self.assertEqual(response.status_code, 200)
         self.assertEqual(dic_pt_pt_and_poly_pt_and_poly_t, json.loads(response.content))
 
-        response = self.client.get(
-            reverse("api-get-geo-points-from-operation", kwargs={"operation_pk": 0})
-        )
+        response = self.client.get(url_pts + "?operation_pk=0")
         self.assertEqual(response.status_code, 404)
-        response = self.client.get(
-            reverse(
-                "api-get-geo-points-from-operation", kwargs={"operation_pk": ope_pt.pk}
-            )
-        )
+        response = self.client.get(url_pts + "?operation_pk=" + str(ope_pt.pk))
         self.assertEqual(response.status_code, 200)
         self.assertEqual(dic_pt_pt_and_poly_pt_and_poly_f, json.loads(response.content))
 
@@ -3002,30 +2925,17 @@ class GeomaticTest(FindInit, TestCase):
             dic_poly_pt_and_poly_pt_and_poly_t, ope_poly.get_geo_items(True)
         )
 
-        response = self.client.get(
-            reverse("api-get-geo-polygons-from-operation", kwargs={"operation_pk": 0})
-        )
+        response = self.client.get(url_polys + "?operation_pk=0")
         self.assertEqual(response.status_code, 404)
-        response = self.client.get(
-            reverse(
-                "api-get-geo-polygons-from-operation",
-                kwargs={"operation_pk": ope_pt.pk},
-            )
-        )
+        response = self.client.get(url_polys + "?operation_pk=" + str(ope_poly.pk))
         self.assertEqual(response.status_code, 200)
         self.assertEqual(
             dic_poly_pt_and_poly_pt_and_poly_t, json.loads(response.content)
         )
 
-        response = self.client.get(
-            reverse("api-get-geo-points-from-operation", kwargs={"operation_pk": 0})
-        )
+        response = self.client.get(url_pts + "?operation_pk=0")
         self.assertEqual(response.status_code, 404)
-        response = self.client.get(
-            reverse(
-                "api-get-geo-points-from-operation", kwargs={"operation_pk": ope_pt.pk}
-            )
-        )
+        response = self.client.get(url_pts + "?operation_pk=" + str(ope_poly.pk))
         self.assertEqual(response.status_code, 200)
         self.assertEqual(
             dic_poly_pt_and_poly_pt_and_poly_f, json.loads(response.content)