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

Merge main.

Browse source
This commit is contained in:
Sergey Vartanov 2021-09-24 06:38:06 +03:00
commit a7b3c707cf
12 changed files with 378 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

8
map_machine/scheme.py
View file

@ -407,9 +407,7 @@ class Scheme:
extra_icons: List[Icon] = []
priority: int = 0
index: int = 0
for matcher in self.node_matchers:
for index, matcher in enumerate(self.node_matchers):
if not matcher.replace_shapes and main_icon:
continue
if not matcher.is_matched(tags, configuration):
@ -449,8 +447,6 @@ class Scheme:
if matcher.set_opacity and main_icon:
main_icon.opacity = matcher.set_opacity
index += 1
color: Optional[Color] = None
if "material" in tags:
@ -464,7 +460,7 @@ class Scheme:
color = self.get_color(tags[tag_key])
processed.add(tag_key)
for color_tag_key in ["color", "colour"]:
for color_tag_key in ["colour", "color", "building:colour"]:
if color_tag_key in tags:
color = self.get_color(tags[color_tag_key])
processed.add(color_tag_key)