2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

reimplement GEOMETRY_MODELS etc.

Browse source
This commit is contained in:
Laura Klünder 2017-05-09 09:36:08 +02:00
parent 9a1ce01fdb
commit 65ccf1d92f
11 changed files with 53 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/c3nav/mapdata/api.py
View file

@ -11,7 +11,7 @@ from rest_framework.viewsets import ReadOnlyModelViewSet, ViewSet
from c3nav.access.apply import filter_arealocations_by_access, filter_queryset_by_access
from c3nav.mapdata.lastupdate import get_last_mapdata_update
from c3nav.mapdata.models import AreaLocation, LocationGroup, Source
from c3nav.mapdata.models.geometry.base import GEOMETRY_FEATURE_TYPES
from c3nav.mapdata.models.geometry.base import GEOMETRY_MODELS
from c3nav.mapdata.models.geometry.space import Stair
from c3nav.mapdata.models.section import Section
from c3nav.mapdata.search import get_location
@ -30,7 +30,7 @@ class GeometryTypeViewSet(ViewSet):
('name', name),
('title', str(mapitemtype._meta.verbose_name)),
('title_plural', str(mapitemtype._meta.verbose_name_plural)),
)) for name, mapitemtype in GEOMETRY_FEATURE_TYPES.items()
)) for name, mapitemtype in GEOMETRY_MODELS.items()
])
@ -40,7 +40,7 @@ class GeometryViewSet(ViewSet):
"""
def list(self, request):
types = set(request.GET.getlist('type'))
valid_types = list(GEOMETRY_FEATURE_TYPES.keys())
valid_types = list(GEOMETRY_MODELS.keys())
if not types:
types = valid_types
else:
@ -60,7 +60,7 @@ class GeometryViewSet(ViewSet):
def _list(self, request, types):
results = []
for t in types:
mapitemtype = GEOMETRY_FEATURE_TYPES[t]
mapitemtype = GEOMETRY_MODELS[t]
queryset = mapitemtype.objects.all()
queryset = filter_queryset_by_access(request, queryset)
queryset = queryset.order_by('id')