naveenmtp
/
public_transport
forked from OpenStreetBrowser/main
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' into bug-43

bug-43
Stephan Bösch-Plepelits 3 years ago
parent
471cb178aa 7f2990959c
commit
d60bf3df17
2 changed files with 10 additions and 8 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. 4
      cycle_routes.json
  2. 14
      hiking_routes.json

4
cycle_routes.json
View File

@ -75,8 +75,7 @@
" {% for n in master.tags.network|split(';') %}", " {% for n in master.tags.network|split(';') %}",
" {% if n|matches('cn$') %}{% set masterNetwork = n %}{% endif %}", " {% if n|matches('cn$') %}{% set masterNetwork = n %}{% endif %}",
" {% endfor %}", " {% endfor %}",
" <li data-object=\"{{ master.id }}\">",
" <a>",
" <li data-object=\"{{ master.id }}\"><a>",
" <div class='marker'>", " <div class='marker'>",
" <div class='symbol'>{{ markerLine({ width: 4, color: const[masterNetwork].color|default(const[''].color) })|raw }}</div>", " <div class='symbol'>{{ markerLine({ width: 4, color: const[masterNetwork].color|default(const[''].color) })|raw }}</div>",
" </div>", " </div>",
@ -84,7 +83,6 @@
" <div class='description'>{{ tagTrans('network', masterNetwork) }}</div>", " <div class='description'>{{ tagTrans('network', masterNetwork) }}</div>",
" <div 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 %}</div>", " <div 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 %}</div>",
" </div>", " </div>",
" </a>",
" </li>", " </li>",
"{% endfor %}", "{% endfor %}",
"</ul>" "</ul>"

14
hiking_routes.json
View File

@ -58,11 +58,15 @@
" {% for n in master.tags.network|split(';') %}", " {% for n in master.tags.network|split(';') %}",
" {% if n|matches('wn$') %}{% set masterNetwork = n %}{% endif %}", " {% if n|matches('wn$') %}{% set masterNetwork = n %}{% endif %}",
" {% endfor %}", " {% endfor %}",
" <li data-object=\"{{ master.id }}\">",
" <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='description'>{{ tagTrans('network', masterNetwork) }}</span>",
" </li>",
" <li data-object=\"{{ master.id }}\"><a>",
" <div class='marker'>",
" <div class='symbol'>{{ markerLine({ width: 4, color: const[masterNetwork].color|default(const[''].color) })|raw }}</div>",
" </div>",
" <div class='content'>",
" <div class='description'>{{ tagTrans('network', masterNetwork) }}</div>",
" <div 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 %}</div>",
" </div>",
" </a></li>",
"{% endfor %}", "{% endfor %}",
"</ul>" "</ul>"
], ],

Write Preview
Loading…
Cancel
Save