Index: trunk/presets/presets.xml
===================================================================
--- trunk/presets/presets.xml	(revision 1373)
+++ trunk/presets/presets.xml	(revision 1374)
@@ -208,5 +208,5 @@
                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
                 <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
-                <text key="width" text="Width (metres)" default="" delete_if_empty="true" />
+                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
             </optional>
         </item>
@@ -226,5 +226,5 @@
                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
                 <combo key="surface" text="Surface" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" />
-                <text key="width" text="Width (metres)" default="" delete_if_empty="true" />
+                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
             </optional>
         </item>
@@ -244,5 +244,5 @@
                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
                 <combo key="surface" text="Surface" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" />
-                <text key="width" text="Width (metres)" default="" delete_if_empty="true" />
+                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
             </optional>
         </item>
@@ -254,4 +254,5 @@
             <key key="highway" value="service" />
             <optional>
+                <combo key="service" text="Serviceway type" values="alley,driveway,parking_aisle" default="" delete_if_empty="true" />
                 <text key="name" text="Name" default="" delete_if_empty="true" />
                 <check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
@@ -263,5 +264,5 @@
                 <combo key="surface" text="Surface" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" />
                 <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
-                <text key="width" text="Width (metres)" default="" delete_if_empty="true" />
+                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
             </optional>
         </item>
@@ -295,5 +296,5 @@
                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
                 <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
-                <text key="width" text="Width (metres)" default="" delete_if_empty="true" />
+                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
             </optional>
         </item>
@@ -318,7 +319,7 @@
             <text key="minspeed" text="Min. speed (km/h)" default="" delete_if_empty="true" />
             <text key="maxweight" text="Max. weight (tonnes)" default="" delete_if_empty="true" />
-            <text key="maxheight" text="Max. Height (metres)" default="" delete_if_empty="true" />
-            <text key="maxwidth" text="Max. Width (metres)" default="" delete_if_empty="true" />
-            <text key="maxlength" text="Max. Length (metres)" default="" delete_if_empty="true" />
+            <text key="maxheight" text="Max. Height (meters)" default="" delete_if_empty="true" />
+            <text key="maxwidth" text="Max. Width (meters)" default="" delete_if_empty="true" />
+            <text key="maxlength" text="Max. Length (meters)" default="" delete_if_empty="true" />
         </item>
         <item name="Roundabout" icon="presets/roundabout.png">
@@ -340,5 +341,5 @@
                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
                 <combo key="lanes" text="Lanes" values="1,2,3,4,5" default="" delete_if_empty="true" />
-                <text key="width" text="Width (metres)" default="" delete_if_empty="true" />
+                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
             </optional>
         </item>
@@ -356,6 +357,20 @@
                 <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
                 <text key="maxweight" text="Max. weight (tonnes)" default="" delete_if_empty="true" />
-                <text key="width" text="Width (metres)" default="" delete_if_empty="true" />
-            </optional>
+                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
+            </optional>
+        </item>
+        <item name="Tunnel" icon="presets/tunnel.png">
+             <label text="Edit a Tunnel"/>
+             <link href="http://wiki.openstreetmap.org/wiki/Key:tunnel"
+                  de:href="http://wiki.openstreetmap.org/wiki/DE:Key:tunnel"
+                  fi:href="http://wiki.openstreetmap.org/wiki/Fi:Key:tunnel" />
+             <space />
+             <key key="tunnel" value="yes" />
+             <optional>
+                 <text key="name" text="Name" default="" delete_if_empty="true" />
+                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="-1" delete_if_empty="true" />
+                 <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
+                 <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
+             </optional>
         </item>
     </group> <!-- Streets -->
@@ -380,5 +395,5 @@
                 <combo key="junction" text="Junction" values="roundabout" default="" delete_if_empty="true" />
                 <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
-                <text key="width" text="Width (metres)" default="" delete_if_empty="true" />
+                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
             </optional>
         </item>
@@ -399,5 +414,5 @@
                 <combo key="surface" text="Surface" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" />
                 <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
-                <text key="width" text="Width (metres)" default="" delete_if_empty="true" />
+                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
             </optional>
         </item>
@@ -419,5 +434,5 @@
                 <combo key="surface" text="Surface" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" />
                 <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
-                <text key="width" text="Width (metres)" default="" delete_if_empty="true" />
+                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
             </optional>
         </item>
@@ -438,5 +453,5 @@
                 <combo key="surface" text="Surface" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" />
                 <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
-                <text key="width" text="Width (metres)" default="" delete_if_empty="true" />
+                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
             </optional>
         </item>
@@ -456,5 +471,5 @@
                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
                 <combo key="surface" text="Surface" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" />
-                <text key="width" text="Width (metres)" default="" delete_if_empty="true" />
+                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
             </optional>
         </item>
@@ -476,5 +491,5 @@
                 <combo key="surface" text="Surface" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" />
                 <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
-                <text key="width" text="Width (metres)" default="" delete_if_empty="true" />
+                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
             </optional>
         </item>
@@ -497,5 +512,5 @@
                 <combo key="motorcycle" text="Motorcycle" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
                 <combo key="motorcar" text="Motorcar" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
-                <text key="width" text="Width (metres)" default="" delete_if_empty="true" />
+                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
             </optional>
         </item>
@@ -518,5 +533,5 @@
                 <combo key="motorcycle" text="Motorcycle" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
                 <combo key="motorcar" text="Motorcar" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
-                <text key="width" text="Width (metres)" default="" delete_if_empty="true" />
+                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
             </optional>
         </item>
@@ -539,5 +554,5 @@
                 <combo key="motorcycle" text="Motorcycle" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
                 <combo key="motorcar" text="Motorcar" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
-                <text key="width" text="Width (metres)" default="" delete_if_empty="true" />
+                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
             </optional>
         </item>
@@ -560,5 +575,5 @@
                 <combo key="motorcycle" text="Motorcycle" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
                 <combo key="motorcar" text="Motorcar" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
-                <text key="width" text="Width (metres)" default="" delete_if_empty="true" />
+                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
             </optional>
         </item>
@@ -581,5 +596,5 @@
                 <combo key="motorcycle" text="Motorcycle" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
                 <combo key="motorcar" text="Motorcar" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
-                <text key="width" text="Width (metres)" default="" delete_if_empty="true" />
+                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
             </optional>
         </item>
@@ -602,5 +617,5 @@
                 <combo key="motorcycle" text="Motorcycle" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
                 <combo key="motorcar" text="Motorcar" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
-                <text key="width" text="Width (metres)" default="" delete_if_empty="true" />
+                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
             </optional>
         </item>
@@ -630,5 +645,5 @@
                 <combo key="surface" text="Surface" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" />
                 <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
-                <text key="width" text="Width (metres)" default="" delete_if_empty="true" />
+                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
             </optional>
         </item>
@@ -643,5 +658,5 @@
             <optional>
                 <text key="name" text="Name" default="" delete_if_empty="true" />
-                <text key="width" text="Width (metres)" default="" delete_if_empty="true" />
+                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
             </optional>
         </item>
@@ -656,5 +671,5 @@
             <optional>
                 <text key="name" text="Name" default="" delete_if_empty="true" />
-                <text key="width" text="Width (metres)" default="" delete_if_empty="true" />
+                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
             </optional>
         </item>
@@ -669,5 +684,5 @@
             <optional>
                 <text key="name" text="Name" default="" delete_if_empty="true" />
-                <text key="width" text="Width (metres)" default="" delete_if_empty="true" />
+                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
             </optional>
         </item>
@@ -682,5 +697,5 @@
             <optional>
                 <text key="name" text="Name" default="" delete_if_empty="true" />
-                <text key="width" text="Width (metres)" default="" delete_if_empty="true" />
+                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
             </optional>
         </item>
@@ -695,5 +710,5 @@
             <optional>
                 <text key="name" text="Name" default="" delete_if_empty="true" />
-                <text key="width" text="Width (metres)" default="" delete_if_empty="true" />
+                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
             </optional>
         </item>
@@ -708,5 +723,5 @@
             <optional>
                 <text key="name" text="Name" default="" delete_if_empty="true" />
-                <text key="width" text="Width (metres)" default="" delete_if_empty="true" />
+                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
             </optional>
         </item>
@@ -742,23 +757,32 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=traffic_signals" />
             <key key="highway" value="traffic_signals" />
+            <optional>
+                 <combo key="crossing" text="Pedestrian crossing type" values="uncontrolled,traffic_signals,island,unmarked,no,unknown" default="" delete_if_empty="true" />
+                 <check key="horse" text="Cross on horseback" default="off" delete_if_empty="true" />
+                 <check key="bicycle" text="Cross by bicycle" default="off" delete_if_empty="true" />
+                 <check key="supervised" text="Crossing attendant" default="off" delete_if_empty="true" />
+                 <combo key="crossing_ref" text="Crossing type name (UK)" values="zebra,pelican,toucan,puffin,pegasus,tiger" default="" delete_if_empty="true" />
+            </optional>
         </item>
         <item name="Stop" icon="presets/Stop.png">
             <key key="highway" value="stop" />
         </item>
-        <item name="Zebra Crossing" icon="presets/zebracrossing.png">
+        <item name="Pedestrian Crossing" icon="presets/zebracrossing.png">
             <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
                   de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
             <label text="Edit a crossing" />
             <key key="highway" value="crossing" />
-            <combo key="crossing" text="Type" values="uncontrolled,island" default="uncontrolled" />
-            <combo key="crossing_ref" text="Ref" values="zebra,pelican" default="zebra" />
-            <check key="foot" text="Foot" default="on" delete_if_empty="true" />
-            <check key="bicycle" text="Bicycle" default="off" delete_if_empty="true" />
-        </item>
-        <item name="Mini Roundabout" icon="presets/roundabout_left.png">
+            <combo key="crossing" text="Type" values="uncontrolled,traffic_signals,island,unmarked,no,unknown" default="" delete_if_empty="true" />
+            <check key="bicycle" text="Cross by bicycle" default="off" delete_if_empty="true" />
+            <check key="horse" text="Cross on horseback" default="off" delete_if_empty="true" />
+            <check key="supervised" text="Crossing attendant" default="off" delete_if_empty="true" />
+            <combo key="crossing_ref" text="Type name (UK)" values="zebra,pelican,toucan,puffin,pegasus,tiger" default="" delete_if_empty="true" />
+        </item>
+        <item name="Mini-roundabout" icon="presets/roundabout_left.png">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=mini_roundabout"
                   de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=mini_roundabout"
                   it:href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
             <key key="highway" value="mini_roundabout" />
+            <combo key="direction" text="Clockwise direction?" values="clockwise" default="" delete_if_empty="true" />
         </item>
         <item name="Turning Circle" icon="presets/turning_circle.png">
@@ -876,5 +900,5 @@
         </item> <!-- cattle_grid -->
         <item name="Spikes" icon="presets/empty.png">
-            <label text="Edit a Spikes" />
+            <label text="Edit Spikes" />
             <space />
             <key key="barrier" value="spikes" />
@@ -1183,5 +1207,5 @@
                 <combo key="surface" text="Surface" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" />
                 <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
-                <text key="width" text="Width (metres)" default="" delete_if_empty="true" />
+                <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
             </optional>
         </item>
@@ -1204,4 +1228,10 @@
             <link href="http://wiki.openstreetmap.org/wiki/Key:crossing" />
             <key key="railway" value="crossing" />
+            <optional>
+                 <combo key="crossing" text="Crossing type" values="uncontrolled,traffic_signals,island,unmarked,no,unknown" default="" delete_if_empty="true" />
+                 <check key="horse" text="Cross on horseback" default="off" delete_if_empty="true" />
+                 <check key="bicycle" text="Cross by bicycle" default="off" delete_if_empty="true" />
+                 <check key="supervised" text="Crossing attendant" default="off" delete_if_empty="true" />
+            </optional>
         </item>
         <item name="Turntable" icon="presets/turntable.png">
@@ -1298,4 +1328,5 @@
             <key key="amenity" value="bicycle_parking" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="capacity" text="Capacity" default="" delete_if_empty="true" />
         </item>
         <item name="Rental" icon="presets/bicycle_rental.png">
@@ -1352,5 +1383,5 @@
             <space />
             <text key="Ref" text="Reference (track number)" default="" delete_if_empty="true" />
-            <text key="width" text="Width (metres)" default="" delete_if_empty="true" />
+            <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
             <check key="area" text="Area" default="off" delete_if_empty="true" />
         </item>
@@ -1393,5 +1424,5 @@
             <space />
             <text key="Ref" text="Reference (track number)" default="" delete_if_empty="true" />
-            <text key="width" text="Width (metres)" default="" delete_if_empty="true" />
+            <text key="width" text="Width (meters)" default="" delete_if_empty="true" />
             <check key="area" text="Area" default="off" delete_if_empty="true" />
         </item>
@@ -2421,5 +2452,5 @@
             <label text="Edit Automated Teller Machine" />
             <key key="amenity" value="atm" />
-            <text key="name" text="Provider" default="" delete_if_empty="true" />
+            <text key="operator" text="Operator" default="" delete_if_empty="true" />
         </item>
     </group> <!-- Cash -->