From 7f0d52f23f1c6f8b8bb836b4e2f9ce228f67a6ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= <laura@codingcatgirl.de>
Date: Thu, 16 Nov 2017 02:03:36 +0100
Subject: [PATCH] rename map history files to be less confusing

---
 src/c3nav/mapdata/cache.py           | 2 +-
 src/c3nav/mapdata/render/data.py     | 2 +-
 src/c3nav/mapdata/render/renderer.py | 4 ++--
 src/c3nav/mapdata/views.py           | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/c3nav/mapdata/cache.py b/src/c3nav/mapdata/cache.py
index b8176952..1d256e5f 100644
--- a/src/c3nav/mapdata/cache.py
+++ b/src/c3nav/mapdata/cache.py
@@ -59,7 +59,7 @@ class MapHistory:
 
     @staticmethod
     def level_filename(level_id, mode):
-        return os.path.join(settings.CACHE_ROOT, 'level_%s_%d' % (mode, level_id))
+        return os.path.join(settings.CACHE_ROOT, 'level_%d_history_%s' % (level_id, mode))
 
     @classmethod
     def open_level(cls, level_id, mode, default_update=None):
diff --git a/src/c3nav/mapdata/render/data.py b/src/c3nav/mapdata/render/data.py
index d542bd82..6c62732b 100644
--- a/src/c3nav/mapdata/render/data.py
+++ b/src/c3nav/mapdata/render/data.py
@@ -315,7 +315,7 @@ class LevelRenderData:
 
             level.render_data = pickle.dumps(render_data)
 
-            map_history.save(MapHistory.level_filename(level.pk, 'render'))
+            map_history.save(MapHistory.level_filename(level.pk, 'composite'))
 
         with transaction.atomic():
             for level in levels:
diff --git a/src/c3nav/mapdata/render/renderer.py b/src/c3nav/mapdata/render/renderer.py
index 7d6438a9..073c1e06 100644
--- a/src/c3nav/mapdata/render/renderer.py
+++ b/src/c3nav/mapdata/render/renderer.py
@@ -35,8 +35,8 @@ class MapRenderer:
 
     @cached_property
     def last_update(self):
-        return MapHistory.open_level_cached(self.level, 'render').last_update(self.minx, self.miny,
-                                                                              self.maxx, self.maxy)
+        return MapHistory.open_level_cached(self.level, 'composite').last_update(self.minx, self.miny,
+                                                                                 self.maxx, self.maxy)
 
     @cached_property
     def update_cache_key(self):
diff --git a/src/c3nav/mapdata/views.py b/src/c3nav/mapdata/views.py
index e210e649..910c99fc 100644
--- a/src/c3nav/mapdata/views.py
+++ b/src/c3nav/mapdata/views.py
@@ -127,7 +127,7 @@ def history(request, level, mode, format):
         raise PermissionDenied
     level = get_object_or_404(Level, pk=level)
 
-    if mode == 'render' and level.on_top_of_id is not None:
+    if mode == 'composite' and level.on_top_of_id is not None:
         raise Http404
 
     history = MapHistory.open_level(level.pk, mode)