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

Added strict checking of casing necessity

Browse source
This commit is contained in:
r.kuznetsov 2017-02-14 12:34:38 +03:00
parent 8312fed1e7
commit c5bda708d1
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/libkomwm.py
View file

@ -330,7 +330,7 @@ def komap_mapswithme(options):
st['z-index'] = float(st.get('z-index', 0)) - 15001.
if st.get('casing-width') not in (None, 0): # and (st.get('width') or st.get('fill-color')):
if st.get('casing-linecap', 'butt') == 'butt':
if has_lines and st.get('casing-linecap', 'butt') == 'butt':
dr_line = LineRuleProto()
dr_line.width = (st.get('width', 0) * WIDTH_SCALE) + (st.get('casing-width') * WIDTH_SCALE * 2)
dr_line.color = mwm_encode_color(colors, st, "casing")
@ -345,7 +345,7 @@ def komap_mapswithme(options):
dr_line.join = dr_linejoins.get(st.get('casing-linejoin', 'round'), ROUNDJOIN)
dr_element.lines.extend([dr_line])
if ('fill-color' in st) and (float(st.get('fill-opacity', 1)) > 0):
if has_fills and 'fill-color' in st and float(st.get('fill-opacity', 1)) > 0:
dr_element.area.border.color = mwm_encode_color(colors, st, "casing")
dr_element.area.border.width = st.get('casing-width', 0) * WIDTH_SCALE