nouffer/rogaining_srv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update location filter for sight seeing

Browse Source
This commit is contained in:
Mohamed Nouffer
2022-10-06 18:15:18 +05:30
parent c6e0cfdeba
commit 478e3a81e2
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
rog/views.py
View File

@ -68,9 +68,9 @@ def LocationsInPerf(request):
locs = Location.objects.filter(~Q(cp=0), geom__within=perf_geom.geom, category=cat) locs = Location.objects.filter(~Q(cp=0), geom__within=perf_geom.geom, category=cat)
else: else:
if grp: 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: 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: else:
if is_rog: if is_rog:
if grp: if grp:
@ -79,9 +79,9 @@ def LocationsInPerf(request):
locs = Location.objects.filter(~Q(cp=0), geom__within=perf_geom.geom) locs = Location.objects.filter(~Q(cp=0), geom__within=perf_geom.geom)
else: else:
if grp: 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: 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) serializer = LocationSerializer(locs, many=True)
return JsonResponse(serializer.data, safe=False) 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) locs = Location.objects.filter(~Q(cp=0), geom__within=perf_geom.geom, category=cat)
else: else:
if grp: 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: 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: else:
if is_rog: if is_rog:
if grp: if grp:
@ -111,7 +111,7 @@ def LocationsInSubPerf(request):
else: else:
locs = Location.objects.filter(~Q(cp=0), geom__within=perf_geom.geom) locs = Location.objects.filter(~Q(cp=0), geom__within=perf_geom.geom)
else: 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) serializer = LocationSerializer(locs, many=True)
return JsonResponse(serializer.data, safe=False) 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) locs = Location.objects.filter(~Q(cp=0), event_name__isnull=False, category=cat, event_name=name)
else: else:
if grp: 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: 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: else:
if is_rog: if is_rog:
if grp: if grp:
@ -405,9 +405,9 @@ def CustomAreaLocations(request):
locs = Location.objects.filter(~Q(cp=0), event_name__isnull=False, event_name=name) locs = Location.objects.filter(~Q(cp=0), event_name__isnull=False, event_name=name)
else: else:
if grp: 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: 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) serializer = LocationSerializer(locs, many=True)
return JsonResponse(serializer.data, safe=False) return JsonResponse(serializer.data, safe=False)