Index: trunk/presets/presets.xml
===================================================================
--- trunk/presets/presets.xml	(revision 1393)
+++ trunk/presets/presets.xml	(revision 1394)
@@ -300,5 +300,5 @@
         </item>
         <separator/>
-        <item name="Road Restrictions" icon="presets/restrictions.png">
+        <item name="Road Restrictions" icon="presets/restrictions.png" type="node,way">
             <label text="Edit Road Restrictions" />
             <check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
@@ -323,5 +323,5 @@
             <text key="maxlength" text="Max. Length (meters)" default="" delete_if_empty="true" />
         </item>
-        <item name="Roundabout" icon="presets/roundabout.png">
+        <item name="Roundabout" icon="presets/roundabout.png" type="closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:junction=roundabout"
                   de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:junction=roundabout"
@@ -344,5 +344,5 @@
             </optional>
         </item>
-        <item name="Bridge" icon="presets/bridge.png">
+        <item name="Bridge" icon="presets/bridge.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Key:bridge"
                   de:href="http://wiki.openstreetmap.org/wiki/DE:Key:bridge"
@@ -360,5 +360,5 @@
             </optional>
         </item>
-        <item name="Tunnel" icon="presets/tunnel.png">
+        <item name="Tunnel" icon="presets/tunnel.png" type="way">
             <label text="Edit a Tunnel"/>
             <link href="http://wiki.openstreetmap.org/wiki/Key:tunnel"
@@ -376,5 +376,5 @@
     </group> <!-- Streets -->
     <group name="Ways" icon="presets/way_unclassified.png">
-        <item name="Construction" icon="presets/construction.png">
+        <item name="Construction" icon="presets/construction.png" type="way">
             <label text="Edit a highway under construction" />
 <!--     FIXME: no entry in the Wiki
@@ -399,5 +399,5 @@
         </item>
         <separator/>
-        <item name="Bridleway" icon="presets/equestrian.png">
+        <item name="Bridleway" icon="presets/equestrian.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
             <label text="Edit a Bridleway" />
@@ -417,5 +417,5 @@
             </optional>
         </item>
-        <item name="Cycleway" icon="presets/cycleway.png">
+        <item name="Cycleway" icon="presets/cycleway.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cycleway"
                   de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
@@ -437,5 +437,5 @@
             </optional>
         </item>
-        <item name="Footway" icon="presets/footway.png">
+        <item name="Footway" icon="presets/footway.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
                   de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
@@ -456,5 +456,5 @@
             </optional>
         </item>
-        <item name="Pedestrian" icon="presets/pedestrian.png">
+        <item name="Pedestrian" icon="presets/pedestrian.png" type="way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
                   de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
@@ -474,5 +474,5 @@
             </optional>
         </item>
-        <item name="Steps" icon="presets/steps.png">
+        <item name="Steps" icon="presets/steps.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=steps"
                   de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
@@ -495,5 +495,5 @@
         </item>
         <separator/>
-        <item name="Track" icon="presets/track1.png">
+        <item name="Track" icon="presets/track1.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
                   de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
@@ -515,5 +515,5 @@
             </optional>
         </item>
-        <item name="Track Grade 1" icon="presets/track1.png">
+        <item name="Track Grade 1" icon="presets/track1.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
                   de:href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
@@ -536,5 +536,5 @@
             </optional>
         </item>
-        <item name="Track Grade 2" icon="presets/track2.png">
+        <item name="Track Grade 2" icon="presets/track2.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
                   de:href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
@@ -557,5 +557,5 @@
             </optional>
         </item>
-        <item name="Track Grade 3" icon="presets/track3.png">
+        <item name="Track Grade 3" icon="presets/track3.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
                   de:href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
@@ -578,5 +578,5 @@
             </optional>
         </item>
-        <item name="Track Grade 4" icon="presets/track4.png">
+        <item name="Track Grade 4" icon="presets/track4.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
                   de:href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
@@ -599,5 +599,5 @@
             </optional>
         </item>
-        <item name="Track Grade 5" icon="presets/track5.png">
+        <item name="Track Grade 5" icon="presets/track5.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
                   de:href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
@@ -621,5 +621,5 @@
         </item>
         <separator/>
-        <item name="Path" icon="presets/path.png">
+        <item name="Path" icon="presets/path.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
                   de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
@@ -648,5 +648,5 @@
             </optional>
         </item>
-        <item name="Hiking" icon="presets/hiking_grade1.png">
+        <item name="Hiking" icon="presets/hiking_grade1.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Key:sac_scale"
                   de:href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
@@ -661,5 +661,5 @@
             </optional>
         </item>
-        <item name="Mountain Hiking" icon="presets/hiking_grade2.png">
+        <item name="Mountain Hiking" icon="presets/hiking_grade2.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Key:sac_scale"
                   de:href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
@@ -674,5 +674,5 @@
             </optional>
         </item>
-        <item name="Demanding Mountain Hiking" icon="presets/hiking_grade3.png">
+        <item name="Demanding Mountain Hiking" icon="presets/hiking_grade3.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Key:sac_scale"
                   de:href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
@@ -687,5 +687,5 @@
             </optional>
         </item>
-        <item name="Alpine Hiking" icon="presets/hiking_grade4.png">
+        <item name="Alpine Hiking" icon="presets/hiking_grade4.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Key:sac_scale"
                   de:href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
@@ -700,5 +700,5 @@
             </optional>
         </item>
-        <item name="Demanding alpine hiking" icon="presets/hiking_grade5.png">
+        <item name="Demanding alpine hiking" icon="presets/hiking_grade5.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Key:sac_scale"
                   de:href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
@@ -713,5 +713,5 @@
             </optional>
         </item>
-        <item name="Difficult alpine hiking" icon="presets/hiking_grade6.png">
+        <item name="Difficult alpine hiking" icon="presets/hiking_grade6.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Key:sac_scale"
                   de:href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
@@ -728,5 +728,5 @@
     </group> <!-- Ways -->
     <group name="Waypoints" icon="presets/waypoints.png">
-        <item name="Motorway Junction" icon="presets/motorway_exit.png">
+        <item name="Motorway Junction" icon="presets/motorway_exit.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
             <label text="Edit Motorway Junction" />
@@ -736,5 +736,5 @@
             <text key="ref" text="Number" default="" delete_if_empty="true" />
         </item>
-        <item name="Services" icon="presets/car_service.png">
+        <item name="Services" icon="presets/car_service.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
             <label text="Edit Service Station" />
@@ -747,5 +747,5 @@
         </item>
         <separator/>
-        <item name="Traffic Signal" icon="presets/traffic-light.png">
+        <item name="Traffic Signal" icon="presets/traffic-light.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=traffic_signals" />
             <key key="highway" value="traffic_signals" />
@@ -758,8 +758,8 @@
             </optional>
         </item>
-        <item name="Stop" icon="presets/Stop.png">
+        <item name="Stop" icon="presets/Stop.png" type="node">
             <key key="highway" value="stop" />
         </item>
-        <item name="Pedestrian Crossing" icon="presets/zebracrossing.png">
+        <item name="Pedestrian Crossing" icon="presets/zebracrossing.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
                   de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
@@ -772,5 +772,5 @@
             <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">
+        <item name="Mini-roundabout" icon="presets/roundabout_left.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=mini_roundabout"
                   de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=mini_roundabout"
@@ -779,10 +779,10 @@
             <combo key="direction" text="Direction" values="clockwise" default="" delete_if_empty="true" />
         </item>
-        <item name="Turning Circle" icon="presets/turning_circle.png">
+        <item name="Turning Circle" icon="presets/turning_circle.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=turning_circle"
                   de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
             <key key="highway" value="turning_circle" />
         </item>
-        <item name="City Limit" icon="presets/citylimit.png">
+        <item name="City Limit" icon="presets/citylimit.png" type="node">
             <label text="Edit a city limit sign" />
             <space />
@@ -792,15 +792,15 @@
             <text key="alt_name" text="Second Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Signpost" icon="presets/empty.png">
+        <item name="Signpost" icon="presets/empty.png" type="node">
             <key key="amenity" value="signpost" />
         </item>
-        <item name="Speed Camera" icon="presets/speed_camera.png">
+        <item name="Speed Camera" icon="presets/speed_camera.png" type="node">
             <key key="highway" value="speed_camera" />
         </item>
-        <item name="Emergency Phone" icon="presets/telephone.png">
+        <item name="Emergency Phone" icon="presets/telephone.png" type="node">
             <key key="amenity" value="emergency_phone" />
         </item>
         <separator/>
-        <item name="Ford" icon="presets/ford.png">
+        <item name="Ford" icon="presets/ford.png" type="node,way">
             <label text="Edit Ford" />
             <space />