From dfe7d105745b4117f8e04da854a11ccbc017570c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= Date: Mon, 27 Nov 2017 15:39:42 +0100 Subject: [PATCH] it's _name_cache not name_cache --- src/c3nav/mapdata/models/geometry/level.py | 2 +- src/c3nav/mapdata/models/geometry/space.py | 4 ++-- src/c3nav/mapdata/utils/locations.py | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/c3nav/mapdata/models/geometry/level.py b/src/c3nav/mapdata/models/geometry/level.py index 3cca521a..df04c379 100644 --- a/src/c3nav/mapdata/models/geometry/level.py +++ b/src/c3nav/mapdata/models/geometry/level.py @@ -65,7 +65,7 @@ class LevelGeometryMixin(GeometryMixin): @property def subtitle(self): base_subtitle = super().subtitle - level = getattr(self, 'level_cache', None) + level = getattr(self, '_level_cache', None) if level is not None: return format_lazy(_('{category}, {level}'), category=base_subtitle, diff --git a/src/c3nav/mapdata/models/geometry/space.py b/src/c3nav/mapdata/models/geometry/space.py index b90c7096..c1ca01d8 100644 --- a/src/c3nav/mapdata/models/geometry/space.py +++ b/src/c3nav/mapdata/models/geometry/space.py @@ -36,9 +36,9 @@ class SpaceGeometryMixin(GeometryMixin): @property def subtitle(self): base_subtitle = super().subtitle - space = getattr(self, 'space_cache', None) + space = getattr(self, '_space_cache', None) if space is not None: - level = getattr(space, 'level_cache', None) + level = getattr(space, '_level_cache', None) if level is not None: return format_lazy(_('{category}, {space}, {level}'), category=base_subtitle, diff --git a/src/c3nav/mapdata/utils/locations.py b/src/c3nav/mapdata/utils/locations.py index 6315f17b..3b6adedf 100644 --- a/src/c3nav/mapdata/utils/locations.py +++ b/src/c3nav/mapdata/utils/locations.py @@ -59,19 +59,19 @@ def locations_for_request(request) -> Mapping[int, LocationSlug]: levels = {pk: obj for pk, obj in locations.items() if isinstance(obj, Level)} for obj in locations.values(): if isinstance(obj, LevelGeometryMixin): - obj.level_cache = levels.get(obj.level_id, None) + obj._level_cache = levels.get(obj.level_id, None) # add spaces to areas and POIs spaces = {pk: obj for pk, obj in locations.items() if isinstance(obj, Space)} for obj in locations.values(): if isinstance(obj, SpaceGeometryMixin): - obj.space_cache = spaces.get(obj.space_id, None) + obj._space_cache = spaces.get(obj.space_id, None) # add targets to LocationRedirects levels = {pk: obj for pk, obj in locations.items() if isinstance(obj, Level)} for obj in locations.values(): if isinstance(obj, LocationRedirect): - obj.target_cache = locations.get(obj.target_id, None) + obj._target_cache = locations.get(obj.target_id, None) # apply better space geometries for pk, geometry in get_better_space_geometries().items():