From 7bc75e4207b45a9bf1e757d41ccc422275157a26 Mon Sep 17 00:00:00 2001 From: Gwendolyn Date: Thu, 14 Dec 2023 20:07:25 +0100 Subject: [PATCH] fix wrong indentation from f85bcc1 --- src/c3nav/mapdata/render/renderer.py | 42 ++++++++++++++-------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/src/c3nav/mapdata/render/renderer.py b/src/c3nav/mapdata/render/renderer.py index 79ee92ec..427e65ff 100644 --- a/src/c3nav/mapdata/render/renderer.py +++ b/src/c3nav/mapdata/render/renderer.py @@ -113,27 +113,27 @@ class MapRenderer: engine.add_geometry(hybrid_union(areas), fill=FillAttribs(color), category='ground_%s' % hexcolor, item=j) - # add obstacles after everything related to ground for the nice right order - for i, altitudearea in enumerate(geoms.altitudeareas): - for height, height_obstacles in altitudearea.obstacles.items(): - for color, color_obstacles in height_obstacles.items(): - for obstacle in color_obstacles: - if color: - fill_rgb = color_to_rgb(color) - stroke_color = rgb_to_color((*((0.75*i) for i in fill_rgb[:3]), fill_rgb[3])) - engine.add_geometry( - obstacle, - fill=FillAttribs(color), - stroke=StrokeAttribs(stroke_color, 0.05, min_px=0.2), - category='obstacles' - ) - else: - engine.add_geometry( - obstacle, - fill=FillAttribs(RENDER_COLOR_OBSTACLES_DEFAULT_FILL), - stroke=StrokeAttribs(RENDER_COLOR_OBSTACLES_DEFAULT_BORDER, 0.05, min_px=0.2), - category='obstacles' - ) + # add obstacles after everything related to ground for the nice right order + for i, altitudearea in enumerate(geoms.altitudeareas): + for height, height_obstacles in altitudearea.obstacles.items(): + for color, color_obstacles in height_obstacles.items(): + for obstacle in color_obstacles: + if color: + fill_rgb = color_to_rgb(color) + stroke_color = rgb_to_color((*((0.75*i) for i in fill_rgb[:3]), fill_rgb[3])) + engine.add_geometry( + obstacle, + fill=FillAttribs(color), + stroke=StrokeAttribs(stroke_color, 0.05, min_px=0.2), + category='obstacles' + ) + else: + engine.add_geometry( + obstacle, + fill=FillAttribs(RENDER_COLOR_OBSTACLES_DEFAULT_FILL), + stroke=StrokeAttribs(RENDER_COLOR_OBSTACLES_DEFAULT_BORDER, 0.05, min_px=0.2), + category='obstacles' + ) # add walls, stroke_px makes sure that all walls are at least 1px thick on all zoom levels, walls = None