From 7a0c8612d050c4bbb351e1042366756782614b1e Mon Sep 17 00:00:00 2001
From: contrapunctus <contrapunctus@disroot.org>
Date: Sat, 9 Dec 2023 11:24:29 +0530
Subject: [PATCH 01/11] Make name and transportation type visible by default

---
 master_preset.xml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/master_preset.xml b/master_preset.xml
index 0e9ddac5..5149f52b 100644
--- a/master_preset.xml
+++ b/master_preset.xml
@@ -2328,6 +2328,19 @@
         </multiselect>
     </chunk>
     <chunk id="platform">
+        <text key="name" text="Name"/>
+        <checkgroup text="Transportation type" columns="3">
+          <check key="bus" text="Bus" disable_off="true"/>
+          <check key="tram" text="Tram" disable_off="true"/>
+          <check key="train" text="Train" disable_off="true"/>
+          <check key="trolleybus" text="Trolleybus" disable_off="true"/>
+          <check key="share_taxi" text="Share taxi" disable_off="true"/>
+          <check key="subway" text="Subway" disable_off="true"/>
+          <check key="monorail" text="Monorail" disable_off="true"/>
+          <check key="funicular" text="Funicular" disable_off="true"/>
+          <check key="aerialway" text="Aerialway" disable_off="true"/>
+          <check key="ferry" text="Ferry" disable_off="true"/>
+        </checkgroup>
         <check key="bench" text="Bench" />
         <check key="shelter" text="Shelter" />
         <check key="covered" text="Covered"/>
@@ -2338,25 +2351,12 @@
         <reference ref="wheelchair"/>
         <reference ref="tactile_paving"/>
         <optional>
-            <text key="name" text="Name"/>
             <text key="ref" text="Reference"/>
             <text key="uic_ref" text="UIC reference"/>
             <text key="uic_name" text="UIC name"/>
             <text key="operator" text="Operator"/>
             <text key="network" text="Network"/>
             <space/>
-            <checkgroup text="Transportation type" columns="3">
-                <check key="bus" text="Bus" disable_off="true"/>
-                <check key="tram" text="Tram" disable_off="true"/>
-                <check key="train" text="Train" disable_off="true"/>
-                <check key="trolleybus" text="Trolleybus" disable_off="true"/>
-                <check key="share_taxi" text="Share taxi" disable_off="true"/>
-                <check key="subway" text="Subway" disable_off="true"/>
-                <check key="monorail" text="Monorail" disable_off="true"/>
-                <check key="funicular" text="Funicular" disable_off="true"/>
-                <check key="aerialway" text="Aerialway" disable_off="true"/>
-                <check key="ferry" text="Ferry" disable_off="true"/>
-            </checkgroup>
         </optional>
     </chunk>
     <chunk id="backrest">

From a83eb7c65c87abd88c8b3a38e6927d5376c8c92a Mon Sep 17 00:00:00 2001
From: contrapunctus <contrapunctus@disroot.org>
Date: Sat, 9 Dec 2023 11:25:58 +0530
Subject: [PATCH 02/11] Move legacy stop types into optional fields

---
 master_preset.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/master_preset.xml b/master_preset.xml
index 5149f52b..21723286 100644
--- a/master_preset.xml
+++ b/master_preset.xml
@@ -5768,10 +5768,12 @@
                 <space/>
                 <key key="public_transport" value="platform"/>
                 <reference ref="platform"/>
-                <checkgroup text="Legacy stop types" columns="2">
+                <optional>
+                  <checkgroup text="Legacy stop types" columns="2">
                     <check key="highway" value_on="bus_stop" text="Bus stop" disable_off="true"/>
                     <check key="railway" value_on="tram_stop" text="Tram stop" disable_off="true"/>
-                </checkgroup>
+                  </checkgroup>
+                </optional>
             </item> <!-- Platform -->
             <item name="Station" name_context="railway" type="node,closedway,multipolygon" icon="${public_transport_train_station}" preset_name_label="true">
                 <link wiki="Tag:public_transport=station"/>

From 4759f8b71faf6464020462b83e92b9afe6e2692c Mon Sep 17 00:00:00 2001
From: contrapunctus <contrapunctus@disroot.org>
Date: Sun, 4 Feb 2024 12:20:54 +0530
Subject: [PATCH 03/11] Add PTv2 presets

---
 master_preset.xml | 166 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 166 insertions(+)

diff --git a/master_preset.xml b/master_preset.xml
index 21723286..38a78cba 100644
--- a/master_preset.xml
+++ b/master_preset.xml
@@ -2344,6 +2344,7 @@
         <check key="bench" text="Bench" />
         <check key="shelter" text="Shelter" />
         <check key="covered" text="Covered"/>
+        <check key="sign" text="Sign"/>
         <reference ref="bin"/>
         <reference ref="departures_board"/>
         <check key="passenger_information_display" text="Passenger information display" deprecated="true"/>
@@ -5791,6 +5792,171 @@
                     <check key="railway" value_on="halt" text="Railway halt" disable_off="true"/>
                 </checkgroup>
             </item> <!-- Station -->
+
+            <separator/> <!-- *** Road-based modes *** -->
+            <item name="Bus stop" type="node,way,closedway,multipolygon" icon="transport_platform_32003.png" preset_name_label="true">
+                <link wiki="Proposed_features/Public_Transport#Platform"/>
+                <space/>
+                <key key="public_transport" value="platform"/>
+                <checkgroup text="Transportation type" columns="3">
+                  <check key="bus" text="Bus" default="on" match="keyvalue" disable_off="true"/>
+                  <check key="tram" text="Tram" disable_off="true"/>
+                  <check key="train" text="Train" disable_off="true"/>
+                  <check key="trolleybus" text="Trolleybus" disable_off="true"/>
+                  <check key="share_taxi" text="Share taxi" disable_off="true"/>
+                  <check key="subway" text="Subway" disable_off="true"/>
+                  <check key="monorail" text="Monorail" disable_off="true"/>
+                  <check key="funicular" text="Funicular" disable_off="true"/>
+                  <check key="aerialway" text="Aerialway" disable_off="true"/>
+                  <check key="ferry" text="Ferry" disable_off="true"/>
+                </checkgroup>
+                <text key="name" text="Name"/>
+                <reference ref="platform"/>
+            </item> <!-- Bus stop -->
+            <item name="Bus station" type="node,closedway,multipolygon" icon="transport_bus_station.png" preset_name_label="true">
+                <link wiki="Tag:public_transport=station"/>
+                <space/>
+                <key key="public_transport" value="station"/>
+                <checkgroup text="Transportation type" columns="3">
+                  <check key="bus" text="Bus" default="on" match="keyvalue" disable_off="true"/>
+                  <check key="tram" text="Tram" disable_off="true"/>
+                  <check key="train" text="Train" disable_off="true"/>
+                  <check key="trolleybus" text="Trolleybus" disable_off="true"/>
+                  <check key="share_taxi" text="Share taxi" disable_off="true"/>
+                  <check key="subway" text="Subway" disable_off="true"/>
+                  <check key="monorail" text="Monorail" disable_off="true"/>
+                  <check key="funicular" text="Funicular" disable_off="true"/>
+                  <check key="aerialway" text="Aerialway" disable_off="true"/>
+                  <check key="ferry" text="Ferry" disable_off="true"/>
+                </checkgroup>
+                <text key="name" text="Name"/>
+                <optional>
+                    <check key="area" text="Area" disable_off="true"/>
+                    <check key="building" text="Building" disable_off="true"/>
+                    <checkgroup text="Legacy station types" columns="2">
+                      <check key="railway" value_on="station" text="Railway station" disable_off="true"/>
+                      <check key="railway" value_on="halt" text="Railway halt" disable_off="true"/>
+                    </checkgroup>
+                    <text key="operator" text="Operator"/>
+                    <text key="network" text="Network"/>
+                </optional>
+            </item> <!-- Bus station -->
+            <item name="Share taxi stop" type="node,way,closedway,multipolygon" icon="transport_platform_32003.png" preset_name_label="true">
+                <link wiki="Proposed_features/Public_Transport#Platform"/>
+                <space/>
+                <key key="public_transport" value="platform"/>
+                <checkgroup text="Transportation type" columns="3">
+                  <check key="bus" text="Bus" disable_off="true"/>
+                  <check key="tram" text="Tram" disable_off="true"/>
+                  <check key="train" text="Train" disable_off="true"/>
+                  <check key="trolleybus" text="Trolleybus" disable_off="true"/>
+                  <check key="share_taxi" text="Share taxi" default="on" match="keyvalue" disable_off="true"/>
+                  <check key="subway" text="Subway" disable_off="true"/>
+                  <check key="monorail" text="Monorail" disable_off="true"/>
+                  <check key="funicular" text="Funicular" disable_off="true"/>
+                  <check key="aerialway" text="Aerialway" disable_off="true"/>
+                  <check key="ferry" text="Ferry" disable_off="true"/>
+                </checkgroup>
+                <text key="name" text="Name"/>
+            </item> <!-- Share taxi stop -->
+
+            <separator/> <!-- *** Railway-based modes *** -->
+            <item name="Railway platform" type="node,way,closedway,multipolygon" icon="transport_platform_32003.png" preset_name_label="true">
+                <link wiki="Proposed_features/Public_Transport#Platform"/>
+                <space/>
+                <key key="public_transport" value="platform"/>
+                <checkgroup text="Transportation type" columns="3">
+                  <check key="bus" text="Bus" disable_off="true"/>
+                  <check key="tram" text="Tram" disable_off="true"/>
+                  <check key="train" text="Train" default="on" match="keyvalue" disable_off="true"/>
+                  <check key="trolleybus" text="Trolleybus" disable_off="true"/>
+                  <check key="share_taxi" text="Share taxi" disable_off="true"/>
+                  <check key="subway" text="Subway" disable_off="true"/>
+                  <check key="monorail" text="Monorail" disable_off="true"/>
+                  <check key="funicular" text="Funicular" disable_off="true"/>
+                  <check key="aerialway" text="Aerialway" disable_off="true"/>
+                  <check key="ferry" text="Ferry" disable_off="true"/>
+                </checkgroup>
+                <text key="ref" text="Reference"/>
+                <reference ref="platform"/>
+            </item> <!-- Railway platform -->
+            <item name="Railway station" name_context="railway" type="node,closedway,multipolygon" icon="transport_train_station2.png" preset_name_label="true">
+                <link wiki="Tag:public_transport=station"/>
+                <space/>
+                <key key="public_transport" value="station"/>
+                <checkgroup text="Transportation type" columns="3">
+                  <check key="bus" text="Bus" disable_off="true"/>
+                  <check key="tram" text="Tram" disable_off="true"/>
+                  <check key="train" text="Train" default="on" match="keyvalue" disable_off="true"/>
+                  <check key="trolleybus" text="Trolleybus" disable_off="true"/>
+                  <check key="share_taxi" text="Share taxi" disable_off="true"/>
+                  <check key="subway" text="Subway" disable_off="true"/>
+                  <check key="monorail" text="Monorail" disable_off="true"/>
+                  <check key="funicular" text="Funicular" disable_off="true"/>
+                  <check key="aerialway" text="Aerialway" disable_off="true"/>
+                  <check key="ferry" text="Ferry" disable_off="true"/>
+                </checkgroup>
+                <text key="name" text="Name"/>
+                <text key="ref" text="Reference"/>
+                <optional>
+                  <text key="operator" text="Operator"/>
+                  <text key="network" text="Network"/>
+                  <check key="area" text="Area" disable_off="true"/>
+                  <check key="building" text="Building" disable_off="true"/>
+                  <checkgroup text="Legacy station types" columns="2">
+                    <check key="railway" value_on="station" text="Railway station" disable_off="true"/>
+                    <check key="railway" value_on="halt" text="Railway halt" disable_off="true"/>
+                  </checkgroup>
+                </optional>
+            </item> <!-- Railway station -->
+            <item name="Subway platform" type="node,way,closedway,multipolygon" icon="transport_platform_32003.png" preset_name_label="true">
+                <link wiki="Proposed_features/Public_Transport#Platform"/>
+                <space/>
+                <key key="public_transport" value="platform"/>
+                <checkgroup text="Transportation type" columns="3">
+                  <check key="bus" text="Bus" disable_off="true"/>
+                  <check key="tram" text="Tram" disable_off="true"/>
+                  <check key="train" text="Train" disable_off="true"/>
+                  <check key="trolleybus" text="Trolleybus" disable_off="true"/>
+                  <check key="share_taxi" text="Share taxi" disable_off="true"/>
+                  <check key="subway" text="Subway" default="on" match="keyvalue" disable_off="true"/>
+                  <check key="monorail" text="Monorail" disable_off="true"/>
+                  <check key="funicular" text="Funicular" disable_off="true"/>
+                  <check key="aerialway" text="Aerialway" disable_off="true"/>
+                  <check key="ferry" text="Ferry" disable_off="true"/>
+                </checkgroup>
+                <text key="ref" text="Reference"/>
+                <reference ref="platform"/>
+            </item> <!-- Subway platform -->
+            <item name="Subway station" name_context="railway" type="node,closedway,multipolygon" icon="transport_train_station2.png" preset_name_label="true">
+                <link wiki="Tag:public_transport=station"/>
+                <space/>
+                <key key="public_transport" value="station"/>
+                <text key="name" text="Name"/>
+                <checkgroup text="Transportation type" columns="3">
+                  <check key="bus" text="Bus" disable_off="true"/>
+                  <check key="tram" text="Tram" disable_off="true"/>
+                  <check key="train" text="Train" disable_off="true"/>
+                  <check key="trolleybus" text="Trolleybus" disable_off="true"/>
+                  <check key="share_taxi" text="Share taxi" disable_off="true"/>
+                  <check key="subway" text="Subway" default="on" match="keyvalue" disable_off="true"/>
+                  <check key="monorail" text="Monorail" disable_off="true"/>
+                  <check key="funicular" text="Funicular" disable_off="true"/>
+                  <check key="aerialway" text="Aerialway" disable_off="true"/>
+                  <check key="ferry" text="Ferry" disable_off="true"/>
+                </checkgroup>
+                <optional>
+                  <text key="operator" text="Operator"/>
+                  <text key="network" text="Network"/>
+                  <check key="area" text="Area" disable_off="true"/>
+                  <check key="building" text="Building" disable_off="true"/>
+                  <checkgroup text="Legacy station types" columns="2">
+                    <check key="railway" value_on="station" text="Railway station" disable_off="true"/>
+                    <check key="railway" value_on="halt" text="Railway halt" disable_off="true"/>
+                  </checkgroup>
+                </optional>
+            </item> <!-- Subway station -->
+
             <separator/> <!-- *** Access *** -->
             <item name="Subway Entrance" icon="${public_transport_subway_entrance}" type="node" preset_name_label="true">
                 <link wiki="Tag:railway=subway_entrance"/>

From edc60d120d7b01f186e66d951646afdbd46ed905 Mon Sep 17 00:00:00 2001
From: contrapunctus <contrapunctus@disroot.org>
Date: Sun, 18 Feb 2024 23:22:59 +0530
Subject: [PATCH 04/11] Fix preset matching

---
 master_preset.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/master_preset.xml b/master_preset.xml
index 38a78cba..a5f4d55e 100644
--- a/master_preset.xml
+++ b/master_preset.xml
@@ -5799,7 +5799,7 @@
                 <space/>
                 <key key="public_transport" value="platform"/>
                 <checkgroup text="Transportation type" columns="3">
-                  <check key="bus" text="Bus" default="on" match="keyvalue" disable_off="true"/>
+                  <check key="bus" text="Bus" default="on" match="keyvalue!" disable_off="true"/>
                   <check key="tram" text="Tram" disable_off="true"/>
                   <check key="train" text="Train" disable_off="true"/>
                   <check key="trolleybus" text="Trolleybus" disable_off="true"/>
@@ -5818,7 +5818,7 @@
                 <space/>
                 <key key="public_transport" value="station"/>
                 <checkgroup text="Transportation type" columns="3">
-                  <check key="bus" text="Bus" default="on" match="keyvalue" disable_off="true"/>
+                  <check key="bus" text="Bus" default="on" match="keyvalue!" disable_off="true"/>
                   <check key="tram" text="Tram" disable_off="true"/>
                   <check key="train" text="Train" disable_off="true"/>
                   <check key="trolleybus" text="Trolleybus" disable_off="true"/>
@@ -5868,7 +5868,7 @@
                 <checkgroup text="Transportation type" columns="3">
                   <check key="bus" text="Bus" disable_off="true"/>
                   <check key="tram" text="Tram" disable_off="true"/>
-                  <check key="train" text="Train" default="on" match="keyvalue" disable_off="true"/>
+                  <check key="train" text="Train" default="on" match="keyvalue!" disable_off="true"/>
                   <check key="trolleybus" text="Trolleybus" disable_off="true"/>
                   <check key="share_taxi" text="Share taxi" disable_off="true"/>
                   <check key="subway" text="Subway" disable_off="true"/>
@@ -5887,7 +5887,7 @@
                 <checkgroup text="Transportation type" columns="3">
                   <check key="bus" text="Bus" disable_off="true"/>
                   <check key="tram" text="Tram" disable_off="true"/>
-                  <check key="train" text="Train" default="on" match="keyvalue" disable_off="true"/>
+                  <check key="train" text="Train" default="on" match="keyvalue!" disable_off="true"/>
                   <check key="trolleybus" text="Trolleybus" disable_off="true"/>
                   <check key="share_taxi" text="Share taxi" disable_off="true"/>
                   <check key="subway" text="Subway" disable_off="true"/>
@@ -5919,7 +5919,7 @@
                   <check key="train" text="Train" disable_off="true"/>
                   <check key="trolleybus" text="Trolleybus" disable_off="true"/>
                   <check key="share_taxi" text="Share taxi" disable_off="true"/>
-                  <check key="subway" text="Subway" default="on" match="keyvalue" disable_off="true"/>
+                  <check key="subway" text="Subway" default="on" match="keyvalue!" disable_off="true"/>
                   <check key="monorail" text="Monorail" disable_off="true"/>
                   <check key="funicular" text="Funicular" disable_off="true"/>
                   <check key="aerialway" text="Aerialway" disable_off="true"/>
@@ -5939,7 +5939,7 @@
                   <check key="train" text="Train" disable_off="true"/>
                   <check key="trolleybus" text="Trolleybus" disable_off="true"/>
                   <check key="share_taxi" text="Share taxi" disable_off="true"/>
-                  <check key="subway" text="Subway" default="on" match="keyvalue" disable_off="true"/>
+                  <check key="subway" text="Subway" default="on" match="keyvalue!" disable_off="true"/>
                   <check key="monorail" text="Monorail" disable_off="true"/>
                   <check key="funicular" text="Funicular" disable_off="true"/>
                   <check key="aerialway" text="Aerialway" disable_off="true"/>

From ed3e2f0bfa2fa3751797e376d5a8c0e67a9449d6 Mon Sep 17 00:00:00 2001
From: contrapunctus <contrapunctus@disroot.org>
Date: Tue, 20 Feb 2024 21:01:15 +0530
Subject: [PATCH 05/11] Move common platform data into platform chunk

---
 master_preset.xml | 25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/master_preset.xml b/master_preset.xml
index a5f4d55e..93203706 100644
--- a/master_preset.xml
+++ b/master_preset.xml
@@ -2328,6 +2328,9 @@
         </multiselect>
     </chunk>
     <chunk id="platform">
+        <link wiki="Proposed_features/Public_Transport#Platform"/>
+        <space/>
+        <key key="public_transport" value="platform"/>
         <text key="name" text="Name"/>
         <checkgroup text="Transportation type" columns="3">
           <check key="bus" text="Bus" disable_off="true"/>
@@ -5765,9 +5768,6 @@
                 </checkgroup>
             </item> <!-- Stop Position -->
             <item name="Platform" type="node,way,closedway,multipolygon" icon="${public_transport_platform}" preset_name_label="true">
-                <link wiki="Proposed_features/Public_Transport#Platform"/>
-                <space/>
-                <key key="public_transport" value="platform"/>
                 <reference ref="platform"/>
                 <optional>
                   <checkgroup text="Legacy stop types" columns="2">
@@ -5795,9 +5795,7 @@
 
             <separator/> <!-- *** Road-based modes *** -->
             <item name="Bus stop" type="node,way,closedway,multipolygon" icon="transport_platform_32003.png" preset_name_label="true">
-                <link wiki="Proposed_features/Public_Transport#Platform"/>
-                <space/>
-                <key key="public_transport" value="platform"/>
+                <reference ref="platform"/>
                 <checkgroup text="Transportation type" columns="3">
                   <check key="bus" text="Bus" default="on" match="keyvalue!" disable_off="true"/>
                   <check key="tram" text="Tram" disable_off="true"/>
@@ -5811,7 +5809,6 @@
                   <check key="ferry" text="Ferry" disable_off="true"/>
                 </checkgroup>
                 <text key="name" text="Name"/>
-                <reference ref="platform"/>
             </item> <!-- Bus stop -->
             <item name="Bus station" type="node,closedway,multipolygon" icon="transport_bus_station.png" preset_name_label="true">
                 <link wiki="Tag:public_transport=station"/>
@@ -5842,9 +5839,7 @@
                 </optional>
             </item> <!-- Bus station -->
             <item name="Share taxi stop" type="node,way,closedway,multipolygon" icon="transport_platform_32003.png" preset_name_label="true">
-                <link wiki="Proposed_features/Public_Transport#Platform"/>
-                <space/>
-                <key key="public_transport" value="platform"/>
+                <reference ref="platform"/>
                 <checkgroup text="Transportation type" columns="3">
                   <check key="bus" text="Bus" disable_off="true"/>
                   <check key="tram" text="Tram" disable_off="true"/>
@@ -5862,9 +5857,7 @@
 
             <separator/> <!-- *** Railway-based modes *** -->
             <item name="Railway platform" type="node,way,closedway,multipolygon" icon="transport_platform_32003.png" preset_name_label="true">
-                <link wiki="Proposed_features/Public_Transport#Platform"/>
-                <space/>
-                <key key="public_transport" value="platform"/>
+                <reference ref="platform"/>
                 <checkgroup text="Transportation type" columns="3">
                   <check key="bus" text="Bus" disable_off="true"/>
                   <check key="tram" text="Tram" disable_off="true"/>
@@ -5878,7 +5871,6 @@
                   <check key="ferry" text="Ferry" disable_off="true"/>
                 </checkgroup>
                 <text key="ref" text="Reference"/>
-                <reference ref="platform"/>
             </item> <!-- Railway platform -->
             <item name="Railway station" name_context="railway" type="node,closedway,multipolygon" icon="transport_train_station2.png" preset_name_label="true">
                 <link wiki="Tag:public_transport=station"/>
@@ -5910,9 +5902,7 @@
                 </optional>
             </item> <!-- Railway station -->
             <item name="Subway platform" type="node,way,closedway,multipolygon" icon="transport_platform_32003.png" preset_name_label="true">
-                <link wiki="Proposed_features/Public_Transport#Platform"/>
-                <space/>
-                <key key="public_transport" value="platform"/>
+                <reference ref="platform"/>
                 <checkgroup text="Transportation type" columns="3">
                   <check key="bus" text="Bus" disable_off="true"/>
                   <check key="tram" text="Tram" disable_off="true"/>
@@ -5926,7 +5916,6 @@
                   <check key="ferry" text="Ferry" disable_off="true"/>
                 </checkgroup>
                 <text key="ref" text="Reference"/>
-                <reference ref="platform"/>
             </item> <!-- Subway platform -->
             <item name="Subway station" name_context="railway" type="node,closedway,multipolygon" icon="transport_train_station2.png" preset_name_label="true">
                 <link wiki="Tag:public_transport=station"/>

From 9aee63c2ecfc9c570c91868b87ad08a683590e74 Mon Sep 17 00:00:00 2001
From: contrapunctus <contrapunctus@disroot.org>
Date: Tue, 20 Feb 2024 21:30:38 +0530
Subject: [PATCH 06/11] Make chunk for public_transport=station

---
 master_preset.xml | 106 ++++++++++++++++------------------------------
 1 file changed, 37 insertions(+), 69 deletions(-)

diff --git a/master_preset.xml b/master_preset.xml
index 93203706..4cc19bba 100644
--- a/master_preset.xml
+++ b/master_preset.xml
@@ -2327,23 +2327,26 @@
             <list_entry value="no" display_value="None"/>
         </multiselect>
     </chunk>
+    <chunk id="transportation_types">
+        <checkgroup text="Transportation type" columns="3">
+            <check key="bus" text="Bus" disable_off="true"/>
+            <check key="tram" text="Tram" disable_off="true"/>
+            <check key="train" text="Train" disable_off="true"/>
+            <check key="trolleybus" text="Trolleybus" disable_off="true"/>
+            <check key="share_taxi" text="Share taxi" disable_off="true"/>
+            <check key="subway" text="Subway" disable_off="true"/>
+            <check key="monorail" text="Monorail" disable_off="true"/>
+            <check key="funicular" text="Funicular" disable_off="true"/>
+            <check key="aerialway" text="Aerialway" disable_off="true"/>
+            <check key="ferry" text="Ferry" disable_off="true"/>
+        </checkgroup>
+    </chunk>
     <chunk id="platform">
         <link wiki="Proposed_features/Public_Transport#Platform"/>
         <space/>
         <key key="public_transport" value="platform"/>
         <text key="name" text="Name"/>
-        <checkgroup text="Transportation type" columns="3">
-          <check key="bus" text="Bus" disable_off="true"/>
-          <check key="tram" text="Tram" disable_off="true"/>
-          <check key="train" text="Train" disable_off="true"/>
-          <check key="trolleybus" text="Trolleybus" disable_off="true"/>
-          <check key="share_taxi" text="Share taxi" disable_off="true"/>
-          <check key="subway" text="Subway" disable_off="true"/>
-          <check key="monorail" text="Monorail" disable_off="true"/>
-          <check key="funicular" text="Funicular" disable_off="true"/>
-          <check key="aerialway" text="Aerialway" disable_off="true"/>
-          <check key="ferry" text="Ferry" disable_off="true"/>
-        </checkgroup>
+        <reference ref="transportation_types"/>
         <check key="bench" text="Bench" />
         <check key="shelter" text="Shelter" />
         <check key="covered" text="Covered"/>
@@ -2363,6 +2366,23 @@
             <space/>
         </optional>
     </chunk>
+    <chunk id="station">
+        <link wiki="Tag:public_transport=station"/>
+        <space/>
+        <key key="public_transport" value="station"/>
+        <text key="name" text="Name"/>
+        <reference ref="transportation_types"/>
+        <optional>
+            <check key="area" text="Area" disable_off="true"/>
+            <check key="building" text="Building" disable_off="true"/>
+            <checkgroup text="Legacy station types" columns="2">
+                <check key="railway" value_on="station" text="Railway station" disable_off="true"/>
+                <check key="railway" value_on="halt" text="Railway halt" disable_off="true"/>
+            </checkgroup>
+            <text key="operator" text="Operator"/>
+            <text key="network" text="Network"/>
+        </optional>
+    </chunk>
     <chunk id="backrest">
         <check key="backrest" text="Backrest"/>
     </chunk>
@@ -5777,20 +5797,7 @@
                 </optional>
             </item> <!-- Platform -->
             <item name="Station" name_context="railway" type="node,closedway,multipolygon" icon="${public_transport_train_station}" preset_name_label="true">
-                <link wiki="Tag:public_transport=station"/>
-                <space/>
-                <key key="public_transport" value="station"/>
-                <text key="name" text="Name"/>
-                <optional>
-                    <check key="area" text="Area" disable_off="true"/>
-                    <check key="building" text="Building" disable_off="true"/>
-                </optional>
-                <text key="operator" text="Operator"/>
-                <text key="network" text="Network"/>
-                <checkgroup text="Legacy station types" columns="2">
-                    <check key="railway" value_on="station" text="Railway station" disable_off="true"/>
-                    <check key="railway" value_on="halt" text="Railway halt" disable_off="true"/>
-                </checkgroup>
+                <reference ref="station"/>
             </item> <!-- Station -->
 
             <separator/> <!-- *** Road-based modes *** -->
@@ -5811,9 +5818,7 @@
                 <text key="name" text="Name"/>
             </item> <!-- Bus stop -->
             <item name="Bus station" type="node,closedway,multipolygon" icon="transport_bus_station.png" preset_name_label="true">
-                <link wiki="Tag:public_transport=station"/>
-                <space/>
-                <key key="public_transport" value="station"/>
+                <reference ref="station"/>
                 <checkgroup text="Transportation type" columns="3">
                   <check key="bus" text="Bus" default="on" match="keyvalue!" disable_off="true"/>
                   <check key="tram" text="Tram" disable_off="true"/>
@@ -5826,17 +5831,6 @@
                   <check key="aerialway" text="Aerialway" disable_off="true"/>
                   <check key="ferry" text="Ferry" disable_off="true"/>
                 </checkgroup>
-                <text key="name" text="Name"/>
-                <optional>
-                    <check key="area" text="Area" disable_off="true"/>
-                    <check key="building" text="Building" disable_off="true"/>
-                    <checkgroup text="Legacy station types" columns="2">
-                      <check key="railway" value_on="station" text="Railway station" disable_off="true"/>
-                      <check key="railway" value_on="halt" text="Railway halt" disable_off="true"/>
-                    </checkgroup>
-                    <text key="operator" text="Operator"/>
-                    <text key="network" text="Network"/>
-                </optional>
             </item> <!-- Bus station -->
             <item name="Share taxi stop" type="node,way,closedway,multipolygon" icon="transport_platform_32003.png" preset_name_label="true">
                 <reference ref="platform"/>
@@ -5873,9 +5867,8 @@
                 <text key="ref" text="Reference"/>
             </item> <!-- Railway platform -->
             <item name="Railway station" name_context="railway" type="node,closedway,multipolygon" icon="transport_train_station2.png" preset_name_label="true">
-                <link wiki="Tag:public_transport=station"/>
-                <space/>
-                <key key="public_transport" value="station"/>
+                <reference ref="station"/>
+                <text key="ref" text="Reference"/>
                 <checkgroup text="Transportation type" columns="3">
                   <check key="bus" text="Bus" disable_off="true"/>
                   <check key="tram" text="Tram" disable_off="true"/>
@@ -5888,18 +5881,6 @@
                   <check key="aerialway" text="Aerialway" disable_off="true"/>
                   <check key="ferry" text="Ferry" disable_off="true"/>
                 </checkgroup>
-                <text key="name" text="Name"/>
-                <text key="ref" text="Reference"/>
-                <optional>
-                  <text key="operator" text="Operator"/>
-                  <text key="network" text="Network"/>
-                  <check key="area" text="Area" disable_off="true"/>
-                  <check key="building" text="Building" disable_off="true"/>
-                  <checkgroup text="Legacy station types" columns="2">
-                    <check key="railway" value_on="station" text="Railway station" disable_off="true"/>
-                    <check key="railway" value_on="halt" text="Railway halt" disable_off="true"/>
-                  </checkgroup>
-                </optional>
             </item> <!-- Railway station -->
             <item name="Subway platform" type="node,way,closedway,multipolygon" icon="transport_platform_32003.png" preset_name_label="true">
                 <reference ref="platform"/>
@@ -5918,10 +5899,7 @@
                 <text key="ref" text="Reference"/>
             </item> <!-- Subway platform -->
             <item name="Subway station" name_context="railway" type="node,closedway,multipolygon" icon="transport_train_station2.png" preset_name_label="true">
-                <link wiki="Tag:public_transport=station"/>
-                <space/>
-                <key key="public_transport" value="station"/>
-                <text key="name" text="Name"/>
+                <reference ref="station"/>
                 <checkgroup text="Transportation type" columns="3">
                   <check key="bus" text="Bus" disable_off="true"/>
                   <check key="tram" text="Tram" disable_off="true"/>
@@ -5934,16 +5912,6 @@
                   <check key="aerialway" text="Aerialway" disable_off="true"/>
                   <check key="ferry" text="Ferry" disable_off="true"/>
                 </checkgroup>
-                <optional>
-                  <text key="operator" text="Operator"/>
-                  <text key="network" text="Network"/>
-                  <check key="area" text="Area" disable_off="true"/>
-                  <check key="building" text="Building" disable_off="true"/>
-                  <checkgroup text="Legacy station types" columns="2">
-                    <check key="railway" value_on="station" text="Railway station" disable_off="true"/>
-                    <check key="railway" value_on="halt" text="Railway halt" disable_off="true"/>
-                  </checkgroup>
-                </optional>
             </item> <!-- Subway station -->
 
             <separator/> <!-- *** Access *** -->

From 15935967f95bfcd2f40de9f69e052fb8f27fdcf2 Mon Sep 17 00:00:00 2001
From: contrapunctus <contrapunctus@disroot.org>
Date: Tue, 20 Feb 2024 22:34:09 +0530
Subject: [PATCH 07/11] Fix preset matching

---
 master_preset.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/master_preset.xml b/master_preset.xml
index 4cc19bba..13c89050 100644
--- a/master_preset.xml
+++ b/master_preset.xml
@@ -5839,7 +5839,7 @@
                   <check key="tram" text="Tram" disable_off="true"/>
                   <check key="train" text="Train" disable_off="true"/>
                   <check key="trolleybus" text="Trolleybus" disable_off="true"/>
-                  <check key="share_taxi" text="Share taxi" default="on" match="keyvalue" disable_off="true"/>
+                  <check key="share_taxi" text="Share taxi" default="on" match="keyvalue!" disable_off="true"/>
                   <check key="subway" text="Subway" disable_off="true"/>
                   <check key="monorail" text="Monorail" disable_off="true"/>
                   <check key="funicular" text="Funicular" disable_off="true"/>

From 2adbe6f6f81378cfd77d88557f935a56b9a957d9 Mon Sep 17 00:00:00 2001
From: simonpoole <simon@poole.ch>
Date: Fri, 23 Feb 2024 13:41:11 +0100
Subject: [PATCH 08/11] Add share taxi stop icon

---
 beautified_icons.mapping                     |   1 +
 icons/png/transport_share_taxi.png           | Bin 0 -> 1678 bytes
 icons/svg-osm-icons/transport/share_taxi.svg | 264 +++++++++++++++++++
 josm_icons.mapping                           |   1 +
 master_preset.xml                            |   2 +-
 5 files changed, 267 insertions(+), 1 deletion(-)
 create mode 100644 icons/png/transport_share_taxi.png
 create mode 100644 icons/svg-osm-icons/transport/share_taxi.svg

diff --git a/beautified_icons.mapping b/beautified_icons.mapping
index 049ada37..d65fe2f9 100644
--- a/beautified_icons.mapping
+++ b/beautified_icons.mapping
@@ -295,6 +295,7 @@ public_transport_route_master=${ICONPATH}osm_route_sp.${ICONTYPE}
 public_transport_stop_area=presets/interpolation.png
 public_transport_stop_position=${ICONPATH}transport_bus_stop2.${ICONTYPE}
 public_transport_platform=${ICONPATH}transport_platform_32003.${ICONTYPE}
+public_transport_share_taxi_stop=${ICONPATH}transport_share_taxi.${ICONTYPE}
 public_transport_train_station=${ICONPATH}transport_train_station2.${ICONTYPE}
 public_transport_subway_entrance=${ICONPATH}transport_subway.${ICONTYPE}
 public_transport_ticket_machine=${ICONPATH}transport_ticket_29200.${ICONTYPE}
diff --git a/icons/png/transport_share_taxi.png b/icons/png/transport_share_taxi.png
new file mode 100644
index 0000000000000000000000000000000000000000..63fb9b439262f43d84b6e7b606d420f4c018d8d8
GIT binary patch
literal 1678
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
Y27>G-v-vd-)c^nh07*qoM6N<$f|K7b)Bpeg

literal 0
HcmV?d00001

diff --git a/icons/svg-osm-icons/transport/share_taxi.svg b/icons/svg-osm-icons/transport/share_taxi.svg
new file mode 100644
index 00000000..0c28f37f
--- /dev/null
+++ b/icons/svg-osm-icons/transport/share_taxi.svg
@@ -0,0 +1,264 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="580"
+   height="580"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="share_taxi.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs22">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 290 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="580 : 290 : 1"
+       inkscape:persp3d-origin="290 : 193.33333 : 1"
+       id="perspective24" />
+    <marker
+       viewBox="0 0 10 10"
+       refY="5"
+       refX="10"
+       orient="auto"
+       markerWidth="4"
+       markerUnits="strokeWidth"
+       markerHeight="3"
+       id="ArrowStart">
+      <path
+         id="path3568"
+         d="M 10 0 L 0 5 L 10 10 z" />
+    </marker>
+    <marker
+       viewBox="0 0 10 10"
+       refY="5"
+       refX="0"
+       orient="auto"
+       markerWidth="4"
+       markerUnits="strokeWidth"
+       markerHeight="3"
+       id="ArrowEnd">
+      <path
+         id="path3565"
+         d="M 0 0 L 10 5 L 0 10 z" />
+    </marker>
+    <inkscape:perspective
+       id="perspective2683"
+       inkscape:persp3d-origin="306.082 : 204.39034 : 1"
+       inkscape:vp_z="612.164 : 306.58551 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 306.58551 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <marker
+       viewBox="0 0 10 10"
+       refY="5"
+       refX="10"
+       orient="auto"
+       markerWidth="4"
+       markerUnits="strokeWidth"
+       markerHeight="3"
+       id="marker2959">
+      <path
+         id="path2626"
+         d="M 10 0 L 0 5 L 10 10 z" />
+    </marker>
+    <marker
+       viewBox="0 0 10 10"
+       refY="5"
+       refX="0"
+       orient="auto"
+       markerWidth="4"
+       markerUnits="strokeWidth"
+       markerHeight="3"
+       id="marker2956">
+      <path
+         id="path2623"
+         d="M 0 0 L 10 5 L 0 10 z" />
+    </marker>
+    <inkscape:perspective
+       id="perspective2953"
+       inkscape:persp3d-origin="306.082 : 204.39034 : 1"
+       inkscape:vp_z="612.164 : 306.58551 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 306.58551 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <marker
+       viewBox="0 0 10 10"
+       refY="5"
+       refX="10"
+       orient="auto"
+       markerWidth="4"
+       markerUnits="strokeWidth"
+       markerHeight="3"
+       id="marker3077">
+      <path
+         id="path3298"
+         d="M 10 0 L 0 5 L 10 10 z" />
+    </marker>
+    <marker
+       viewBox="0 0 10 10"
+       refY="5"
+       refX="0"
+       orient="auto"
+       markerWidth="4"
+       markerUnits="strokeWidth"
+       markerHeight="3"
+       id="marker3074">
+      <path
+         id="path3295"
+         d="M 0 0 L 10 5 L 0 10 z" />
+    </marker>
+    <inkscape:perspective
+       id="perspective3071"
+       inkscape:persp3d-origin="180.936 : 163.92867 : 1"
+       inkscape:vp_z="361.87201 : 245.89301 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 245.89301 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <marker
+       viewBox="0 0 10 10"
+       refY="5"
+       refX="10"
+       orient="auto"
+       markerWidth="4"
+       markerUnits="strokeWidth"
+       markerHeight="3"
+       id="marker3188">
+      <path
+         id="path3318"
+         d="M 10 0 L 0 5 L 10 10 z" />
+    </marker>
+    <marker
+       viewBox="0 0 10 10"
+       refY="5"
+       refX="0"
+       orient="auto"
+       markerWidth="4"
+       markerUnits="strokeWidth"
+       markerHeight="3"
+       id="marker3185">
+      <path
+         id="path3315"
+         d="M 0 0 L 10 5 L 0 10 z" />
+    </marker>
+    <inkscape:perspective
+       id="perspective3182"
+       inkscape:persp3d-origin="306.082 : 204.39034 : 1"
+       inkscape:vp_z="612.164 : 306.58551 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 306.58551 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:language>en</dc:language>
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     inkscape:window-height="1005"
+     inkscape:window-width="1280"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     guidetolerance="10.0"
+     gridtolerance="10.0"
+     objecttolerance="10.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     showgrid="false"
+     inkscape:zoom="0.94316065"
+     inkscape:cx="306.25606"
+     inkscape:cy="415.25176"
+     inkscape:window-x="317"
+     inkscape:window-y="53"
+     inkscape:current-layer="svg2"
+     inkscape:window-maximized="0" />
+  <path
+     inkscape:connector-curvature="0"
+     id="path1329"
+     style="fill:#111111;stroke:#eeeeee;stroke-width:3.40799999"
+     d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 v 450.123 c 0,40.844 20.894,62.229 62.192,62.229 H 515.92 c 41.307,0 62.229,-20.316 62.229,-62.229 V 66.804 c 0,-42.601 -20.922,-65.036 -63.522,-65.036 -0.003,0 -448.494,-0.143 -448.352,0 z" />
+  <g
+     id="g2319"
+     transform="translate(879.29125,36.805119)">
+    <path
+       id="path2323"
+       style="fill:#ffffff;stroke:none"
+       d="" />
+  </g>
+  <g
+     id="g2325"
+     transform="translate(879.29125,36.805119)">
+    <path
+       id="path2329"
+       style="fill:#ffffff;stroke:none"
+       d="" />
+  </g>
+  <g
+     id="g3324"
+     transform="matrix(0.79410025,0,0,0.79410025,46.860843,141.68326)">
+    <path
+       style="fill:#ffffff;stroke:none"
+       d="m 269.59375,90.625 c -7.5,0 -12.12499,4.312502 -12.125,12.8125 v 21.25 H 211.9375 c -24.5,0 -37.49999,13.25 -43.5,28.75 l -31.875,81.40625 c -12.626,1.603 -34.96875,16.26649 -34.96875,44.0625 v 103.5625 h 31 v 33.09375 c 0,40.736 58.21874,40.25699 58.21875,0 v -33.09375 h 104.75 0.0625 104.71875 v 33.09375 c 0,40.257 58.24999,40.73599 58.25,0 v -33.09375 h 30.96875 v -103.5625 c 0,-27.796 -22.374,-42.4595 -35,-44.0625 l -31.875,-81.40625 c -6,-15.5 -19.00001,-28.75 -43.5,-28.75 h -45 v -21.25 c 0,-8.5 -4.625,-12.812503 -12.125,-12.8125 h -26.4375 -0.0625 z m -58.03125,63.71875 h 83.9375 0.0625 0.0625 83.9375 c 10.49999,0.097 15,6.59375 18,15.59375 l 24,62.96875 H 295.625 295.5625 295.5 169.5625 l 24,-62.96875 c 3,-9 7.5,-15.49675 18,-15.59375 z m -48.9375,109.9375 c 14.85499,0 26.90625,12.2785 26.90625,27.4375 0,15.15899 -12.05125,27.46875 -26.90625,27.46875 -14.85701,10e-6 -26.90625,-12.30975 -26.90625,-27.46875 0,-15.15901 12.04925,-27.4375 26.90625,-27.4375 z m 265.875,0 c 14.855,0 26.90624,12.27849 26.90625,27.4375 0,15.159 -12.05124,27.46876 -26.90625,27.46875 -14.856,0 -26.87498,-12.30976 -26.875,-27.46875 0,-15.159 12.01901,-27.4375 26.875,-27.4375 z"
+       transform="translate(10.51126,70.239291)"
+       id="path3326"
+       inkscape:connector-curvature="0" />
+    <g
+       id="g3328">
+      <g
+         id="g3332">
+        <g
+           id="g3334">
+          <path
+             id="path3338"
+             style="fill:#000000;stroke:none"
+             d=""
+             inkscape:connector-curvature="0" />
+        </g>
+        <g
+           id="g3340">
+          <path
+             id="path3344"
+             style="fill:#000000;stroke:none"
+             d=""
+             inkscape:connector-curvature="0" />
+        </g>
+      </g>
+    </g>
+  </g>
+  <g
+     transform="translate(7.2503353,13.581596)"
+     id="g183">
+    <path
+       id="path8791-2"
+       d="m 169.8083,21.036129 c -10.69513,3.97e-4 -20.00111,3.873175 -27.92337,11.595293 -7.92154,7.722865 -11.8907,17.107746 -11.89109,28.189584 3.8e-4,11.094644 3.96955,20.52658 11.89109,28.248744 7.92226,7.7228 17.22824,11.56603 27.92337,11.56571 0.39434,0 0.7931,-0.02 1.18319,-0.0295 0.39452,0.0109 0.78433,0.0298 1.18319,0.0295 10.69514,3.2e-4 20.00115,-3.84291 27.92339,-11.56571 7.92155,-7.722164 11.86114,-17.1541 11.86151,-28.248744 -3.6e-4,-11.081838 -3.93996,-20.466719 -11.86151,-28.189584 -7.92224,-7.722118 -17.22825,-11.594896 -27.92339,-11.595293 -0.39875,9e-6 -0.7888,0.01959 -1.18319,0.02953 -0.38999,-0.0095 -0.78895,-0.02953 -1.18319,-0.02953 z m -30.28976,88.502861 c -2.41909,7e-5 -4.6052,0.27098 -6.56672,0.79866 a 33.927916,33.927916 0 0 0 -3.87496,-0.1479 33.927916,33.927916 0 0 0 -33.09984,34.69716 l 0.70992,79.12606 a 33.927916,33.927916 0 0 0 23.84135,33.0111 v 9.90925 3.01714 l 50.4632,-1.47899 50.4928,1.47899 v -3.01714 -11.41782 a 33.927916,33.927916 0 0 0 19.87765,-32.1237 l -0.70991,-79.12607 a 33.927916,33.927916 0 0 0 -31.88707,-33.98724 c -1.88809,-0.47812 -3.96823,-0.73944 -6.27092,-0.7395 z"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:125%;font-family:NPSPICT3;-inkscape-font-specification:NPSPICT3;text-align:start;writing-mode:lr-tb;text-anchor:start;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.55347908;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:125%;font-family:NPSPICT3;-inkscape-font-specification:NPSPICT3;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.55347908;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       d="m 397.8083,21.036129 c -10.69513,3.97e-4 -20.00111,3.873175 -27.92337,11.595293 -7.92154,7.722865 -11.8907,17.107746 -11.89109,28.189584 3.8e-4,11.094644 3.96955,20.52658 11.89109,28.248744 7.92226,7.7228 17.22824,11.56603 27.92337,11.56571 0.39434,0 0.7931,-0.02 1.18319,-0.0295 0.39452,0.0109 0.78433,0.0298 1.18319,0.0295 10.69514,3.2e-4 20.00115,-3.84291 27.92339,-11.56571 7.92155,-7.722164 11.86114,-17.1541 11.86151,-28.248744 -3.6e-4,-11.081838 -3.93996,-20.466719 -11.86151,-28.189584 -7.92224,-7.722118 -17.22825,-11.594896 -27.92339,-11.595293 -0.39875,9e-6 -0.7888,0.01959 -1.18319,0.02953 -0.38999,-0.0095 -0.78895,-0.02953 -1.18319,-0.02953 z m -30.28976,88.502861 c -2.41909,7e-5 -4.6052,0.27098 -6.56672,0.79866 a 33.927916,33.927916 0 0 0 -3.87496,-0.1479 33.927916,33.927916 0 0 0 -33.09984,34.69716 l 0.70992,79.12606 a 33.927916,33.927916 0 0 0 23.84135,33.0111 v 9.90925 3.01714 l 50.4632,-1.47899 50.4928,1.47899 v -3.01714 -11.41782 a 33.927916,33.927916 0 0 0 19.87765,-32.1237 l -0.70991,-79.12607 a 33.927916,33.927916 0 0 0 -31.88707,-33.98724 c -1.88809,-0.47812 -3.96823,-0.73944 -6.27092,-0.7395 z"
+       id="path20631" />
+  </g>
+</svg>
diff --git a/josm_icons.mapping b/josm_icons.mapping
index 8ec872a4..c97bb7c0 100644
--- a/josm_icons.mapping
+++ b/josm_icons.mapping
@@ -297,6 +297,7 @@ public_transport_route_master=presets/misc/route.svg
 public_transport_stop_area=presets/misc/interpolation.svg
 public_transport_stop_position=presets/transport/stop_position.svg
 public_transport_platform=presets/transport/platform.svg
+public_transport_share_taxi_stop=
 public_transport_train_station=presets/transport/station.svg
 public_transport_subway_entrance=presets/transport/underground.svg
 public_transport_ticket_machine=presets/transport/ticket-machine.svg
diff --git a/master_preset.xml b/master_preset.xml
index 13c89050..fefd82b2 100644
--- a/master_preset.xml
+++ b/master_preset.xml
@@ -5832,7 +5832,7 @@
                   <check key="ferry" text="Ferry" disable_off="true"/>
                 </checkgroup>
             </item> <!-- Bus station -->
-            <item name="Share taxi stop" type="node,way,closedway,multipolygon" icon="transport_platform_32003.png" preset_name_label="true">
+            <item name="Share taxi stop" type="node,way,closedway,multipolygon" icon="${public_transport_share_taxi_stop}" preset_name_label="true">
                 <reference ref="platform"/>
                 <checkgroup text="Transportation type" columns="3">
                   <check key="bus" text="Bus" disable_off="true"/>

From 5458e8ecec5add209b4d9c6a79dd69be839e3aa7 Mon Sep 17 00:00:00 2001
From: simonpoole <simon@poole.ch>
Date: Fri, 23 Feb 2024 16:32:13 +0100
Subject: [PATCH 09/11] Add subway entrance icon

---
 beautified_icons.mapping                      |   3 +-
 icons/png/transport_subway_entrance.png       | Bin 0 -> 1517 bytes
 .../transport/subway_entrance.svg             | 173 ++++++++++++++++++
 josm_icons.mapping                            |   1 +
 master_preset.xml                             |   2 +-
 5 files changed, 177 insertions(+), 2 deletions(-)
 create mode 100644 icons/png/transport_subway_entrance.png
 create mode 100644 icons/svg-osm-icons/transport/subway_entrance.svg

diff --git a/beautified_icons.mapping b/beautified_icons.mapping
index d65fe2f9..08b8328f 100644
--- a/beautified_icons.mapping
+++ b/beautified_icons.mapping
@@ -297,7 +297,8 @@ public_transport_stop_position=${ICONPATH}transport_bus_stop2.${ICONTYPE}
 public_transport_platform=${ICONPATH}transport_platform_32003.${ICONTYPE}
 public_transport_share_taxi_stop=${ICONPATH}transport_share_taxi.${ICONTYPE}
 public_transport_train_station=${ICONPATH}transport_train_station2.${ICONTYPE}
-public_transport_subway_entrance=${ICONPATH}transport_subway.${ICONTYPE}
+public_transport_subway_station=${ICONPATH}transport_subway.${ICONTYPE}
+public_transport_subway_entrance=${ICONPATH}transport_subway_entrance.${ICONTYPE}
 public_transport_ticket_machine=${ICONPATH}transport_ticket_29200.${ICONTYPE}
 public_transport_ticket_validator=${ICONPATH}transport_ticket_validator.${ICONTYPE}
 public_transport_halt=${ICONPATH}transport_halt_27002.${ICONTYPE}
diff --git a/icons/png/transport_subway_entrance.png b/icons/png/transport_subway_entrance.png
new file mode 100644
index 0000000000000000000000000000000000000000..193465a4ef21c0f1d742c66e64b3ed0fc2288923
GIT binary patch
literal 1517
zcmV<J1rqv+P)<h;3K|Lk000e1NJLTq001ul001xu1^@s6fu|$l00006VoOIv0RI60
z0RN!9r;`8x1)@nrK~!jg?U-w9lT{eUf9HMI_3bXbj9nOx!BAuy7?>G~G7K0Tpo4(U
zNn!@^f+QvcG{m6b7coW*Q3RAkKd3}PjD)x`Sb}m3$^bzblHkH*8*J@vY%5#Wc3u1W
zp<733*}4WOOZNYEo;=SvzjJw>_q;~{psIqM)$8!M7b2ty2vq^$=0TB46sm9{sdcEH
z-xxb(D@DRB`oQ<1szrc^G-rs~Put{|WfEUqgUWhF4mdz2y0$h6RV-p;fddFsb%6xx
zq)3y5B}rsR2;w5m5tdZqBs{7VX^!wD#0UlVY7{<F8ikLPMl^iXt&Nlz8A;szkFC||
zrn^`5v+1G)MU&&HY;|&>#Tiz=e(<kl=~1HY{$?Dg>Ee8|Kj5}GNxU`9fWxga>4#b@
zw%%d)8#T1cy-|W91E7@!ahieM7C_-6am*hdgQ?F4z-;SfXJrS~R+rD_2fyQ@^`6|&
zoNhJ1_Rh%`EVf?GG&#7^F#xn{UNWnv8G`n+B2!P!-a6_!y}RTGZ*zI>Ci9^3sNQq0
zl?Rq<?Q|onrx`d@Yh%;t8(4b=c%DpA*!^4zALJ&m`dBj%!DI8$tTDWit>^V@14rxa
zJZjXiH7}8K%?=97E!b~M@T*oAD>C)WOi_Hc0Qdw&=Do*FJdvWHj~+aET^^N7H=OLe
zXr;1scokz}ymx3xKz@1*Tb@p&#qMV5!9ehSCF&$PZ`ln$_yk4fujS)Oi_>tkC$u9p
zGew~|Q_l+r%pAGiJ*)}z>x(%_NCFm=SZL_-o@W6RWW<sh>qVTItR**DVbkdw!QnUN
znrN}R$=Q32c4uhtMy<rb#SgLLnIy9J)P)7FixLzcZscr}!w3G|{1jGZ>HYl9H#^yO
zp(8l_Q>i)*)^>*s4$$HB@XOUMKAW9Lf+ExA82+Qfmh<iGsp|B#H{>R;GE2{a8XIM`
zw!U%Pl-1b$K6ZZa#%KwT8vMKsCQo08Q7eTEFH7DkQ(9wVV@0daz9b`-k7teHq}fhk
zxrLq}Wwu`tx!dHY$B>t*aJj9A6^9#rlh00wW_SKru6Ma8JTy2sL;!w@DVm=aref{!
zu(-_ZtL0-9nbLxB$O4v>S!lKoy@U6)&YQFn2MWd!s}U?HG4o&Fr(PooeqNMHhF-&q
zhs<0IvFrxG8-}Ru!DQ41kBQYt6ikf8pp}q-;!Hi0jT%-TYvx$J-RJl9+$83u>DX|p
zm6EHrkjD*xUp3W0W4D{yo33E~0ZNb8ux7e3z;4t^99@=1PLkHozP+-8Z!TGV?X}a5
zygAjtk5!#)Io}>Kcu@HGXo+<*j8wI|n3tv-H26e=ok<2w(A|1B$Ha^zExZ1)QrGES
zh=1FAD7|H6^V4J4nwQAwMhB~oGz|+p0KPwY3J+PRXms#<VH&ejgHPaGvxB+&>zR?H
z<?rR`fVbxRz{baL<a#%6A8!sC-=DaaZa2#gnsE$KS%S%L$&NR8&tZOg47te)lk}Q9
z22P0AFf&DAVR{Sz7h0TtHC`)=I|7-s5~T&HM9YGuWo8<?!+T8^d|72ih}8a0PrQ`I
zV`H>K#rdhT$3uQe1E(7uKHFDwlUX%Y&&pq$IMXy>Pu9tNJ|~G;V-<?ZE$plA3JV-W
zy&pVyE5x_YCiDEnSpK|a&|u0kMPupirKr4-n%fe5LVOfwUr8rfCkKsv|5PiV4l_Y-
zhYv_to6E!Zmv2(p>Krori!<Yqg$Mu#sO#({Z{Ky+=a|SaXncQY*E)OISKUQ<UFaq8
zj`+8){K%20AJOkNqwtZ^D14+e3Lhy+AnZfCJ&0265<+c=G)8z54HAe`k;Vv15)~3g
z{bo={)&v9<h@MZp_oeMu^mx?GNS-`|NJACM5aIV<LUo{udIW!9lRsp`!`A-+-KG2e
Tp>YQt00000NkvXXu0mjfb1~r?

literal 0
HcmV?d00001

diff --git a/icons/svg-osm-icons/transport/subway_entrance.svg b/icons/svg-osm-icons/transport/subway_entrance.svg
new file mode 100644
index 00000000..278139d6
--- /dev/null
+++ b/icons/svg-osm-icons/transport/subway_entrance.svg
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="580"
+   height="580"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="subway_entrance.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:language>en</dc:language>
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     inkscape:window-height="839"
+     inkscape:window-width="1355"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     guidetolerance="10.0"
+     gridtolerance="10.0"
+     objecttolerance="10.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     showgrid="false"
+     inkscape:zoom="0.5"
+     inkscape:cx="279.90882"
+     inkscape:cy="377.48075"
+     inkscape:window-x="122"
+     inkscape:window-y="126"
+     inkscape:current-layer="svg2"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3779" />
+  </sodipodi:namedview>
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 290 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="580 : 290 : 1"
+       inkscape:persp3d-origin="290 : 193.33333 : 1"
+       id="perspective12" />
+    <style
+       type="text/css"
+       id="style6">
+   
+    .fil0 {fill:#EF7900}
+   
+  </style>
+    <inkscape:perspective
+       id="perspective6807"
+       inkscape:persp3d-origin="29.116032 : 19.410688 : 1"
+       inkscape:vp_z="58.232063 : 29.116032 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 29.116032 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective6954"
+       inkscape:persp3d-origin="290 : 193.33333 : 1"
+       inkscape:vp_z="580 : 290 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 290 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <marker
+       viewBox="0 0 10 10"
+       refY="5"
+       refX="10"
+       orient="auto"
+       markerWidth="4"
+       markerUnits="strokeWidth"
+       markerHeight="3"
+       id="ArrowStart">
+      <path
+         id="path2295"
+         d="M 10 0 L 0 5 L 10 10 z" />
+    </marker>
+    <marker
+       viewBox="0 0 10 10"
+       refY="5"
+       refX="0"
+       orient="auto"
+       markerWidth="4"
+       markerUnits="strokeWidth"
+       markerHeight="3"
+       id="ArrowEnd">
+      <path
+         id="path2292"
+         d="M 0 0 L 10 5 L 0 10 z" />
+    </marker>
+    <inkscape:perspective
+       id="perspective7597"
+       inkscape:persp3d-origin="178.5405 : 158.483 : 1"
+       inkscape:vp_z="357.08099 : 237.7245 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 237.7245 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <g
+     id="g1327">
+    <path
+       d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.598,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.84 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.627,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z"
+       style="fill:#111111;stroke:#eeeeee;stroke-width:3.40799999"
+       id="path1329" />
+  </g>
+  <g
+     id="g2319"
+     transform="translate(879.29125,36.805119)">
+    <path
+       id="path2323"
+       style="fill:#ffffff;stroke:none"
+       d="" />
+  </g>
+  <g
+     id="g2325"
+     transform="translate(879.29125,36.805119)">
+    <path
+       id="path2329"
+       style="fill:#ffffff;stroke:none"
+       d="" />
+  </g>
+  <g
+     id="g4718"
+     transform="translate(-15.492958,1.4084507)">
+    <path
+       inkscape:connector-curvature="0"
+       id="path24"
+       d="m 407.11903,199.69204 c 10.28218,-0.0393 18.60786,-8.36217 18.57417,-18.57137 0.0365,-10.33832 -8.29199,-18.66399 -18.57417,-18.70609 -10.25972,0.0421 -18.5882,8.36777 -18.57136,18.70609 -0.0168,10.2064 8.31164,18.53207 18.57136,18.57137 z"
+       style="fill:#ffffff;fill-opacity:1;stroke-width:2.80703759" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path28"
+       d="m 536.31779,184.10682 h -43.20873 c -8.93761,-0.0732 -20.43804,4.26355 -27.26756,12.33799 l -40.0424,47.48143 v -13.89896 c -0.0168,-29.6218 -36.84237,-29.29896 -36.88447,0 v 56.69415 h 0.13193 l -34.77359,41.2309 c -3.31511,3.89743 -3.71651,4.06051 -10.13902,4.06051 -0.0281,0.009 -21.3391,0 -21.3391,0 -21.36155,0 -34.19814,22.81212 -34.25147,42.16948 0.0533,19.31408 12.88992,43.75374 36.22482,43.73709 0,0 28.9181,0.0199 37.80238,0 9.00498,0.0199 19.84575,-4.03721 28.85073,-14.06203 L 502.33018,272.81915 c 2.33265,-2.55946 3.65195,-3.33162 7.77269,-3.28169 0,0 15.24782,-0.0532 27.39668,0 13.14255,-0.0532 31.80093,-17.77642 31.75041,-43.25783 0.0505,-25.33497 -18.74821,-42.18945 -32.93217,-42.17281 z m -1.84984,63.25754 h -23.43876 c -9.92288,-0.009 -14.3187,1.63752 -20.02822,8.43057 L 379.1714,388.24435 c -4.466,5.43843 -10.20358,7.56521 -17.51872,7.492 H 324.7682 c -9.50182,0.0731 -17.84434,-9.42241 -17.78258,-21.86357 -0.0618,-12.51438 7.89619,-19.49713 16.0731,-19.5271 h 25.29141 c 7.42461,0.03 12.26956,-2.46626 16.46046,-7.48865 L 478.49281,212.06449 c 4.68776,-5.50833 9.30253,-6.19728 17.25206,-6.24388 h 38.85782 c 9.5327,0.0466 15.90187,12.59426 15.94397,20.14948 -0.0449,7.40879 -4.56424,21.38429 -16.07871,21.39427 z"
+       style="fill:#ffffff;fill-opacity:1;stroke-width:3.05657387" />
+  </g>
+  <path
+     inkscape:connector-curvature="0"
+     style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.6787976"
+     d="M 101.42902,232.24955 H 81.892863 c -23.859123,0 -42.875279,19.5345 -42.875279,43.39414 v 88.34346 c 0,19.08748 12.257382,35.12004 29.390289,40.8006 v 13.65812 h 15.21382 V 407.5539 H 189.94559 v 10.89197 h 15.21381 v -13.13921 c 17.89583,-5.27667 30.94595,-21.65504 30.94595,-41.31951 v -88.34346 c 0,-23.85964 -19.01561,-43.39414 -42.87522,-43.39414 h -22.30176 z m 52.21094,0 H 118.89002 Z M 72.211323,253.34138 H 199.62708 c 9.07519,0 16.94265,7.17593 16.94265,16.25109 v 60.16363 c 0,9.07515 -7.86746,16.2511 -16.94265,16.2511 H 72.211323 c -9.07516,0 -16.769477,-7.17595 -16.769477,-16.2511 v -60.16363 c 0,-9.07516 7.694317,-16.25109 16.769477,-16.25109 z m 4.66815,104.94085 c 7.48686,0 13.48494,6.17071 13.48494,13.65757 0,7.48681 -5.99808,13.48493 -13.48494,13.48493 -7.48686,0 -13.48493,-5.99812 -13.48493,-13.48493 0,-7.48686 5.99807,-13.65757 13.48493,-13.65757 z m 118.079487,0 c 7.48681,0 13.65812,6.17071 13.65812,13.65757 0,7.48681 -6.17131,13.48493 -13.65812,13.48493 -7.48685,0 -13.48498,-5.99812 -13.48498,-13.48493 0,-7.48686 5.99813,-13.65757 13.48498,-13.65757 z"
+     id="rect4085"
+     sodipodi:nodetypes="ccccccccccccccccccccccccccccccsssccsssc" />
+  <rect
+     style="opacity:0.5;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.6185165"
+     id="rect3480"
+     width="275.59918"
+     height="27.661436"
+     x="37.790337"
+     y="166.80617" />
+</svg>
diff --git a/josm_icons.mapping b/josm_icons.mapping
index c97bb7c0..9f84d0ce 100644
--- a/josm_icons.mapping
+++ b/josm_icons.mapping
@@ -299,6 +299,7 @@ public_transport_stop_position=presets/transport/stop_position.svg
 public_transport_platform=presets/transport/platform.svg
 public_transport_share_taxi_stop=
 public_transport_train_station=presets/transport/station.svg
+public_transport_subway_station=
 public_transport_subway_entrance=presets/transport/underground.svg
 public_transport_ticket_machine=presets/transport/ticket-machine.svg
 public_transport_ticket_validator=
diff --git a/master_preset.xml b/master_preset.xml
index fefd82b2..6b4059a6 100644
--- a/master_preset.xml
+++ b/master_preset.xml
@@ -5898,7 +5898,7 @@
                 </checkgroup>
                 <text key="ref" text="Reference"/>
             </item> <!-- Subway platform -->
-            <item name="Subway station" name_context="railway" type="node,closedway,multipolygon" icon="transport_train_station2.png" preset_name_label="true">
+            <item name="Subway station" name_context="railway" type="node,closedway,multipolygon" icon="${public_transport_subway_station}" preset_name_label="true">
                 <reference ref="station"/>
                 <checkgroup text="Transportation type" columns="3">
                   <check key="bus" text="Bus" disable_off="true"/>

From e2b4ee82ea5af8a70b597a7ff6af3394075d6630 Mon Sep 17 00:00:00 2001
From: simonpoole <simon@poole.ch>
Date: Fri, 23 Feb 2024 16:48:48 +0100
Subject: [PATCH 10/11] Add icon for a subway platform

---
 beautified_icons.mapping                      |   1 +
 icons/png/transport_platform_subway.png       | Bin 0 -> 2309 bytes
 .../transport/platform_subway.svg             | 171 ++++++++++++++++++
 josm_icons.mapping                            |   1 +
 master_preset.xml                             |   2 +-
 5 files changed, 174 insertions(+), 1 deletion(-)
 create mode 100644 icons/png/transport_platform_subway.png
 create mode 100644 icons/svg-osm-icons/transport/platform_subway.svg

diff --git a/beautified_icons.mapping b/beautified_icons.mapping
index 08b8328f..db99f9b8 100644
--- a/beautified_icons.mapping
+++ b/beautified_icons.mapping
@@ -297,6 +297,7 @@ public_transport_stop_position=${ICONPATH}transport_bus_stop2.${ICONTYPE}
 public_transport_platform=${ICONPATH}transport_platform_32003.${ICONTYPE}
 public_transport_share_taxi_stop=${ICONPATH}transport_share_taxi.${ICONTYPE}
 public_transport_train_station=${ICONPATH}transport_train_station2.${ICONTYPE}
+public_transport_subway_platform=${ICONPATH}transport_platform_subway.${ICONTYPE}
 public_transport_subway_station=${ICONPATH}transport_subway.${ICONTYPE}
 public_transport_subway_entrance=${ICONPATH}transport_subway_entrance.${ICONTYPE}
 public_transport_ticket_machine=${ICONPATH}transport_ticket_29200.${ICONTYPE}
diff --git a/icons/png/transport_platform_subway.png b/icons/png/transport_platform_subway.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac2e7577e999d16c353b2719634eb10b5edd9b46
GIT binary patch
literal 2309
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

literal 0
HcmV?d00001

diff --git a/icons/svg-osm-icons/transport/platform_subway.svg b/icons/svg-osm-icons/transport/platform_subway.svg
new file mode 100644
index 00000000..d0e6cafe
--- /dev/null
+++ b/icons/svg-osm-icons/transport/platform_subway.svg
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="580"
+   height="580"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="platform_subway.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:language>en</dc:language>
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     inkscape:window-height="701"
+     inkscape:window-width="1440"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     guidetolerance="10.0"
+     gridtolerance="10.0"
+     objecttolerance="10.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     showgrid="false"
+     inkscape:zoom="1.01"
+     inkscape:cx="232.82943"
+     inkscape:cy="284.04921"
+     inkscape:window-x="234"
+     inkscape:window-y="234"
+     inkscape:current-layer="svg2"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3779" />
+  </sodipodi:namedview>
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 290 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="580 : 290 : 1"
+       inkscape:persp3d-origin="290 : 193.33333 : 1"
+       id="perspective12" />
+    <style
+       type="text/css"
+       id="style6">
+   
+    .fil0 {fill:#EF7900}
+   
+  </style>
+    <inkscape:perspective
+       id="perspective6807"
+       inkscape:persp3d-origin="29.116032 : 19.410688 : 1"
+       inkscape:vp_z="58.232063 : 29.116032 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 29.116032 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective6954"
+       inkscape:persp3d-origin="290 : 193.33333 : 1"
+       inkscape:vp_z="580 : 290 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 290 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <marker
+       viewBox="0 0 10 10"
+       refY="5"
+       refX="10"
+       orient="auto"
+       markerWidth="4"
+       markerUnits="strokeWidth"
+       markerHeight="3"
+       id="ArrowStart">
+      <path
+         id="path2295"
+         d="M 10 0 L 0 5 L 10 10 z" />
+    </marker>
+    <marker
+       viewBox="0 0 10 10"
+       refY="5"
+       refX="0"
+       orient="auto"
+       markerWidth="4"
+       markerUnits="strokeWidth"
+       markerHeight="3"
+       id="ArrowEnd">
+      <path
+         id="path2292"
+         d="M 0 0 L 10 5 L 0 10 z" />
+    </marker>
+    <inkscape:perspective
+       id="perspective7597"
+       inkscape:persp3d-origin="178.5405 : 158.483 : 1"
+       inkscape:vp_z="357.08099 : 237.7245 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 237.7245 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <g
+     id="g1327">
+    <path
+       d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.598,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.84 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.627,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z"
+       style="fill:#111111;stroke:#eeeeee;stroke-width:3.40799999"
+       id="path1329" />
+  </g>
+  <g
+     id="g2319"
+     transform="translate(879.29125,36.805119)">
+    <path
+       id="path2323"
+       style="fill:#ffffff;stroke:none"
+       d="" />
+  </g>
+  <g
+     id="g2325"
+     transform="translate(879.29125,36.805119)">
+    <path
+       id="path2329"
+       style="fill:#ffffff;stroke:none"
+       d="" />
+  </g>
+  <path
+     inkscape:connector-curvature="0"
+     style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.74806166"
+     d="m 293.98595,219.06712 h -21.52962 c -26.29368,0 -47.25023,21.52779 -47.25023,47.82205 v 97.35796 c 0,21.03515 13.50812,38.70365 32.38925,44.96386 v 15.05178 h 16.76622 v -12.00338 h 117.17311 v 12.00338 h 16.76623 v -14.47993 c 19.72189,-5.8151 34.10363,-23.8647 34.10363,-45.53571 v -97.35796 c 0,-26.29426 -20.95594,-47.82205 -47.25017,-47.82205 h -24.5774 z m 57.53851,0 h -38.2958 z m -89.73755,23.24403 h 140.41716 c 10.0012,0 18.67146,7.90815 18.67146,17.90934 v 66.30267 c 0,10.00118 -8.67026,17.90935 -18.67146,17.90935 H 261.78691 c -10.00118,0 -18.48063,-7.90817 -18.48063,-17.90935 v -66.30267 c 0,-10.00119 8.47945,-17.90934 18.48063,-17.90934 z m 5.14448,115.64893 c 8.25081,0 14.86092,6.80036 14.86092,15.05117 0,8.25077 -6.61011,14.86093 -14.86092,14.86093 -8.25081,0 -14.86092,-6.61016 -14.86092,-14.86093 0,-8.25081 6.61011,-15.05117 14.86092,-15.05117 z m 130.12822,0 c 8.25076,0 15.05178,6.80036 15.05178,15.05117 0,8.25077 -6.80102,14.86093 -15.05178,14.86093 -8.2508,0 -14.86097,-6.61016 -14.86097,-14.86093 0,-8.25081 6.61017,-15.05117 14.86097,-15.05117 z"
+     id="rect4085"
+     sodipodi:nodetypes="ccccccccccccccccccccccccccccccsssccsssc" />
+  <circle
+     r="205.81845"
+     cy="326.37872"
+     cx="291.57001"
+     style="opacity:0.5;fill:none;stroke:#ffffff;stroke-width:41.53925323;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+     id="path3478" />
+  <rect
+     style="opacity:0.5;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.97546053"
+     id="rect3480"
+     width="477.00766"
+     height="39.750637"
+     x="53.066864"
+     y="38.515812" />
+  <path
+     inkscape:connector-curvature="0"
+     d="m 169.50855,348.71957 v 22.62233 l -0.51279,3.15475 -9.97642,29.92925 c -1.74186,5.22704 -7.39213,8.05196 -12.61917,6.30967 -5.22704,-1.74187 -8.05196,-7.39231 -6.30968,-12.61935 l 9.46443,-28.39329 v -21.00336 c -5.9639,-3.44984 -9.97643,-9.89799 -9.97643,-17.28333 v -34.91748 c 0,-11.01974 8.9333,-19.95283 19.95285,-19.95283 4.1899,0 8.0781,1.29095 11.28831,3.49774 l 16.84898,9.12662 14.69047,-14.69068 c 3.89599,-3.89598 10.21266,-3.89598 14.10885,0 3.89599,3.896 3.89599,10.21286 0,14.10886 l -19.95284,19.95283 c -3.12182,3.12182 -7.92407,3.82057 -11.80609,1.71794 l -5.22484,-2.83011 v 22.80969 l 24.41448,12.20714 c 3.37982,1.69 5.51477,5.14444 5.51477,8.92331 v 29.92924 c 0,5.50979 -4.46664,9.97644 -9.97643,9.97644 -5.50977,0 -9.9764,-4.46665 -9.9764,-9.97644 v -23.76362 l -18.93306,-9.46662 c -0.33321,0.21948 -0.67241,0.43097 -1.01958,0.6325 z m -9.9764,-77.14185 c -11.01956,0 -19.95286,-8.93328 -19.95286,-19.95282 0,-11.01976 8.9333,-19.95285 19.95286,-19.95285 11.01975,0 19.95282,8.93309 19.95282,19.95285 0,11.01954 -8.93307,19.95282 -19.95282,19.95282 z"
+     id="path1447"
+     style="fill:#ffffff;fill-opacity:1;stroke-width:19.95283699"
+     sodipodi:nodetypes="ccccccccsssccccscccccssssccccsssss" />
+</svg>
diff --git a/josm_icons.mapping b/josm_icons.mapping
index 9f84d0ce..2adb4533 100644
--- a/josm_icons.mapping
+++ b/josm_icons.mapping
@@ -299,6 +299,7 @@ public_transport_stop_position=presets/transport/stop_position.svg
 public_transport_platform=presets/transport/platform.svg
 public_transport_share_taxi_stop=
 public_transport_train_station=presets/transport/station.svg
+public_transport_subway_platform=
 public_transport_subway_station=
 public_transport_subway_entrance=presets/transport/underground.svg
 public_transport_ticket_machine=presets/transport/ticket-machine.svg
diff --git a/master_preset.xml b/master_preset.xml
index 6b4059a6..2a8dabd7 100644
--- a/master_preset.xml
+++ b/master_preset.xml
@@ -5882,7 +5882,7 @@
                   <check key="ferry" text="Ferry" disable_off="true"/>
                 </checkgroup>
             </item> <!-- Railway station -->
-            <item name="Subway platform" type="node,way,closedway,multipolygon" icon="transport_platform_32003.png" preset_name_label="true">
+            <item name="Subway platform" type="node,way,closedway,multipolygon" icon="${public_transport_subway_platform}" preset_name_label="true">
                 <reference ref="platform"/>
                 <checkgroup text="Transportation type" columns="3">
                   <check key="bus" text="Bus" disable_off="true"/>

From e25a69591674fec460fceae30c15c046f7a33353 Mon Sep 17 00:00:00 2001
From: simonpoole <simon@poole.ch>
Date: Sat, 24 Feb 2024 12:27:31 +0100
Subject: [PATCH 11/11] Use existing icons for remaining new items and order
 things saner

---
 master_preset.xml | 63 ++++++++++++++++++++++-------------------------
 1 file changed, 30 insertions(+), 33 deletions(-)

diff --git a/master_preset.xml b/master_preset.xml
index 2a8dabd7..8d49ab9f 100644
--- a/master_preset.xml
+++ b/master_preset.xml
@@ -5799,10 +5799,9 @@
             <item name="Station" name_context="railway" type="node,closedway,multipolygon" icon="${public_transport_train_station}" preset_name_label="true">
                 <reference ref="station"/>
             </item> <!-- Station -->
-
             <separator/> <!-- *** Road-based modes *** -->
-            <item name="Bus stop" type="node,way,closedway,multipolygon" icon="transport_platform_32003.png" preset_name_label="true">
-                <reference ref="platform"/>
+            <item name="Bus station" type="node,closedway,multipolygon" icon="${public_transport_bus_station}" preset_name_label="true">
+                <reference ref="station"/>
                 <checkgroup text="Transportation type" columns="3">
                   <check key="bus" text="Bus" default="on" match="keyvalue!" disable_off="true"/>
                   <check key="tram" text="Tram" disable_off="true"/>
@@ -5815,10 +5814,9 @@
                   <check key="aerialway" text="Aerialway" disable_off="true"/>
                   <check key="ferry" text="Ferry" disable_off="true"/>
                 </checkgroup>
-                <text key="name" text="Name"/>
-            </item> <!-- Bus stop -->
-            <item name="Bus station" type="node,closedway,multipolygon" icon="transport_bus_station.png" preset_name_label="true">
-                <reference ref="station"/>
+            </item> <!-- Bus station -->
+            <item name="Bus stop" type="node,way,closedway,multipolygon" icon="${public_transport_bus_stop}" preset_name_label="true">
+                <reference ref="platform"/>
                 <checkgroup text="Transportation type" columns="3">
                   <check key="bus" text="Bus" default="on" match="keyvalue!" disable_off="true"/>
                   <check key="tram" text="Tram" disable_off="true"/>
@@ -5831,7 +5829,8 @@
                   <check key="aerialway" text="Aerialway" disable_off="true"/>
                   <check key="ferry" text="Ferry" disable_off="true"/>
                 </checkgroup>
-            </item> <!-- Bus station -->
+                <text key="name" text="Name"/>
+            </item> <!-- Bus stop -->
             <item name="Share taxi stop" type="node,way,closedway,multipolygon" icon="${public_transport_share_taxi_stop}" preset_name_label="true">
                 <reference ref="platform"/>
                 <checkgroup text="Transportation type" columns="3">
@@ -5848,10 +5847,10 @@
                 </checkgroup>
                 <text key="name" text="Name"/>
             </item> <!-- Share taxi stop -->
-
             <separator/> <!-- *** Railway-based modes *** -->
-            <item name="Railway platform" type="node,way,closedway,multipolygon" icon="transport_platform_32003.png" preset_name_label="true">
-                <reference ref="platform"/>
+            <item name="Railway station" name_context="railway" type="node,closedway,multipolygon" icon="${public_transport_train_station}" preset_name_label="true">
+                <reference ref="station"/>
+                <text key="ref" text="Reference"/>
                 <checkgroup text="Transportation type" columns="3">
                   <check key="bus" text="Bus" disable_off="true"/>
                   <check key="tram" text="Tram" disable_off="true"/>
@@ -5864,11 +5863,9 @@
                   <check key="aerialway" text="Aerialway" disable_off="true"/>
                   <check key="ferry" text="Ferry" disable_off="true"/>
                 </checkgroup>
-                <text key="ref" text="Reference"/>
-            </item> <!-- Railway platform -->
-            <item name="Railway station" name_context="railway" type="node,closedway,multipolygon" icon="transport_train_station2.png" preset_name_label="true">
-                <reference ref="station"/>
-                <text key="ref" text="Reference"/>
+            </item> <!-- Railway station -->
+            <item name="Railway platform" type="node,way,closedway,multipolygon" icon="${public_transport_railway_platform}" preset_name_label="true">
+                <reference ref="platform"/>
                 <checkgroup text="Transportation type" columns="3">
                   <check key="bus" text="Bus" disable_off="true"/>
                   <check key="tram" text="Tram" disable_off="true"/>
@@ -5881,9 +5878,10 @@
                   <check key="aerialway" text="Aerialway" disable_off="true"/>
                   <check key="ferry" text="Ferry" disable_off="true"/>
                 </checkgroup>
-            </item> <!-- Railway station -->
-            <item name="Subway platform" type="node,way,closedway,multipolygon" icon="${public_transport_subway_platform}" preset_name_label="true">
-                <reference ref="platform"/>
+                <text key="ref" text="Reference"/>
+            </item> <!-- Railway platform -->
+            <item name="Subway station" name_context="railway" type="node,closedway,multipolygon" icon="${public_transport_subway_station}" preset_name_label="true">
+                <reference ref="station"/>
                 <checkgroup text="Transportation type" columns="3">
                   <check key="bus" text="Bus" disable_off="true"/>
                   <check key="tram" text="Tram" disable_off="true"/>
@@ -5896,10 +5894,9 @@
                   <check key="aerialway" text="Aerialway" disable_off="true"/>
                   <check key="ferry" text="Ferry" disable_off="true"/>
                 </checkgroup>
-                <text key="ref" text="Reference"/>
-            </item> <!-- Subway platform -->
-            <item name="Subway station" name_context="railway" type="node,closedway,multipolygon" icon="${public_transport_subway_station}" preset_name_label="true">
-                <reference ref="station"/>
+            </item> <!-- Subway station -->
+            <item name="Subway platform" type="node,way,closedway,multipolygon" icon="${public_transport_subway_platform}" preset_name_label="true">
+                <reference ref="platform"/>
                 <checkgroup text="Transportation type" columns="3">
                   <check key="bus" text="Bus" disable_off="true"/>
                   <check key="tram" text="Tram" disable_off="true"/>
@@ -5912,9 +5909,8 @@
                   <check key="aerialway" text="Aerialway" disable_off="true"/>
                   <check key="ferry" text="Ferry" disable_off="true"/>
                 </checkgroup>
-            </item> <!-- Subway station -->
-
-            <separator/> <!-- *** Access *** -->
+                <text key="ref" text="Reference"/>
+            </item> <!-- Subway platform -->                       
             <item name="Subway Entrance" icon="${public_transport_subway_entrance}" type="node" preset_name_label="true">
                 <link wiki="Tag:railway=subway_entrance"/>
                 <key key="railway" value="subway_entrance"/>
@@ -5925,6 +5921,7 @@
                     <check key="bicycle" text="Bicycle" disable_off="true"/>
                 </optional>
             </item> <!-- Subway Entrance -->
+            <separator/>
             <item name="Ticket Machine" icon="${public_transport_ticket_machine}" type="node" preset_name_label="true">
                 <link wiki="Tag:amenity=vending_machine"/>
                 <space/>
@@ -6033,13 +6030,6 @@
                     <text key="name" text="Name"/>
                 </optional>
             </item> <!-- Railway Halt -->
-            <item name="Tram Stop" icon="${public_transport_tram_stop}" type="node" preset_name_label="true">
-                <link wiki="Tag:railway=tram_stop"/>
-                <key key="railway" value="tram_stop"/>
-                <optional>
-                    <text key="name" text="Name"/>
-                </optional>
-            </item> <!-- Tram Stop -->
             <item name="Railway Platform" icon="${public_transport_railway_platform}" type="way,closedway,multipolygon" preset_name_label="true">
                 <link wiki="Tag:railway=platform"/>
                 <space/>
@@ -6048,6 +6038,13 @@
                 <text key="width" text="Width (meters)" value_type="dimension_horizontal"/>
                 <check key="area" text="Area" disable_off="true"/>    
             </item> <!-- Railway Platform -->
+            <item name="Tram Stop" icon="${public_transport_tram_stop}" type="node" preset_name_label="true">
+                <link wiki="Tag:railway=tram_stop"/>
+                <key key="railway" value="tram_stop"/>
+                <optional>
+                    <text key="name" text="Name"/>
+                </optional>
+            </item> <!-- Tram Stop -->
             <separator/>
             <item name="Bus Station" icon="${public_transport_bus_station}" type="node,closedway,multipolygon" preset_name_label="true">
                 <link wiki="Tag:amenity=bus_station"/>