From 898141716d0cd506ae5ebfd5009e16ff196a8a14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= Date: Thu, 16 Nov 2017 23:31:44 +0100 Subject: [PATCH] *coughs* not so much, but the real error is clear, now --- src/c3nav/mapdata/cache.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/c3nav/mapdata/cache.py b/src/c3nav/mapdata/cache.py index 4fade995..eea4a0ee 100644 --- a/src/c3nav/mapdata/cache.py +++ b/src/c3nav/mapdata/cache.py @@ -192,9 +192,9 @@ class MapHistory: # check overlapping area self_height, self_width = self.data.shape other_height, other_width = other.data.shape - minx, miny = min(self.x, other.x), min(self.y, other.y) - maxx = max(self.x+self_width-1, other.x+other_width-1) - maxy = max(self.y+self_height-1, other.y+other_height-1) + minx, miny = max(self.x, other.x), max(self.y, other.y) + maxx = min(self.x+self_width-1, other.x+other_width-1) + maxy = min(self.y+self_height-1, other.y+other_height-1) if maxx < minx or maxy < miny: return