plepe
/
test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

Lanes: fix order of backward turn lanes

name-etym
Stephan Bösch-Plepelits 5 years ago
parent
549dcf480c
commit
be1b027a1e
3 changed files with 15 additions and 15 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      lanes-sign.template
  2. 26
      lanes.json
  3. 2
      lanes.template

2
lanes-sign.template
View File

@ -8,7 +8,7 @@
"pattern0-path-color": "white", "pattern0-path-color": "white",
"pattern0-path-width": "0.3m", "pattern0-path-width": "0.3m",
"pattern0-lineOffset": "{{ lanes_width / -2 + @ * 3 - 1.5 }}m", "pattern0-lineOffset": "{{ lanes_width / -2 + @ * 3 - 1.5 }}m",
"patternThrough": "{% if 'through' in lane_turn %}arrowHead{% endif %}",
"patternThrough": "{% if 'through' in lane_turn or 'none' in lane_turn or '' in lane_turn %}arrowHead{% endif %}",
"patternThrough-repeat": "30m", "patternThrough-repeat": "30m",
"patternThrough-offset": "{{ lane_forward ? '17m' : '12m' }}", "patternThrough-offset": "{{ lane_forward ? '17m' : '12m' }}",
"patternThrough-polygon": "true", "patternThrough-polygon": "true",

26
lanes.json
View File

@ -33,7 +33,7 @@
"{% set forward_lanes = attribute(tags, 'lanes:forward')|default(oneway ? lanes : lanes // 2) %}", "{% set forward_lanes = attribute(tags, 'lanes:forward')|default(oneway ? lanes : lanes // 2) %}",
"{% set backward_lanes = attribute(tags, 'lanes:backward')|default(oneway ? 0 : lanes // 2) %}", "{% set backward_lanes = attribute(tags, 'lanes:backward')|default(oneway ? 0 : lanes // 2) %}",
"{% if attribute(tags, 'turn:lanes:backward') %}", "{% if attribute(tags, 'turn:lanes:backward') %}",
" {% set turn_lanes_backward = attribute(tags, 'turn:lanes:backward')|split('|') %}",
" {% set turn_lanes_backward = attribute(tags, 'turn:lanes:backward')|split('|')|reverse %}",
"{% else %}", "{% else %}",
" {% set turn_lanes_backward = ['through','through','through','through','through','through','through','through','through','through','through','through']|slice(0, backward_lanes) %}", " {% set turn_lanes_backward = ['through','through','through','through','through','through','through','through','through','through','through','through']|slice(0, backward_lanes) %}",
"{% endif %}", "{% endif %}",
@ -306,7 +306,7 @@
"pattern0-path-color": "white", "pattern0-path-color": "white",
"pattern0-path-width": "0.3m", "pattern0-path-width": "0.3m",
"pattern0-lineOffset": "{{ lanes_width / -2 + 1 * 3 - 1.5 }}m", "pattern0-lineOffset": "{{ lanes_width / -2 + 1 * 3 - 1.5 }}m",
"patternThrough": "{% if 'through' in lane_turn %}arrowHead{% endif %}",
"patternThrough": "{% if 'through' in lane_turn or 'none' in lane_turn or '' in lane_turn %}arrowHead{% endif %}",
"patternThrough-repeat": "30m", "patternThrough-repeat": "30m",
"patternThrough-offset": "{{ lane_forward ? '17m' : '12m' }}", "patternThrough-offset": "{{ lane_forward ? '17m' : '12m' }}",
"patternThrough-polygon": "true", "patternThrough-polygon": "true",
@ -367,7 +367,7 @@
"pattern0-path-color": "white", "pattern0-path-color": "white",
"pattern0-path-width": "0.3m", "pattern0-path-width": "0.3m",
"pattern0-lineOffset": "{{ lanes_width / -2 + 2 * 3 - 1.5 }}m", "pattern0-lineOffset": "{{ lanes_width / -2 + 2 * 3 - 1.5 }}m",
"patternThrough": "{% if 'through' in lane_turn %}arrowHead{% endif %}",
"patternThrough": "{% if 'through' in lane_turn or 'none' in lane_turn or '' in lane_turn %}arrowHead{% endif %}",
"patternThrough-repeat": "30m", "patternThrough-repeat": "30m",
"patternThrough-offset": "{{ lane_forward ? '17m' : '12m' }}", "patternThrough-offset": "{{ lane_forward ? '17m' : '12m' }}",
"patternThrough-polygon": "true", "patternThrough-polygon": "true",
@ -428,7 +428,7 @@
"pattern0-path-color": "white", "pattern0-path-color": "white",
"pattern0-path-width": "0.3m", "pattern0-path-width": "0.3m",
"pattern0-lineOffset": "{{ lanes_width / -2 + 3 * 3 - 1.5 }}m", "pattern0-lineOffset": "{{ lanes_width / -2 + 3 * 3 - 1.5 }}m",
"patternThrough": "{% if 'through' in lane_turn %}arrowHead{% endif %}",
"patternThrough": "{% if 'through' in lane_turn or 'none' in lane_turn or '' in lane_turn %}arrowHead{% endif %}",
"patternThrough-repeat": "30m", "patternThrough-repeat": "30m",
"patternThrough-offset": "{{ lane_forward ? '17m' : '12m' }}", "patternThrough-offset": "{{ lane_forward ? '17m' : '12m' }}",
"patternThrough-polygon": "true", "patternThrough-polygon": "true",
@ -489,7 +489,7 @@
"pattern0-path-color": "white", "pattern0-path-color": "white",
"pattern0-path-width": "0.3m", "pattern0-path-width": "0.3m",
"pattern0-lineOffset": "{{ lanes_width / -2 + 4 * 3 - 1.5 }}m", "pattern0-lineOffset": "{{ lanes_width / -2 + 4 * 3 - 1.5 }}m",
"patternThrough": "{% if 'through' in lane_turn %}arrowHead{% endif %}",
"patternThrough": "{% if 'through' in lane_turn or 'none' in lane_turn or '' in lane_turn %}arrowHead{% endif %}",
"patternThrough-repeat": "30m", "patternThrough-repeat": "30m",
"patternThrough-offset": "{{ lane_forward ? '17m' : '12m' }}", "patternThrough-offset": "{{ lane_forward ? '17m' : '12m' }}",
"patternThrough-polygon": "true", "patternThrough-polygon": "true",
@ -550,7 +550,7 @@
"pattern0-path-color": "white", "pattern0-path-color": "white",
"pattern0-path-width": "0.3m", "pattern0-path-width": "0.3m",
"pattern0-lineOffset": "{{ lanes_width / -2 + 5 * 3 - 1.5 }}m", "pattern0-lineOffset": "{{ lanes_width / -2 + 5 * 3 - 1.5 }}m",
"patternThrough": "{% if 'through' in lane_turn %}arrowHead{% endif %}",
"patternThrough": "{% if 'through' in lane_turn or 'none' in lane_turn or '' in lane_turn %}arrowHead{% endif %}",
"patternThrough-repeat": "30m", "patternThrough-repeat": "30m",
"patternThrough-offset": "{{ lane_forward ? '17m' : '12m' }}", "patternThrough-offset": "{{ lane_forward ? '17m' : '12m' }}",
"patternThrough-polygon": "true", "patternThrough-polygon": "true",
@ -611,7 +611,7 @@
"pattern0-path-color": "white", "pattern0-path-color": "white",
"pattern0-path-width": "0.3m", "pattern0-path-width": "0.3m",
"pattern0-lineOffset": "{{ lanes_width / -2 + 6 * 3 - 1.5 }}m", "pattern0-lineOffset": "{{ lanes_width / -2 + 6 * 3 - 1.5 }}m",
"patternThrough": "{% if 'through' in lane_turn %}arrowHead{% endif %}",
"patternThrough": "{% if 'through' in lane_turn or 'none' in lane_turn or '' in lane_turn %}arrowHead{% endif %}",
"patternThrough-repeat": "30m", "patternThrough-repeat": "30m",
"patternThrough-offset": "{{ lane_forward ? '17m' : '12m' }}", "patternThrough-offset": "{{ lane_forward ? '17m' : '12m' }}",
"patternThrough-polygon": "true", "patternThrough-polygon": "true",
@ -672,7 +672,7 @@
"pattern0-path-color": "white", "pattern0-path-color": "white",
"pattern0-path-width": "0.3m", "pattern0-path-width": "0.3m",
"pattern0-lineOffset": "{{ lanes_width / -2 + 7 * 3 - 1.5 }}m", "pattern0-lineOffset": "{{ lanes_width / -2 + 7 * 3 - 1.5 }}m",
"patternThrough": "{% if 'through' in lane_turn %}arrowHead{% endif %}",
"patternThrough": "{% if 'through' in lane_turn or 'none' in lane_turn or '' in lane_turn %}arrowHead{% endif %}",
"patternThrough-repeat": "30m", "patternThrough-repeat": "30m",
"patternThrough-offset": "{{ lane_forward ? '17m' : '12m' }}", "patternThrough-offset": "{{ lane_forward ? '17m' : '12m' }}",
"patternThrough-polygon": "true", "patternThrough-polygon": "true",
@ -733,7 +733,7 @@
"pattern0-path-color": "white", "pattern0-path-color": "white",
"pattern0-path-width": "0.3m", "pattern0-path-width": "0.3m",
"pattern0-lineOffset": "{{ lanes_width / -2 + 8 * 3 - 1.5 }}m", "pattern0-lineOffset": "{{ lanes_width / -2 + 8 * 3 - 1.5 }}m",
"patternThrough": "{% if 'through' in lane_turn %}arrowHead{% endif %}",
"patternThrough": "{% if 'through' in lane_turn or 'none' in lane_turn or '' in lane_turn %}arrowHead{% endif %}",
"patternThrough-repeat": "30m", "patternThrough-repeat": "30m",
"patternThrough-offset": "{{ lane_forward ? '17m' : '12m' }}", "patternThrough-offset": "{{ lane_forward ? '17m' : '12m' }}",
"patternThrough-polygon": "true", "patternThrough-polygon": "true",
@ -794,7 +794,7 @@
"pattern0-path-color": "white", "pattern0-path-color": "white",
"pattern0-path-width": "0.3m", "pattern0-path-width": "0.3m",
"pattern0-lineOffset": "{{ lanes_width / -2 + 9 * 3 - 1.5 }}m", "pattern0-lineOffset": "{{ lanes_width / -2 + 9 * 3 - 1.5 }}m",
"patternThrough": "{% if 'through' in lane_turn %}arrowHead{% endif %}",
"patternThrough": "{% if 'through' in lane_turn or 'none' in lane_turn or '' in lane_turn %}arrowHead{% endif %}",
"patternThrough-repeat": "30m", "patternThrough-repeat": "30m",
"patternThrough-offset": "{{ lane_forward ? '17m' : '12m' }}", "patternThrough-offset": "{{ lane_forward ? '17m' : '12m' }}",
"patternThrough-polygon": "true", "patternThrough-polygon": "true",
@ -855,7 +855,7 @@
"pattern0-path-color": "white", "pattern0-path-color": "white",
"pattern0-path-width": "0.3m", "pattern0-path-width": "0.3m",
"pattern0-lineOffset": "{{ lanes_width / -2 + 10 * 3 - 1.5 }}m", "pattern0-lineOffset": "{{ lanes_width / -2 + 10 * 3 - 1.5 }}m",
"patternThrough": "{% if 'through' in lane_turn %}arrowHead{% endif %}",
"patternThrough": "{% if 'through' in lane_turn or 'none' in lane_turn or '' in lane_turn %}arrowHead{% endif %}",
"patternThrough-repeat": "30m", "patternThrough-repeat": "30m",
"patternThrough-offset": "{{ lane_forward ? '17m' : '12m' }}", "patternThrough-offset": "{{ lane_forward ? '17m' : '12m' }}",
"patternThrough-polygon": "true", "patternThrough-polygon": "true",
@ -916,7 +916,7 @@
"pattern0-path-color": "white", "pattern0-path-color": "white",
"pattern0-path-width": "0.3m", "pattern0-path-width": "0.3m",
"pattern0-lineOffset": "{{ lanes_width / -2 + 11 * 3 - 1.5 }}m", "pattern0-lineOffset": "{{ lanes_width / -2 + 11 * 3 - 1.5 }}m",
"patternThrough": "{% if 'through' in lane_turn %}arrowHead{% endif %}",
"patternThrough": "{% if 'through' in lane_turn or 'none' in lane_turn or '' in lane_turn %}arrowHead{% endif %}",
"patternThrough-repeat": "30m", "patternThrough-repeat": "30m",
"patternThrough-offset": "{{ lane_forward ? '17m' : '12m' }}", "patternThrough-offset": "{{ lane_forward ? '17m' : '12m' }}",
"patternThrough-polygon": "true", "patternThrough-polygon": "true",
@ -977,7 +977,7 @@
"pattern0-path-color": "white", "pattern0-path-color": "white",
"pattern0-path-width": "0.3m", "pattern0-path-width": "0.3m",
"pattern0-lineOffset": "{{ lanes_width / -2 + 12 * 3 - 1.5 }}m", "pattern0-lineOffset": "{{ lanes_width / -2 + 12 * 3 - 1.5 }}m",
"patternThrough": "{% if 'through' in lane_turn %}arrowHead{% endif %}",
"patternThrough": "{% if 'through' in lane_turn or 'none' in lane_turn or '' in lane_turn %}arrowHead{% endif %}",
"patternThrough-repeat": "30m", "patternThrough-repeat": "30m",
"patternThrough-offset": "{{ lane_forward ? '17m' : '12m' }}", "patternThrough-offset": "{{ lane_forward ? '17m' : '12m' }}",
"patternThrough-polygon": "true", "patternThrough-polygon": "true",

2
lanes.template
View File

@ -33,7 +33,7 @@
"{% set forward_lanes = attribute(tags, 'lanes:forward')|default(oneway ? lanes : lanes // 2) %}", "{% set forward_lanes = attribute(tags, 'lanes:forward')|default(oneway ? lanes : lanes // 2) %}",
"{% set backward_lanes = attribute(tags, 'lanes:backward')|default(oneway ? 0 : lanes // 2) %}", "{% set backward_lanes = attribute(tags, 'lanes:backward')|default(oneway ? 0 : lanes // 2) %}",
"{% if attribute(tags, 'turn:lanes:backward') %}", "{% if attribute(tags, 'turn:lanes:backward') %}",
" {% set turn_lanes_backward = attribute(tags, 'turn:lanes:backward')|split('|') %}",
" {% set turn_lanes_backward = attribute(tags, 'turn:lanes:backward')|split('|')|reverse %}",
"{% else %}", "{% else %}",
" {% set turn_lanes_backward = ['through','through','through','through','through','through','through','through','through','through','through','through']|slice(0, backward_lanes) %}", " {% set turn_lanes_backward = ['through','through','through','through','through','through','through','through','through','through','through','through']|slice(0, backward_lanes) %}",
"{% endif %}", "{% endif %}",

Write Preview
Loading…
Cancel
Save