From f875570c4732942b28ac8ed785ee97164d50ca13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= <skunk@xover.mud.at>
Date: Sun, 14 Jul 2024 08:17:27 +0200
Subject: [PATCH] cycleway_width: improve popup body

---
 cycleway_width.yaml | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/cycleway_width.yaml b/cycleway_width.yaml
index 1a66141..bf05bea 100644
--- a/cycleway_width.yaml
+++ b/cycleway_width.yaml
@@ -185,20 +185,26 @@ feature:
     {% endif %}
 
     {% if leftCycle %}
-    <li>
-      {{ keyTrans('cycleway:left:width') }}:
-      {% if not leftWidth %}
-        {{ trans('unknown') }}
-      {% elseif attribute(tags, 'cycleway:left:width')|default(attribute(tags, 'cycleway:both:width')) matches "/(m|')$/" %}
-        {{ attribute(tags, 'cycleway:left:width')|default(attribute(tags, 'cycleway:both:width')) }}
-      {% else %}
-        {{ leftWidth }}m
-      {% endif %}
-    </li>
+    <li>{{ keyTrans('cycleway:left') }}:<ul>
+      <li>{{ keyTrans('cycleway') }}: {{ tagTrans('cycleway', attribute(tags, 'cycleway:left')|default(attribute(tags, 'cycleway:both'))) }}</li>
+      <li>
+        {{ keyTrans('cycleway:width') }}:
+        {% if not leftWidth %}
+          {{ trans('unknown') }}
+        {% elseif attribute(tags, 'cycleway:left:width')|default(attribute(tags, 'cycleway:both:width')) matches "/(m|')$/" %}
+          {{ attribute(tags, 'cycleway:left:width')|default(attribute(tags, 'cycleway:both:width')) }}
+        {% else %}
+          {{ leftWidth }}m
+        {% endif %}
+      </li>
+    </ul></li>
     {% endif %}
+
     {% if rightCycle %}
-    <li>
-      {{ keyTrans('cycleway:right:width') }}:
+    <li>{{ keyTrans('cycleway:right') }}:<ul>
+      <li>{{ keyTrans('cycleway') }}: {{ tagTrans('cycleway', attribute(tags, 'cycleway:right')|default(attribute(tags, 'cycleway:both'))) }}</li>
+      <li>
+      {{ keyTrans('cycleway:width') }}:
       {% if not rightWidth %}
         {{ trans('unknown') }}
       {% elseif attribute(tags, 'cycleway:right:width')|default(attribute(tags, 'cycleway:both:width')) matches "/(m|')$/" %}
@@ -206,7 +212,8 @@ feature:
       {% else %}
         {{ rightWidth }}m
       {% endif %}
-    </li>
+      </li>
+    </ul></li>
     {% endif %}
     </ul>
 info: |