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

levels_by_short_label_for_request

Browse source
This commit is contained in:
Laura Klünder 2017-11-28 20:24:39 +01:00
parent dc46173668
commit 9b2b70f46f
2 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/c3nav/site/views.py
View file

@ -14,7 +14,7 @@ from c3nav.mapdata.models import Location, Source
from c3nav.mapdata.models.access import AccessPermission
from c3nav.mapdata.models.level import Level
from c3nav.mapdata.models.locations import LocationRedirect, SpecificLocation
from c3nav.mapdata.utils.locations import get_location_by_slug_for_request
from c3nav.mapdata.utils.locations import get_location_by_slug_for_request, levels_by_short_label_for_request
from c3nav.mapdata.views import set_tile_access_cookie
ctype_mapping = {
@ -110,14 +110,7 @@ def map_index(request, mode=None, slug=None, slug2=None, details=None, level=Non
'details': True if details else False,
}
levels_cache_key = 'mapdata:levels:%s' % AccessPermission.cache_key_for_request(request)
levels = cache.get(levels_cache_key, None)
if levels is None:
levels = OrderedDict(
(level.slug, (level.pk, level.slug, level.short_label))
for level in Level.qs_for_request(request).filter(on_top_of_id__isnull=True).order_by('base_altitude')
)
cache.set(levels_cache_key, levels, 300)
levels = levels_by_short_label_for_request(request)
level = levels.get(level, None) if level else None
if level is not None: