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

rename and refactor mapdata models

Browse source
This commit is contained in:
Laura Klünder 2017-05-05 12:32:35 +02:00
parent a18dc108c1
commit 5973ca3211
10 changed files with 86 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -10,7 +10,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 GEOMETRY_MAPITEM_TYPES, AreaLocation, Level, LocationGroup, Source
from c3nav.mapdata.models import GEOMETRY_FEATURE_TYPES, AreaLocation, Level, LocationGroup, Source
from c3nav.mapdata.models.geometry import Stair
from c3nav.mapdata.search import get_location
from c3nav.mapdata.serializers.main import LevelSerializer, SourceSerializer
@ -29,7 +29,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_MAPITEM_TYPES.items()
)) for name, mapitemtype in GEOMETRY_FEATURE_TYPES.items()
])
@ -40,7 +40,7 @@ class GeometryViewSet(ViewSet):
"""
def list(self, request):
types = set(request.GET.getlist('type'))
valid_types = list(GEOMETRY_MAPITEM_TYPES.keys())
valid_types = list(GEOMETRY_FEATURE_TYPES.keys())
if not types:
types = valid_types
else:
@ -68,7 +68,7 @@ class GeometryViewSet(ViewSet):
def _list(self, request, types, level):
results = []
for t in types:
mapitemtype = GEOMETRY_MAPITEM_TYPES[t]
mapitemtype = GEOMETRY_FEATURE_TYPES[t]
queryset = mapitemtype.objects.all()
if level:
if hasattr(mapitemtype, 'level'):