Index: /trunk/presets/presets.xml
===================================================================
--- /trunk/presets/presets.xml	(revision 1563)
+++ /trunk/presets/presets.xml	(revision 1564)
@@ -826,35 +826,6 @@
     </group> <!-- Waypoints -->
     <group name="Barriers" icon="presets/barrier.png">
-        <item name="Stile" icon="presets/stile.png" type="node">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-            <label text="Edit Stile" />
-            <space />
-            <key key="barrier" value="stile" />
-            <label text="Allowed traffic:" />
-            <space />
-            <check key="foot" text="Foot" default="on" delete_if_empty="true" />
-            <check key="bicycle" text="Bicycle" default="off" delete_if_empty="true" />
-        </item> <!-- stile -->
-        <item name="Kissing Gate" icon="presets/empty.png" type="node">
-            <label text="Edit Kissing Gate" />
-            <space />
-            <key key="barrier" value="kissing_gate" />
-            <label text="Allowed traffic:" />
-            <space />
-            <check key="foot" text="Foot" default="on" delete_if_empty="true" />
-            <check key="bicycle" text="Bicycle" default="off" delete_if_empty="true" />
-        </item> <!-- kissing_gate -->
-        <item name="Hampshire Gate" icon="presets/empty.png" type="node">
-            <label text="Edit Hampshire Gate" />
-            <space />
-            <key key="barrier" value="hampshire_gate" />
-            <label text="Allowed traffic:" />
-            <space />
-            <check key="foot" text="Foot" default="on" delete_if_empty="true" />
-            <check key="bicycle" text="Bicycle" default="on" delete_if_empty="true" />
-            <check key="horse" text="Horse" default="off" delete_if_empty="true" />
-            <check key="motorcycle" text="Motorcycle" default="off" delete_if_empty="true" />
-            <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
-        </item> <!-- hampshire_gate -->
+
+        <!-- *** node barriers *** -->    
         <item name="Bollard" icon="presets/bollard.png" type="node,way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
@@ -869,19 +840,11 @@
             <check key="motorcycle" text="Motorcycle" default="off" delete_if_empty="true" />
         </item> <!-- bollard -->
-        <item name="Drawbridge" icon="presets/empty.png" type="node">
-            <label text="Edit Drawbridge" />
-            <space />
-            <key key="barrier" value="drawbridge" />
-            <label text="Allowed traffic:" />
-            <space />
-            <check key="foot" text="Foot" default="on" delete_if_empty="true" />
-            <check key="bicycle" text="Bicycle" default="on" delete_if_empty="true" />
-            <check key="horse" text="Horse" default="off" delete_if_empty="true" />
-            <check key="motorcycle" text="Motorcycle" default="off" delete_if_empty="true" />
-            <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
-        </item> <!-- drawbridge -->
-        <item name="Bus Trap" icon="presets/empty.png" type="node">
-            <key key="barrier" value="bus_trap" />
-        </item> <!-- bus_trap -->
+        <item name="Cycle Barrier" icon="presets/empty.png" type="node">
+            <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
+            <key key="barrier" value="cycle_barrier" />
+        </item> <!-- cycle_barrier -->
+        <item name="Block" icon="presets/empty.png" type="node,way,closedway">
+            <key key="barrier" value="block" />
+        </item> <!-- block -->
         <item name="Cattle Grid" icon="presets/cattle_grid.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
@@ -896,4 +859,7 @@
             <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
         </item> <!-- cattle_grid -->
+        <item name="Bus Trap" icon="presets/empty.png" type="node">
+            <key key="barrier" value="bus_trap" />
+        </item> <!-- bus_trap -->
         <item name="Spikes" icon="presets/empty.png" type="node">
             <label text="Edit Spikes" />
@@ -908,19 +874,18 @@
             <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
         </item> <!-- spikes -->
-        <item name="Portcullis" icon="presets/empty.png" type="node">
-            <label text="Edit Portcullis" />
-            <space />
-            <key key="barrier" value="portcullis" />
-            <label text="Allowed traffic:" />
-            <space />
-            <check key="horse" text="Horse" default="off" delete_if_empty="true" />
-            <check key="motorcycle" text="Motorcycle" default="off" delete_if_empty="true" />
-            <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
-        </item> <!-- portcullis -->
-        <item name="Gate" icon="presets/gate.png" type="node">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-            <label text="Edit Gate" />
-            <space />
-            <key key="barrier" value="gate" />
+        <item name="Toll Booth" icon="presets/toll_station.png" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
+            <label text="Edit Toll Booth" />
+            <space />
+            <key key="barrier" value="toll_booth" />
+            <optional>
+                <text key="name" text="Name" default="" delete_if_empty="true" />
+                <text key="operator" text="Operator" default="" delete_if_empty="true" />
+            </optional>
+        </item> <!-- toll_booth -->
+        <item name="Border Control" icon="presets/douane.png" type="node">
+            <label text="Edit Border Control" />
+            <space />
+            <key key="barrier" value="border_control" />
             <label text="Allowed traffic:" />
             <space />
@@ -930,45 +895,8 @@
             <check key="motorcycle" text="Motorcycle" default="off" delete_if_empty="true" />
             <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
-        </item> <!-- gate -->
-        <item name="Lift Gate" icon="presets/lift_gate.png" type="node">
-            <label text="Edit Lift Gate" />
-            <space />
-            <key key="barrier" value="lift_gate" />
-            <label text="Allowed traffic:" />
-            <space />
-            <check key="foot" text="Foot" default="on" delete_if_empty="true" />
-            <check key="bicycle" text="Bicycle" default="on" delete_if_empty="true" />
-            <check key="horse" text="Horse" default="off" delete_if_empty="true" />
-            <check key="motorcycle" text="Motorcycle" default="off" delete_if_empty="true" />
-            <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
-        </item> <!-- lift_gate -->
-        <item name="Sally Port" icon="presets/empty.png" type="node">
-            <label text="Edit Sally Port" />
-            <space />
-            <key key="barrier" value="sally_port" />
-            <label text="Allowed traffic:" />
-            <space />
-            <check key="foot" text="Foot" default="on" delete_if_empty="true" />
-            <check key="bicycle" text="Bicycle" default="on" delete_if_empty="true" />
-            <check key="horse" text="Horse" default="off" delete_if_empty="true" />
-            <check key="motorcycle" text="Motorcycle" default="off" delete_if_empty="true" />
-            <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
-        </item> <!-- sally_port -->
-        <item name="Bump Gate" icon="presets/empty.png" type="node">
-            <label text="Edit Bump Gate" />
-            <space />
-            <key key="barrier" value="bump_gate" />
-            <label text="Allowed traffic:" />
-            <space />
-            <check key="foot" text="Foot" default="on" delete_if_empty="true" />
-            <check key="bicycle" text="Bicycle" default="on" delete_if_empty="true" />
-            <check key="horse" text="Horse" default="off" delete_if_empty="true" />
-            <check key="motorcycle" text="Motorcycle" default="off" delete_if_empty="true" />
-            <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
-        </item> <!-- bump_gate -->
-        <item name="Cycle Barrier" icon="presets/empty.png" type="node">
-            <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
-            <key key="barrier" value="cycle_barrier" />
-        </item> <!-- bump_gate -->
+        </item> <!-- border_control -->
+        <separator/>
+        
+        <!-- *** linear barriers *** -->    
         <item name="Hedge" icon="presets/empty.png" type="way,closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
@@ -979,7 +907,4 @@
             <key key="barrier" value="fence" />
         </item> <!-- fence -->
-        <item name="Block" icon="presets/empty.png" type="node,way,closedway">
-            <key key="barrier" value="block" />
-        </item> <!-- block -->
         <item name="Wall" icon="presets/empty.png" type="way,closedway">
             <key key="barrier" value="wall" />
@@ -993,27 +918,7 @@
             <key key="barrier" value="retaining_wall" />
         </item> <!-- retaining_wall -->
-        <item name="Toll Booth" icon="presets/toll_station.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-            <label text="Edit Toll Booth" />
-            <space />
-            <key key="barrier" value="toll_booth" />
-            <optional>
-                <text key="name" text="Name" default="" delete_if_empty="true" />
-                <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            </optional>
-        </item> <!-- toll_booth -->
-        <item name="Border Control" icon="presets/douane.png" type="node">
-            <label text="Edit Border Control" />
-            <space />
-            <key key="barrier" value="border_control" />
-            <label text="Allowed traffic:" />
-            <space />
-            <check key="foot" text="Foot" default="on" delete_if_empty="true" />
-            <check key="bicycle" text="Bicycle" default="on" delete_if_empty="true" />
-            <check key="horse" text="Horse" default="off" delete_if_empty="true" />
-            <check key="motorcycle" text="Motorcycle" default="off" delete_if_empty="true" />
-            <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
-        </item> <!-- border_control -->
-        <separator/>
+        <separator/>
+        
+        <!-- *** access *** -->    
         <item name="Entrance" icon="presets/empty.png" type="node">
             <label text="Edit Entrance" />
@@ -1028,4 +933,85 @@
             <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
         </item> <!-- entrance -->
+        <item name="Gate" icon="presets/gate.png" type="node">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
+            <label text="Edit Gate" />
+            <space />
+            <key key="barrier" value="gate" />
+            <label text="Allowed traffic:" />
+            <space />
+            <check key="foot" text="Foot" default="on" delete_if_empty="true" />
+            <check key="bicycle" text="Bicycle" default="on" delete_if_empty="true" />
+            <check key="horse" text="Horse" default="off" delete_if_empty="true" />
+            <check key="motorcycle" text="Motorcycle" default="off" delete_if_empty="true" />
+            <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
+        </item> <!-- gate -->
+        <item name="Lift Gate" icon="presets/lift_gate.png" type="node">
+            <label text="Edit Lift Gate" />
+            <space />
+            <key key="barrier" value="lift_gate" />
+            <label text="Allowed traffic:" />
+            <space />
+            <check key="foot" text="Foot" default="on" delete_if_empty="true" />
+            <check key="bicycle" text="Bicycle" default="on" delete_if_empty="true" />
+            <check key="horse" text="Horse" default="off" delete_if_empty="true" />
+            <check key="motorcycle" text="Motorcycle" default="off" delete_if_empty="true" />
+            <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
+        </item> <!-- lift_gate -->
+        <item name="Hampshire Gate" icon="presets/empty.png" type="node">
+            <label text="Edit Hampshire Gate" />
+            <space />
+            <key key="barrier" value="hampshire_gate" />
+            <label text="Allowed traffic:" />
+            <space />
+            <check key="foot" text="Foot" default="on" delete_if_empty="true" />
+            <check key="bicycle" text="Bicycle" default="on" delete_if_empty="true" />
+            <check key="horse" text="Horse" default="off" delete_if_empty="true" />
+            <check key="motorcycle" text="Motorcycle" default="off" delete_if_empty="true" />
+            <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
+        </item> <!-- hampshire_gate -->
+        <item name="Bump Gate" icon="presets/empty.png" type="node">
+            <label text="Edit Bump Gate" />
+            <space />
+            <key key="barrier" value="bump_gate" />
+            <label text="Allowed traffic:" />
+            <space />
+            <check key="foot" text="Foot" default="on" delete_if_empty="true" />
+            <check key="bicycle" text="Bicycle" default="on" delete_if_empty="true" />
+            <check key="horse" text="Horse" default="off" delete_if_empty="true" />
+            <check key="motorcycle" text="Motorcycle" default="off" delete_if_empty="true" />
+            <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
+        </item> <!-- bump_gate -->
+        <item name="Kissing Gate" icon="presets/empty.png" type="node">
+            <label text="Edit Kissing Gate" />
+            <space />
+            <key key="barrier" value="kissing_gate" />
+            <label text="Allowed traffic:" />
+            <space />
+            <check key="foot" text="Foot" default="on" delete_if_empty="true" />
+            <check key="bicycle" text="Bicycle" default="off" delete_if_empty="true" />
+        </item> <!-- kissing_gate -->
+        <item name="Stile" icon="presets/stile.png" type="node">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
+            <label text="Edit Stile" />
+            <space />
+            <key key="barrier" value="stile" />
+            <label text="Allowed traffic:" />
+            <space />
+            <check key="foot" text="Foot" default="on" delete_if_empty="true" />
+            <check key="bicycle" text="Bicycle" default="off" delete_if_empty="true" />
+        </item> <!-- stile -->
+        <item name="Sally Port" icon="presets/empty.png" type="node">
+            <label text="Edit Sally Port" />
+            <space />
+            <key key="barrier" value="sally_port" />
+            <label text="Allowed traffic:" />
+            <space />
+            <check key="foot" text="Foot" default="on" delete_if_empty="true" />
+            <check key="bicycle" text="Bicycle" default="on" delete_if_empty="true" />
+            <check key="horse" text="Horse" default="off" delete_if_empty="true" />
+            <check key="motorcycle" text="Motorcycle" default="off" delete_if_empty="true" />
+            <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
+        </item> <!-- sally_port -->
+        
     </group> <!-- Barriers -->
     <separator/>