3pp-mirror/map-machine
1
0
Fork 0
mirror of https://github.com/enzet/map-machine.git synced 2025-07-23 03:17:47 +02:00
Code Issues Projects Releases Packages Wiki Activity

Issue #121: fix colors.

Browse source
This commit is contained in:
Sergey Vartanov 2022-04-08 00:05:27 +03:00
parent 438500fe7f
commit 6d3180724b
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
map_machine/scheme.py
View file

@ -495,6 +495,7 @@ class Scheme:
main_icon: Optional[Icon] = None main_icon: Optional[Icon] = None
extra_icons: list[Icon] = [] extra_icons: list[Icon] = []
priority: int = 0 priority: int = 0
color: Optional[Color] = None
for index, matcher in enumerate(self.node_matchers): for index, matcher in enumerate(self.node_matchers):
if not matcher.replace_shapes and main_icon: if not matcher.replace_shapes and main_icon:
@ -535,12 +536,11 @@ class Scheme:
extra_icons += [Icon(specifications)] extra_icons += [Icon(specifications)]
processed |= matcher_tags processed |= matcher_tags
if matcher.set_main_color and main_icon: if matcher.set_main_color and main_icon:
main_icon.recolor(self.get_color(matcher.set_main_color)) color = self.get_color(matcher.set_main_color)
main_icon.recolor(color)
if matcher.set_opacity and main_icon: if matcher.set_opacity and main_icon:
main_icon.opacity = matcher.set_opacity main_icon.opacity = matcher.set_opacity
color: Optional[Color] = None
if "material" in tags: if "material" in tags:
value: str = tags["material"] value: str = tags["material"]
if value in self.material_colors: if value in self.material_colors:
@ -570,7 +570,7 @@ class Scheme:
if configuration.show_overlapped: if configuration.show_overlapped:
small_dot_spec: ShapeSpecification = ShapeSpecification( small_dot_spec: ShapeSpecification = ShapeSpecification(
extractor.get_shape(DEFAULT_SMALL_SHAPE_ID), extractor.get_shape(DEFAULT_SMALL_SHAPE_ID),
self.get_color("default"), color if color else self.get_color("default"),
) )
default_icon = Icon([small_dot_spec]) default_icon = Icon([small_dot_spec])