From d58e496bd4c9ceee4019ff637a1cbc7d983aa2c2 Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Sat, 2 Sep 2023 21:49:29 +0300 Subject: [PATCH] Make shields prioritizable independently Signed-off-by: Konstantin Pastbin --- src/libkomwm.py | 24 ++++++++++++------------ src/mapcss/__init__.py | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/libkomwm.py b/src/libkomwm.py index c9381a4..adff65e 100644 --- a/src/libkomwm.py +++ b/src/libkomwm.py @@ -751,18 +751,18 @@ def komap_mapswithme(options): store_visibility(cl, 'line', st.get('object-id'), zoom) dr_element.lines.extend([dr_line]) - if st.get('shield-font-size'): - dr_element.shield.height = int(st.get('shield-font-size', 10)) - dr_element.shield.text_color = mwm_encode_color(colors, st, "shield-text") - if st.get('shield-text-halo-radius', 0) != 0: - dr_element.shield.text_stroke_color = mwm_encode_color(colors, st, "shield-text-halo", "white") - dr_element.shield.color = mwm_encode_color(colors, st, "shield") - if st.get('shield-outline-radius', 0) != 0: - dr_element.shield.stroke_color = mwm_encode_color(colors, st, "shield-outline", "white") - dr_element.shield.priority = get_drape_priority(cl, 'shield', st.get('object-id')) - store_visibility(cl, 'shield', st.get('object-id'), zoom) - if st.get('shield-min-distance', 0) != 0: - dr_element.shield.min_distance = int(st.get('shield-min-distance', 0)) + if st.get('shield-font-size'): + dr_element.shield.height = int(st.get('shield-font-size', 10)) + dr_element.shield.text_color = mwm_encode_color(colors, st, "shield-text") + if st.get('shield-text-halo-radius', 0) != 0: + dr_element.shield.text_stroke_color = mwm_encode_color(colors, st, "shield-text-halo", "white") + dr_element.shield.color = mwm_encode_color(colors, st, "shield") + if st.get('shield-outline-radius', 0) != 0: + dr_element.shield.stroke_color = mwm_encode_color(colors, st, "shield-outline", "white") + dr_element.shield.priority = get_drape_priority(cl, 'shield', st.get('object-id')) + store_visibility(cl, 'shield', st.get('object-id'), zoom) + if st.get('shield-min-distance', 0) != 0: + dr_element.shield.min_distance = int(st.get('shield-min-distance', 0)) if has_icons: if st.get('icon-image') and st.get('icon-image') != 'none': diff --git a/src/mapcss/__init__.py b/src/mapcss/__init__.py index 1a1368a..8af9730 100644 --- a/src/mapcss/__init__.py +++ b/src/mapcss/__init__.py @@ -23,7 +23,7 @@ from .Condition import Condition NEEDED_KEYS = set(["width", "casing-width", "casing-width-add", "fill-color", "fill-image", "icon-image", "text", "extrude", - "background-image", "background-color", "pattern-image", "shield-text", "symbol-shape"]) + "background-image", "background-color", "pattern-image", "shield-color", "symbol-shape"]) WHITESPACE = re.compile(r'\s+ ', re.S | re.X)