Browse Source

cycle_routes, hiking_routes: handle network tags with ';' on member ways

bug-43
parent
commit
169a50beee
  1. 16
      cycle_routes.json
  2. 16
      hiking_routes.json

16
cycle_routes.json

@ -46,10 +46,14 @@
"{% set selected = false %}", "{% set selected = false %}",
"", "",
"{% for master in masters %}", "{% for master in masters %}",
" {% set _p = const[master.tags.network].priority|default(4) %}",
" {% set masterNetwork = '' %}",
" {% for n in master.tags.network|split(';') %}",
" {% if n|matches('cn$') %}{% set masterNetwork = n %}{% endif %}",
" {% endfor %}",
" {% set _p = const[masterNetwork].priority|default(4) %}",
" {% if _p < priority %}", " {% if _p < priority %}",
" {% set priority = _p %}", " {% set priority = _p %}",
" {% set network = master.tags.network %}",
" {% set network = masterNetwork %}",
" {% endif %}", " {% endif %}",
" {% if master.tags.ref %}", " {% if master.tags.ref %}",
" {% set refs = refs|merge([ master.tags.ref ]) %}", " {% set refs = refs|merge([ master.tags.ref ]) %}",
@ -67,10 +71,14 @@
"<h4>Routes</h4>", "<h4>Routes</h4>",
"<ul class='overpass-layer-list'>", "<ul class='overpass-layer-list'>",
"{% for master in masters %}", "{% for master in masters %}",
" {% set masterNetwork = '' %}",
" {% for n in master.tags.network|split(';') %}",
" {% if n|matches('cn$') %}{% set masterNetwork = n %}{% endif %}",
" {% endfor %}",
" <li data-object=\"{{ master.id }}\">", " <li data-object=\"{{ master.id }}\">",
" <span class='markerParent'><div class='marker'>{{ markerLine({ width: 4, color: const[master.tags.network].color|default(const[''].color) })|raw }}</div></span>",
" <span class='markerParent'><div class='marker'>{{ markerLine({ width: 4, color: const[masterNetwork].color|default(const[''].color) })|raw }}</div></span>",
" <span class='title'>{% if master.tags.ref and master.tags.name %}{{ master.tags.ref }} - {{ master.tags.name|default(master.tags.ref) }}{% elseif master.tags.ref %}{{ master.tags.ref }}{% elseif master.tags.name %}{{ master.tags.name }}{% else %}{{ trans('unnamed') }}{% endif %}</span>", " <span class='title'>{% if master.tags.ref and master.tags.name %}{{ master.tags.ref }} - {{ master.tags.name|default(master.tags.ref) }}{% elseif master.tags.ref %}{{ master.tags.ref }}{% elseif master.tags.name %}{{ master.tags.name }}{% else %}{{ trans('unnamed') }}{% endif %}</span>",
" <span class='description'>{{ tagTrans('network', master.tags.network) }}</span>",
" <span class='description'>{{ tagTrans('network', masterNetwork) }}</span>",
" </li>", " </li>",
"{% endfor %}", "{% endfor %}",
"</ul>" "</ul>"

16
hiking_routes.json

@ -36,10 +36,14 @@
"{% set refs = [] %}", "{% set refs = [] %}",
"", "",
"{% for master in masters %}", "{% for master in masters %}",
" {% set _p = const[master.tags.network].priority|default(4) %}",
" {% set masterNetwork = '' %}",
" {% for n in master.tags.network|split(';') %}",
" {% if n|matches('wn$') %}{% set masterNetwork = n %}{% endif %}",
" {% endfor %}",
" {% set _p = const[masterNetwork].priority|default(4) %}",
" {% if _p < priority %}", " {% if _p < priority %}",
" {% set priority = _p %}", " {% set priority = _p %}",
" {% set network = master.tags.network %}",
" {% set network = masterNetwork %}",
" {% endif %}", " {% endif %}",
" {% if master.tags.ref %}", " {% if master.tags.ref %}",
" {% set refs = refs|merge([ master.tags.ref ]) %}", " {% set refs = refs|merge([ master.tags.ref ]) %}",
@ -50,10 +54,14 @@
"<h4>Routes</h4>", "<h4>Routes</h4>",
"<ul class='overpass-layer-list'>", "<ul class='overpass-layer-list'>",
"{% for master in masters %}", "{% for master in masters %}",
" {% set masterNetwork = '' %}",
" {% for n in master.tags.network|split(';') %}",
" {% if n|matches('wn$') %}{% set masterNetwork = n %}{% endif %}",
" {% endfor %}",
" <li data-object=\"{{ master.id }}\">", " <li data-object=\"{{ master.id }}\">",
" <span class='markerParent'><div class='marker'>{{ markerLine({ width: 4, color: const[master.tags.network].color|default(const[''].color) })|raw }}</div></span>",
" <span class='markerParent'><div class='marker'>{{ markerLine({ width: 4, color: const[masterNetwork].color|default(const[''].color) })|raw }}</div></span>",
" <span class='title'>{% if master.tags.ref and master.tags.name %}{{ master.tags.ref }} - {{ master.tags.name|default(master.tags.ref) }}{% elseif master.tags.ref %}{{ master.tags.ref }}{% elseif master.tags.name %}{{ master.tags.name }}{% endif %}</span>", " <span class='title'>{% if master.tags.ref and master.tags.name %}{{ master.tags.ref }} - {{ master.tags.name|default(master.tags.ref) }}{% elseif master.tags.ref %}{{ master.tags.ref }}{% elseif master.tags.name %}{{ master.tags.name }}{% endif %}</span>",
" <span class='description'>{{ tagTrans('network', master.tags.network) }}</span>",
" <span class='description'>{{ tagTrans('network', masterNetwork) }}</span>",
" </li>", " </li>",
"{% endfor %}", "{% endfor %}",
"</ul>" "</ul>"

Loading…
Cancel
Save