Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 6812)
+++ trunk/data/defaultpresets.xml	(revision 6813)
@@ -2619,8 +2619,9 @@
         <item name="Public transport route" icon="presets/path.png" type="relation">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Route" />
-            <label text="Edit Route" />
+            <label text="Edit public transport route" />
             <space />
             <key key="type" value="route" />
             <combo key="route" text="Route type" values="train,subway,monorail,tram,bus,trolleybus,aerialway,ferry" values_searchable="true" match="keyvalue" />
+            <key key="public_transport:version" value="2" /> <!-- only validate marked relations in order to avoid false positives -->
             <reference ref="name_ref" />
             <optional>
@@ -2783,4 +2784,29 @@
     </group>
     <group name="Public Transport (legacy)" icon="presets/bus.png">
+        <item name="Public transport route (legacy)" icon="presets/path.png" type="relation">
+            <label text="Edit Public transport route (legacy)" />
+            <key key="type" value="route" />
+            <combo key="route" text="Route type" values="train,subway,monorail,tram,bus,trolleybus,aerialway,ferry" values_searchable="true" match="keyvalue" />
+            <key key="public_transport:version" value="1" /> <!-- only validate marked relations in order to avoid false positives -->
+            <reference ref="name_ref" />
+            <optional>
+                <text key="from" text="From (initial stop)" />
+                <text key="to" text="To (terminal stop)" />
+                <text key="via" text="Via (intermediate stops)" />
+                <text key="operator" text="Operator" />
+                <text key="network" text="Network" />
+                <text key="description" text="Description" />
+                <combo key="colour" text="Color (HTML name or hexadecimal code)" values_context="color" values="black,brown,green,red,blue,gray,white,#CD853F" />
+            </optional>
+            <roles>
+                <role key="" text="route segment" requisite="optional" type="way" />
+                <role key="forward" text="forward segment" requisite="optional" type="way" />
+                <role key="backward" text="backward segment" requisite="optional" type="way" />
+                <role key="stop" text="halt point" requisite="optional" type="node" member_expression="highway=bus_stop OR railway=station OR railway=halt railway=tram_stop" />
+                <role key="forward_stop" text="forward halt point" requisite="optional" type="node" member_expression="highway=bus_stop OR railway=station OR railway=halt railway=tram_stop" />
+                <role key="backward_stop" text="backward halt point" requisite="optional" type="node" member_expression="highway=bus_stop OR railway=station OR railway=halt railway=tram_stop" />
+                <role key="platform" text="platform" requisite="optional" type="node,way,closedway" member_expression="highway=platform OR railway=platform" />
+            </roles>
+        </item>
         <item name="Station" name_context="railway" icon="styles/standard/transport/railway_station.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"