From 0150851808317e5169e15ca5b1128b4ea0b28c6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= Date: Thu, 7 Dec 2023 18:57:40 +0100 Subject: [PATCH] fix typo or it will never load from local cache --- src/c3nav/mapdata/render/renderdata.py | 2 +- src/c3nav/mapdata/utils/cache/indexed.py | 2 +- src/c3nav/mapdata/utils/cache/package.py | 2 +- src/c3nav/routing/models.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/c3nav/mapdata/render/renderdata.py b/src/c3nav/mapdata/render/renderdata.py index 56b2a763..bb7db8ac 100644 --- a/src/c3nav/mapdata/render/renderdata.py +++ b/src/c3nav/mapdata/render/renderdata.py @@ -308,7 +308,7 @@ class LevelRenderData: # this is much faster than any other possible cache cache_key = MapUpdate.current_processed_cache_key() level_pk = str(level.pk if isinstance(level, Level) else level) - if getattr(cls.cached, 'cache_key', None) != cache_key: + if getattr(cls.cached, 'key', None) != cache_key: cls.cached.key = cache_key cls.cached.data = {} else: diff --git a/src/c3nav/mapdata/utils/cache/indexed.py b/src/c3nav/mapdata/utils/cache/indexed.py index 3c9a3265..ebbf71a3 100644 --- a/src/c3nav/mapdata/utils/cache/indexed.py +++ b/src/c3nav/mapdata/utils/cache/indexed.py @@ -217,7 +217,7 @@ class LevelGeometryIndexed(GeometryIndexed): def open_level_cached(cls, level_id, mode): from c3nav.mapdata.models import MapUpdate cache_key = MapUpdate.current_processed_cache_key() - if getattr(cls.cached, 'cache_key', None) != cache_key: + if getattr(cls.cached, 'key', None) != cache_key: cls.cached.key = cache_key cls.cached.data = {} else: diff --git a/src/c3nav/mapdata/utils/cache/package.py b/src/c3nav/mapdata/utils/cache/package.py index 66136ebe..b65e048b 100644 --- a/src/c3nav/mapdata/utils/cache/package.py +++ b/src/c3nav/mapdata/utils/cache/package.py @@ -122,7 +122,7 @@ class CachePackage: def open_cached(cls) -> Self: from c3nav.mapdata.models import MapUpdate cache_key = MapUpdate.current_processed_cache_key() - if getattr(cls.cached, 'cache_key', None) != cache_key: + if getattr(cls.cached, 'key', None) != cache_key: cls.cached.key = cache_key cls.cached.data = None diff --git a/src/c3nav/routing/models.py b/src/c3nav/routing/models.py index 9f09369e..94ef245b 100644 --- a/src/c3nav/routing/models.py +++ b/src/c3nav/routing/models.py @@ -60,7 +60,7 @@ class RouteOptions(models.Model): @classmethod def get_fields(cls): cache_key = MapUpdate.current_cache_key() - if getattr(cls.fields_cached, 'cache_key', None) != cache_key: + if getattr(cls.fields_cached, 'key', None) != cache_key: cls.fields_cached.key = cache_key cls.fields_cached.data = cls.build_fields() return cls.fields_cached.data