summaryrefslogtreecommitdiff
path: root/archaeological_finds
diff options
context:
space:
mode:
Diffstat (limited to 'archaeological_finds')
-rw-r--r--archaeological_finds/urls.py13
-rw-r--r--archaeological_finds/views.py16
2 files changed, 10 insertions, 19 deletions
diff --git a/archaeological_finds/urls.py b/archaeological_finds/urls.py
index 4bb771359..5e90afd55 100644
--- a/archaeological_finds/urls.py
+++ b/archaeological_finds/urls.py
@@ -604,20 +604,11 @@ urlpatterns = [
r"api/public/find/$", views_api.PublicFindAPI.as_view(), name="api-public-find"
),
url(
- r"api/ishtar/base-finds/geo/polygons$",
+ r"api/ishtar/base-finds/get-geo$",
check_rights(["view_find", "view_own_find"])(
views.get_geo_items,
),
- name="api-get-geo-polygons",
- kwargs={"get_polygons": True},
- ),
- url(
- r"api/ishtar/base-finds/geo/points$",
- check_rights(["view_find", "view_own_find"])(
- views.get_geo_items,
- ),
- name="api-get-geo-points",
- kwargs={"get_polygons": False},
+ name="api-get-geo",
),
url(
r"api/facets/find/$", views_api.FacetFindAPIView.as_view(),
diff --git a/archaeological_finds/views.py b/archaeological_finds/views.py
index d643c81b7..514c0650a 100644
--- a/archaeological_finds/views.py
+++ b/archaeological_finds/views.py
@@ -1325,24 +1325,24 @@ class QAFindLockView(QABaseLockView):
base_url = "find-qa-lock"
-def get_geo_items(request, get_polygons, current_right=None):
- operation_pk = request.GET.get("operation_pk")
- context_record_pk = request.GET.get("context_record_pk")
+def get_geo_items(request, current_right=None):
+ operation_pk = request.GET.get("operation_id")
+ context_record_pk = request.GET.get("context_record_id")
pk = request.GET.get("pk")
if operation_pk:
try:
- bf = Operation.objects.get(pk=operation_pk)
+ item = Operation.objects.get(pk=operation_pk)
except Operation.DoesNotExist:
raise Http404()
elif context_record_pk:
try:
- bf = ContextRecord.objects.get(pk=context_record_pk)
+ item = ContextRecord.objects.get(pk=context_record_pk)
except ContextRecord.DoesNotExist:
raise Http404()
else:
try:
- bf = models.BaseFind.objects.get(pk=pk)
+ item = models.BaseFind.objects.get(pk=pk)
except models.BaseFind.DoesNotExist:
raise Http404()
- dic = bf.get_geo_items(get_polygons=get_polygons)
- return HttpResponse(json.dumps(dic).encode("utf-8"))
+ geo = item.get_geo_items()
+ return HttpResponse(json.dumps(geo).encode("utf-8"))