From 79041803fd58a6d3caf75f235f4e9ec45b0051a4 Mon Sep 17 00:00:00 2001
From: bombstable <3259357+bompstable@users.noreply.github.com>
Date: Mon, 27 May 2024 16:28:36 +0100
Subject: [PATCH 1/3] Add armrest tag to amenity=bench preset

https://josm.openstreetmap.de/ticket/23694
---
 resources/data/defaultpresets.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/data/defaultpresets.xml b/resources/data/defaultpresets.xml
index 600727b653f..b5c9df3e0a5 100644
--- a/resources/data/defaultpresets.xml
+++ b/resources/data/defaultpresets.xml
@@ -5196,6 +5196,7 @@
             <space />
             <key key="amenity" value="bench" />
             <check key="backrest" text="Backrest" />
+            <check key="armrest" text="Armrest(s)" />
             <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
             <reference ref="color" />
             <combo key="seats" text="Amount of Seats" values="1,2,3,4,5,6,7,8,9,10" />

From 13e2f971757b2774d144604a073b702b5358f9ef Mon Sep 17 00:00:00 2001
From: bombstable <3259357+bompstable@users.noreply.github.com>
Date: Tue, 28 May 2024 11:43:32 +0100
Subject: [PATCH 2/3] Use a combo to clarify meaning of armrests key

This avoid the use of the "Armrest(s)" text which could cause more work
for translators.

https://josm.openstreetmap.de/ticket/23694
---
 resources/data/defaultpresets.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/data/defaultpresets.xml b/resources/data/defaultpresets.xml
index b5c9df3e0a5..130008f79c8 100644
--- a/resources/data/defaultpresets.xml
+++ b/resources/data/defaultpresets.xml
@@ -5196,7 +5196,7 @@
             <space />
             <key key="amenity" value="bench" />
             <check key="backrest" text="Backrest" />
-            <check key="armrest" text="Armrest(s)" />
+            <combo key="armrest" text="Armrests" values="no,yes" display_values="No armrests,One or more armrests" editable="false" />
             <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
             <reference ref="color" />
             <combo key="seats" text="Amount of Seats" values="1,2,3,4,5,6,7,8,9,10" />

From 770a6cf2d9945a4cf09431a7b41287f2ac18ab7e Mon Sep 17 00:00:00 2001
From: bombstable <3259357+bompstable@users.noreply.github.com>
Date: Thu, 30 May 2024 11:18:59 +0100
Subject: [PATCH 3/3] Revert to a checkbox for armrest tag

This is a simpler ui than the combo box and fits better with the
existing backrest checkbox.

https://josm.openstreetmap.de/ticket/23694
---
 resources/data/defaultpresets.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/resources/data/defaultpresets.xml b/resources/data/defaultpresets.xml
index 130008f79c8..1951ce87ea4 100644
--- a/resources/data/defaultpresets.xml
+++ b/resources/data/defaultpresets.xml
@@ -5195,8 +5195,10 @@
             <link wiki="Tag:amenity=bench" />
             <space />
             <key key="amenity" value="bench" />
-            <check key="backrest" text="Backrest" />
-            <combo key="armrest" text="Armrests" values="no,yes" display_values="No armrests,One or more armrests" editable="false" />
+            <checkgroup columns="2">
+                <check key="backrest" text="Backrest" />
+                <check key="armrest" text="Armrests (one or more)" />
+            </checkgroup>
             <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
             <reference ref="color" />
             <combo key="seats" text="Amount of Seats" values="1,2,3,4,5,6,7,8,9,10" />