From 478e3a81e2e60dbf331315b89ff44eba8e5cd21e Mon Sep 17 00:00:00 2001 From: Mohamed Nouffer Date: Thu, 6 Oct 2022 18:15:18 +0530 Subject: [PATCH] update location filter for sight seeing --- rog/views.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/rog/views.py b/rog/views.py index 42eee8e..4cbdb18 100644 --- a/rog/views.py +++ b/rog/views.py @@ -68,9 +68,9 @@ def LocationsInPerf(request): locs = Location.objects.filter(~Q(cp=0), geom__within=perf_geom.geom, category=cat) else: if grp: - locs = Location.objects.filter(geom__within=perf_geom.geom, category=cat, group__contains=grp) + locs = Location.objects.filter(geom__within=perf_geom.geom, category=cat, group__contains=grp, location_name__contains='観光') else: - locs = Location.objects.filter(geom__within=perf_geom.geom, category=cat) + locs = Location.objects.filter(geom__within=perf_geom.geom, category=cat, location_name__contains='観光') else: if is_rog: if grp: @@ -79,9 +79,9 @@ def LocationsInPerf(request): locs = Location.objects.filter(~Q(cp=0), geom__within=perf_geom.geom) else: if grp: - locs = Location.objects.filter(geom__within=perf_geom.geom, group__contains=grp) + locs = Location.objects.filter(geom__within=perf_geom.geom, group__contains=grp, location_name__contains='観光') else: - locs = Location.objects.filter(geom__within=perf_geom.geom) + locs = Location.objects.filter(geom__within=perf_geom.geom, location_name__contains='観光') serializer = LocationSerializer(locs, many=True) return JsonResponse(serializer.data, safe=False) @@ -101,9 +101,9 @@ def LocationsInSubPerf(request): locs = Location.objects.filter(~Q(cp=0), geom__within=perf_geom.geom, category=cat) else: if grp: - locs = Location.objects.filter(geom__within=perf_geom.geom, category=cat, group__contains=grp) + locs = Location.objects.filter(geom__within=perf_geom.geom, category=cat, group__contains=grp, location_name__contains='観光') else: - locs = Location.objects.filter(geom__within=perf_geom.geom, category=cat) + locs = Location.objects.filter(geom__within=perf_geom.geom, category=cat, location_name__contains='観光') else: if is_rog: if grp: @@ -111,7 +111,7 @@ def LocationsInSubPerf(request): else: locs = Location.objects.filter(~Q(cp=0), geom__within=perf_geom.geom) else: - locs = Location.objects.filter(geom__within=perf_geom.geom) + locs = Location.objects.filter(geom__within=perf_geom.geom, location_name__contains='観光') serializer = LocationSerializer(locs, many=True) return JsonResponse(serializer.data, safe=False) @@ -394,9 +394,9 @@ def CustomAreaLocations(request): locs = Location.objects.filter(~Q(cp=0), event_name__isnull=False, category=cat, event_name=name) else: if grp: - locs = Location.objects.filter(event_name__isnull=False, category=cat, event_name=name, group__contains=grp) + locs = Location.objects.filter(event_name__isnull=False, category=cat, event_name=name, group__contains=grp, location_name__contains='観光') else: - locs = Location.objects.filter(event_name__isnull=False, category=cat, event_name=name) + locs = Location.objects.filter(event_name__isnull=False, category=cat, event_name=name, location_name__contains='観光') else: if is_rog: if grp: @@ -405,9 +405,9 @@ def CustomAreaLocations(request): locs = Location.objects.filter(~Q(cp=0), event_name__isnull=False, event_name=name) else: if grp: - locs = Location.objects.filter(event_name__isnull=False, event_name=name, group__contains=grp) + locs = Location.objects.filter(event_name__isnull=False, event_name=name, group__contains=grp, location_name__contains='観光') else: - locs = Location.objects.filter(event_name__isnull=False, event_name=name) + locs = Location.objects.filter(event_name__isnull=False, event_name=name, location_name__contains='観光') serializer = LocationSerializer(locs, many=True) return JsonResponse(serializer.data, safe=False)