diff --git a/doc/grid.png b/doc/grid.png index e59e29e..994c4a7 100644 Binary files a/doc/grid.png and b/doc/grid.png differ diff --git a/roentgen.py b/roentgen.py index 55ea436..c45806a 100644 --- a/roentgen.py +++ b/roentgen.py @@ -127,7 +127,7 @@ def draw_element(target: str, tags_description: str): comma, key from value is separated by equals sign. """ tags = dict([x.split("=") for x in tags_description.split(",")]) - scheme = Scheme("data/tags.yml") + scheme = Scheme("scheme/default.yml") icon_extractor = IconExtractor("icons/icons.svg") icon, priority = scheme.get_icon(icon_extractor, tags) is_for_node: bool = target == "node" diff --git a/roentgen/grid.py b/roentgen/grid.py index 3aac1d9..6a96cbe 100644 --- a/roentgen/grid.py +++ b/roentgen/grid.py @@ -27,7 +27,7 @@ def draw_all_icons( :param columns: the number of columns in grid :param step: horizontal and vertical distance between icons """ - tags_file_name: str = "data/tags.yml" + tags_file_name: str = "scheme/default.yml" scheme: Scheme = Scheme(tags_file_name) to_draw: List[Set[str]] = [] diff --git a/roentgen/mapper.py b/roentgen/mapper.py index f8d911d..28e5488 100644 --- a/roentgen/mapper.py +++ b/roentgen/mapper.py @@ -22,7 +22,7 @@ from roentgen.point import Occupied, Point from roentgen.scheme import Scheme ICONS_FILE_NAME: str = "icons/icons.svg" -TAGS_FILE_NAME: str = "data/tags.yml" +TAGS_FILE_NAME: str = "scheme/default.yml" MISSING_TAGS_FILE_NAME: str = "missing_tags.yml" AUTHOR_MODE = "user-coloring" diff --git a/data/tags.yml b/scheme/default.yml similarity index 100% rename from data/tags.yml rename to scheme/default.yml diff --git a/test/test_icons.py b/test/test_icons.py index 558e83b..f3611b7 100644 --- a/test/test_icons.py +++ b/test/test_icons.py @@ -16,7 +16,7 @@ def test_icons() -> None: def get_icon(tags: Dict[str, str]): - scheme = Scheme("data/tags.yml") + scheme = Scheme("scheme/default.yml") icon_extractor = IconExtractor("icons/icons.svg") icon, _ = scheme.get_icon(icon_extractor, tags) return icon diff --git a/test/test_text.py b/test/test_text.py index d36f5af..b811f7f 100644 --- a/test/test_text.py +++ b/test/test_text.py @@ -5,7 +5,7 @@ from roentgen.scheme import Scheme def get_text(tags): - scheme = Scheme("data/tags.yml") + scheme = Scheme("scheme/default.yml") return scheme.construct_text(tags, True)