From d767e9303f2d18a71cc88b6b4cca9e1499509bff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= <skunk@xover.mud.at>
Date: Sat, 4 Aug 2018 03:59:17 +0200
Subject: [PATCH] * routes: improve popup display

---
 cycle_routes.json   | 10 +++++-----
 hiking_routes.json  | 10 +++++-----
 pt.json             |  8 ++++++--
 railway-routes.json |  6 +++---
 4 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/cycle_routes.json b/cycle_routes.json
index 44509f6..e2a8757 100644
--- a/cycle_routes.json
+++ b/cycle_routes.json
@@ -42,12 +42,12 @@
         "title": "",
         "body": [
             "<h4>Routes</h4>",
-            "<ul>",
+            "<ul class='overpass-layer-list'>",
             "{% for master in masters %}",
-            "  <li data-object=\"{{ master.id }}\" style='list-style: none;'>",
-            "    {{ markerLine({ width: 4, color: const[master.tags.network].color|default(const[''].color) })|raw }}",
-            "    {% 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 %}",
-            "    <i style='color: #707070'>{{ tagTrans('network', master.tags.network) }}</i>",
+            "  <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='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>",
             "  </li>",
             "{% endfor %}",
             "</ul>"
diff --git a/hiking_routes.json b/hiking_routes.json
index 964a701..929ffa9 100644
--- a/hiking_routes.json
+++ b/hiking_routes.json
@@ -41,12 +41,12 @@
         ],
         "body": [
             "<h4>Routes</h4>",
-            "<ul>",
+            "<ul class='overpass-layer-list'>",
             "{% for master in masters %}",
-            "  <li data-object=\"{{ master.id }}\" style='list-style: none;'>",
-            "    {{ markerLine({ width: 4, color: const[master.tags.network].color|default(const[''].color) })|raw }}",
-            "    {% 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 %}",
-            "    <i style='color: #707070'>{{ tagTrans('network', master.tags.network) }}</i>",
+            "  <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='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>",
             "  </li>",
             "{% endfor %}",
             "</ul>"
diff --git a/pt.json b/pt.json
index 65afdd6..509e0d3 100644
--- a/pt.json
+++ b/pt.json
@@ -137,10 +137,14 @@
         "listStopsDescription": "{{ refs|join(' ') }}",
         "body": [
             "<h4>Routes</h4>",
-            "<ul>",
+            "<ul class='overpass-layer-list'>",
             "{% for master in masters %}",
             "  {% if master.tags.public_transport != 'stop_area' %}",
-            "  <li data-object=\"{{ master.id }}\"><b>{{ master.tags.name|default(master.tags.ref) }}</li>",
+            "  <li data-object=\"{{ master.id }}\">",
+            "    <span class='markerParent'><div class='marker'>{{ markerLine({ width: 4, color: const[master.tags.route].color })|raw }}</div></span>",
+            "    <span class='title'>{{ master.tags.name|default(master.tags.ref) }}</a></span>",
+            "    <span class='description'>{{ tagTrans('route', master.tags.route) }}</span>",
+            "  </li>",
             "  {% endif %}",
             "{% endfor %}",
             "</ul>"
diff --git a/railway-routes.json b/railway-routes.json
index 39ac63c..c81f51f 100644
--- a/railway-routes.json
+++ b/railway-routes.json
@@ -36,9 +36,9 @@
             "{% for master in masters %}",
             "  {% set _color = '#' ~ master.tags.operator|default('')|md5|slice(0, 6) %}",
             "  <li data-object=\"{{ master.id }}\" style='list-style: none;'>",
-            "    {{ markerLine({ width: 4, color: _color })|raw }}",
-            "    {% 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 %}",
-            "    <i style='color: #707070'>{{ master.tags.operator }}</i>",
+            "    <span class='markerParent'><div class='marker'>{{ markerLine({ width: 4, color: _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'>{{ master.tags.operator }}</span>",
             "  </li>",
             "{% endfor %}",
             "</ul>"