From ee200194171fcf0fc799a3aa3abada0227a9406a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= Date: Tue, 28 Nov 2017 20:38:37 +0100 Subject: [PATCH] fix data for level selector --- src/c3nav/mapdata/utils/locations.py | 2 +- src/c3nav/site/static/site/js/c3nav.js | 2 +- src/c3nav/site/views.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/c3nav/mapdata/utils/locations.py b/src/c3nav/mapdata/utils/locations.py index 9e9a4e1b..536eeac6 100644 --- a/src/c3nav/mapdata/utils/locations.py +++ b/src/c3nav/mapdata/utils/locations.py @@ -158,7 +158,7 @@ def locations_by_slug_for_request(request) -> Mapping[str, LocationSlug]: return locations -def levels_by_short_label_for_request(request) -> Mapping[str, LocationSlug]: +def levels_by_short_label_for_request(request) -> Mapping[str, Level]: cache_key = 'mapdata:levels:by_short_label:%s' % AccessPermission.cache_key_for_request(request) levels = cache.get(cache_key, None) if levels is not None: diff --git a/src/c3nav/site/static/site/js/c3nav.js b/src/c3nav/site/static/site/js/c3nav.js index fc146ad2..e715f69d 100644 --- a/src/c3nav/site/static/site/js/c3nav.js +++ b/src/c3nav/site/static/site/js/c3nav.js @@ -697,7 +697,7 @@ c3nav = { c3nav._firstRouteLevel = null; for (i = c3nav.levels.length - 1; i >= 0; i--) { var level = c3nav.levels[i]; - var layerGroup = c3nav._levelControl.addLevel(level[0], level[2]); + var layerGroup = c3nav._levelControl.addLevel(level[0], level[1]); c3nav._locationLayers[level[0]] = L.layerGroup().addTo(layerGroup); c3nav._routeLayers[level[0]] = L.layerGroup().addTo(layerGroup); } diff --git a/src/c3nav/site/views.py b/src/c3nav/site/views.py index 13599f5f..83ffab77 100644 --- a/src/c3nav/site/views.py +++ b/src/c3nav/site/views.py @@ -122,7 +122,7 @@ def map_index(request, mode=None, slug=None, slug2=None, details=None, level=Non ctx = { 'bounds': json.dumps(Source.max_bounds(), separators=(',', ':')), - 'levels': json.dumps(tuple(levels.values()), separators=(',', ':')), + 'levels': json.dumps(tuple((level.pk, level.short_label) for level in levels.values()), separators=(',', ':')), 'state': json.dumps(state, separators=(',', ':')), 'tile_cache_server': settings.TILE_CACHE_SERVER, }