3pp-mirror/map-machine
1
0
Fork 0
mirror of https://github.com/enzet/map-machine.git synced 2025-08-06 10:09:52 +02:00
Code Issues Projects Releases Packages Wiki Activity

Issue #121: fix hidden icons.

Browse source 
Dots for hidden icons should not affect normally drawn icons.
This commit is contained in:
Sergey Vartanov 2022-04-07 23:44:55 +03:00
parent ff6f8aa705
commit 438500fe7f
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
map_machine/pictogram/point.py
View file

@ -157,10 +157,12 @@ class Point(Tagged):
position: np.ndarray = np.array((int(position[0]), int(position[1]))) position: np.ndarray = np.array((int(position[0]), int(position[1])))
icon_to_draw: Icon = icon icon_to_draw: Icon = icon
is_painted: bool = True
if occupied and occupied.check(position): if occupied and occupied.check(position):
if default_icon: if default_icon:
icon_to_draw = default_icon icon_to_draw = default_icon
is_painted = False
else: else:
return False return False
@ -169,7 +171,7 @@ class Point(Tagged):
icon_to_draw.draw(svg, position, tags=tags) icon_to_draw.draw(svg, position, tags=tags)
if occupied: if occupied and is_painted:
overlap: int = occupied.overlap overlap: int = occupied.overlap
for i in range(-overlap, overlap): for i in range(-overlap, overlap):
for j in range(-overlap, overlap): for j in range(-overlap, overlap):
@ -177,7 +179,7 @@ class Point(Tagged):
np.array((position[0] + i, position[1] + j)) np.array((position[0] + i, position[1] + j))
) )
return True return is_painted
def draw_texts( def draw_texts(
self, self,