From ce31055d74c7b18f39829e2e0f0991d14d379ed5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= <skunk@xover.mud.at>
Date: Sat, 21 Aug 2021 10:19:36 +0200
Subject: [PATCH] cycle_routes, hiking_routes: format list of routes in member
way popups
---
cycle_routes.json | 12 ++++++++----
hiking_routes.json | 14 +++++++++-----
2 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/cycle_routes.json b/cycle_routes.json
index 68a8b96..836fa7a 100644
--- a/cycle_routes.json
+++ b/cycle_routes.json
@@ -75,10 +75,14 @@
" {% for n in master.tags.network|split(';') %}",
" {% if n|matches('cn$') %}{% set masterNetwork = n %}{% endif %}",
" {% 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 }}{% else %}{{ trans('unnamed') }}{% endif %}</span>",
- " <span class='description'>{{ tagTrans('network', masterNetwork) }}</span>",
+ " <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 }}{% else %}{{ trans('unnamed') }}{% endif %}</div>",
+ " </div>",
" </li>",
"{% endfor %}",
"</ul>"
diff --git a/hiking_routes.json b/hiking_routes.json
index a31378b..3ba0c5f 100644
--- a/hiking_routes.json
+++ b/hiking_routes.json
@@ -58,11 +58,15 @@
" {% for n in master.tags.network|split(';') %}",
" {% if n|matches('wn$') %}{% set masterNetwork = n %}{% endif %}",
" {% 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 %}",
"</ul>"
],