From 7c13a743cc711eeefe10a31aa57fc5be5f48d7b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= Date: Sun, 4 Dec 2016 21:45:17 +0100 Subject: [PATCH] rendermap: holes outside --- src/c3nav/mapdata/models/level.py | 4 ++++ src/c3nav/mapdata/render/renderer.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/c3nav/mapdata/models/level.py b/src/c3nav/mapdata/models/level.py index da64473b..05f48dd3 100644 --- a/src/c3nav/mapdata/models/level.py +++ b/src/c3nav/mapdata/models/level.py @@ -144,6 +144,10 @@ class LevelGeometries(): def buildings_with_holes(self): return self.buildings.difference(self.holes) + @cached_property + def outsides_with_holes(self): + return self.outsides.difference(self.holes) + @cached_property def areas_and_doors(self): return cascaded_union([self.areas, self.raw_doors]) diff --git a/src/c3nav/mapdata/render/renderer.py b/src/c3nav/mapdata/render/renderer.py index b8fa91c3..fd690952 100644 --- a/src/c3nav/mapdata/render/renderer.py +++ b/src/c3nav/mapdata/render/renderer.py @@ -104,7 +104,7 @@ class LevelRenderer(): contents.append(self.polygon_svg(self.level.geometries.buildings_with_holes, fill_color=('#EBEBEB' if self.level.intermediate else '#D5D5D5'))) - contents.append(self.polygon_svg(self.level.geometries.outsides, + contents.append(self.polygon_svg(self.level.geometries.outsides_with_holes, fill_color='#DCE6DC')) contents.append(self.polygon_svg(self.level.geometries.walls_shadow,