2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

fix wrong indentation from f85bcc1

Browse source
This commit is contained in:
Gwendolyn 2023-12-14 20:07:25 +01:00
parent f41fe3dcc0
commit 7bc75e4207
1 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/c3nav/mapdata/render/renderer.py
View file

@ -113,27 +113,27 @@ class MapRenderer:
engine.add_geometry(hybrid_union(areas), fill=FillAttribs(color), engine.add_geometry(hybrid_union(areas), fill=FillAttribs(color),
category='ground_%s' % hexcolor, item=j) category='ground_%s' % hexcolor, item=j)
# add obstacles after everything related to ground for the nice right order # add obstacles after everything related to ground for the nice right order
for i, altitudearea in enumerate(geoms.altitudeareas): for i, altitudearea in enumerate(geoms.altitudeareas):
for height, height_obstacles in altitudearea.obstacles.items(): for height, height_obstacles in altitudearea.obstacles.items():
for color, color_obstacles in height_obstacles.items(): for color, color_obstacles in height_obstacles.items():
for obstacle in color_obstacles: for obstacle in color_obstacles:
if color: if color:
fill_rgb = color_to_rgb(color) fill_rgb = color_to_rgb(color)
stroke_color = rgb_to_color((*((0.75*i) for i in fill_rgb[:3]), fill_rgb[3])) stroke_color = rgb_to_color((*((0.75*i) for i in fill_rgb[:3]), fill_rgb[3]))
engine.add_geometry( engine.add_geometry(
obstacle, obstacle,
fill=FillAttribs(color), fill=FillAttribs(color),
stroke=StrokeAttribs(stroke_color, 0.05, min_px=0.2), stroke=StrokeAttribs(stroke_color, 0.05, min_px=0.2),
category='obstacles' category='obstacles'
) )
else: else:
engine.add_geometry( engine.add_geometry(
obstacle, obstacle,
fill=FillAttribs(RENDER_COLOR_OBSTACLES_DEFAULT_FILL), fill=FillAttribs(RENDER_COLOR_OBSTACLES_DEFAULT_FILL),
stroke=StrokeAttribs(RENDER_COLOR_OBSTACLES_DEFAULT_BORDER, 0.05, min_px=0.2), stroke=StrokeAttribs(RENDER_COLOR_OBSTACLES_DEFAULT_BORDER, 0.05, min_px=0.2),
category='obstacles' category='obstacles'
) )
# add walls, stroke_px makes sure that all walls are at least 1px thick on all zoom levels, # add walls, stroke_px makes sure that all walls are at least 1px thick on all zoom levels,
walls = None walls = None