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

Refactor icon colors.

Browse source
This commit is contained in:
Sergey Vartanov 2022-04-08 01:27:13 +03:00
parent bd026c2c73
commit a082722b6d
3 changed files with 26 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

10
map_machine/scheme.py
View file

@ -410,6 +410,14 @@ class Scheme:
logging.debug(f"Unknown color `{color}`.") logging.debug(f"Unknown color `{color}`.")
return Color(self.colors["default"]) return Color(self.colors["default"])
def get_default_color(self) -> Color:
"""Get default color for a main icon."""
return self.get_color("default")
def get_extra_color(self) -> Color:
"""Get default color for an extra icon."""
return self.get_color("extra")
def get(self, variable_name: str): def get(self, variable_name: str):
""" """
FIXME: colors should be variables. FIXME: colors should be variables.
@ -529,7 +537,7 @@ class Scheme:
if matcher.add_shapes: if matcher.add_shapes:
specifications = [ specifications = [
self.get_shape_specification( self.get_shape_specification(
x, extractor, color=Color("#888888") x, extractor, color=self.get_extra_color()
) )
for x in matcher.add_shapes for x in matcher.add_shapes
] ]

1
map_machine/scheme/default.yml
View file

@ -3,6 +3,7 @@ colors:
# Entity # Entity
default: "#444444" default: "#444444"
extra: "#888888"
direction_view_color: "#C8E8FF" direction_view_color: "#C8E8FF"
direction_camera_color: "#0088FF" direction_camera_color: "#0088FF"

30
tests/test_icons.py
View file

@ -15,7 +15,9 @@ __email__ = "me@enzet.ru"
COLLECTION: IconCollection = IconCollection.from_scheme(SCHEME, SHAPE_EXTRACTOR) COLLECTION: IconCollection = IconCollection.from_scheme(SCHEME, SHAPE_EXTRACTOR)
DEFAULT_COLOR: Color = SCHEME.get_color("default") DEFAULT_COLOR: Color = SCHEME.get_default_color()
EXTRA_COLOR: Color = SCHEME.get_extra_color()
WHITE: Color = Color("white")
def test_grid() -> None: def test_grid() -> None:
@ -68,8 +70,8 @@ def test_no_icons_but_color() -> None:
def check_icon_set( def check_icon_set(
icon: IconSet, icon: IconSet,
main_specification: list[tuple[str, Optional[str]]], main_specification: list[tuple[str, Optional[Color]]],
extra_specifications: list[list[tuple[str, Optional[str]]]], extra_specifications: list[list[tuple[str, Optional[Color]]]],
) -> None: ) -> None:
"""Check icon set using simple specification.""" """Check icon set using simple specification."""
if not main_specification: if not main_specification:
@ -101,7 +103,7 @@ def test_icon() -> None:
icons. icons.
""" """
icon: IconSet = get_icon({"natural": "tree"}) icon: IconSet = get_icon({"natural": "tree"})
check_icon_set(icon, [("tree", "#98AC64")], []) check_icon_set(icon, [("tree", Color("#98AC64"))], [])
def test_icon_1_extra() -> None: def test_icon_1_extra() -> None:
@ -110,7 +112,7 @@ def test_icon_1_extra() -> None:
""" """
icon: IconSet = get_icon({"barrier": "gate", "access": "private"}) icon: IconSet = get_icon({"barrier": "gate", "access": "private"})
check_icon_set( check_icon_set(
icon, [("gate", "#444444")], [[("lock_with_keyhole", "#888888")]] icon, [("gate", DEFAULT_COLOR)], [[("lock_with_keyhole", EXTRA_COLOR)]]
) )
@ -123,10 +125,10 @@ def test_icon_2_extra() -> None:
) )
check_icon_set( check_icon_set(
icon, icon,
[("gate", "#444444")], [("gate", DEFAULT_COLOR)],
[ [
[("bicycle", "#888888")], [("bicycle", EXTRA_COLOR)],
[("lock_with_keyhole", "#888888")], [("lock_with_keyhole", EXTRA_COLOR)],
], ],
) )
@ -136,7 +138,7 @@ def test_no_icon_1_extra() -> None:
Tags that should be visualized with default main icon and single extra icon. Tags that should be visualized with default main icon and single extra icon.
""" """
icon: IconSet = get_icon({"access": "private"}) icon: IconSet = get_icon({"access": "private"})
check_icon_set(icon, [], [[("lock_with_keyhole", "#888888")]]) check_icon_set(icon, [], [[("lock_with_keyhole", EXTRA_COLOR)]])
def test_no_icon_2_extra() -> None: def test_no_icon_2_extra() -> None:
@ -148,8 +150,8 @@ def test_no_icon_2_extra() -> None:
icon, icon,
[], [],
[ [
[("bicycle", "#888888")], [("bicycle", EXTRA_COLOR)],
[("lock_with_keyhole", "#888888")], [("lock_with_keyhole", EXTRA_COLOR)],
], ],
) )
@ -162,9 +164,9 @@ def test_icon_regex() -> None:
check_icon_set( check_icon_set(
icon, icon,
[ [
("circle_11", "#444444"), ("circle_11", DEFAULT_COLOR),
("digit_4", "#FFFFFF"), ("digit_4", WHITE),
("digit_2", "#FFFFFF"), ("digit_2", WHITE),
], ],
[], [],
) )