organicmaps/kothic
13
Fork 0
Code Issues Pull requests 2 Projects Releases Wiki Activity Actions

Make shields prioritizable independently

Browse source 
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
This commit is contained in:
Konstantin Pastbin 2023-09-02 21:49:29 +03:00 • committed by Viktor Govako
parent 432e0b0d67
commit d58e496bd4
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/libkomwm.py
View file

@ -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':

2
src/mapcss/__init__.py
View file

@ -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)