From 54b21b12ce83ecfac4c0a229d0178f9624999e85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= Date: Tue, 14 Nov 2017 18:02:17 +0100 Subject: [PATCH] simplify calculations in non-full-level rendering --- src/c3nav/mapdata/render/renderer.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/c3nav/mapdata/render/renderer.py b/src/c3nav/mapdata/render/renderer.py index 4e1a1881..de4bf2d7 100644 --- a/src/c3nav/mapdata/render/renderer.py +++ b/src/c3nav/mapdata/render/renderer.py @@ -84,7 +84,7 @@ class MapRenderer: levels = self.level_render_data.levels min_altitude = min(chain(*(tuple(area.altitude for area in geoms.altitudeareas) - for geoms in levels))) - int(0.7*1000) + for geoms in levels))) not_full_levels = not self.full_levels and engine.is_3d full_levels = self.full_levels and engine.is_3d @@ -104,13 +104,12 @@ class MapRenderer: if not_full_levels: engine.add_geometry(geoms.walls_base, fill=FillAttribs('#aaaaaa'), category='walls') - engine.add_geometry(geoms.walls_bottom.fit(scale=geoms.min_altitude-min_altitude-int(0.7*1000), - offset=min_altitude), + engine.add_geometry(geoms.walls_bottom.fit(scale=geoms.min_altitude-min_altitude, + offset=min_altitude-int(0.7*1000)), fill=FillAttribs('#aaaaaa'), category='walls') for altitudearea in geoms.altitudeareas: - bottom = altitudearea.altitude - int(0.7 * 1000) - scale = (bottom - min_altitude) / int(0.7 * 1000) - offset = min_altitude - bottom * scale + scale = (altitudearea.altitude - min_altitude) / int(0.7 * 1000) + offset = (min_altitude - int(0.7*1000)) - (altitudearea.altitude - int(0.7*1000)) * scale geometry = altitudearea.geometry.difference(crop_areas) engine.add_geometry(geometry.fit(scale=scale, offset=offset).filter(top=False), fill=FillAttribs('#eeeeee'), category='ground')