Index: trunk/presets/presets.xml
===================================================================
--- trunk/presets/presets.xml	(revision 1358)
+++ trunk/presets/presets.xml	(revision 1360)
@@ -8,4 +8,9 @@
 -->
 <!--
+item:
+  name: the text to display
+  icon: the icon to display
+  type: the data types - way,node,relation,closedway (separated by comma)
+
 link: link to the relating map features website
 
@@ -35,8 +40,10 @@
   default: ticked on/off
   delete_if_empty: true/false
+
+See also http://josm.openstreetmap.de/wiki/TaggingPresets.
 -->
 <annotations>
     <group name="Streets" icon="presets/way_secondary.png">
-        <item name="Motorway" icon="presets/motorway.png">
+        <item name="Motorway" icon="presets/motorway.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
                   de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
@@ -57,5 +64,5 @@
             </optional>
         </item>
-        <item name="Motorway Link" icon="presets/motorway.png">
+        <item name="Motorway Link" icon="presets/motorway.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
                   de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
@@ -74,5 +81,5 @@
             </optional>
         </item>
-        <item name="Trunk" icon="presets/trunk.png">
+        <item name="Trunk" icon="presets/trunk.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
                   de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
@@ -93,5 +100,5 @@
             </optional>
         </item>
-        <item name="Trunk Link" icon="presets/trunk.png">
+        <item name="Trunk Link" icon="presets/trunk.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link" 
                   de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
@@ -112,5 +119,5 @@
         </item>
         <separator/>
-        <item name="Primary" icon="presets/way_primary.png">
+        <item name="Primary" icon="presets/way_primary.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary" 
                   de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
@@ -131,5 +138,5 @@
             </optional>
         </item>
-        <item name="Primary Link" icon="presets/way_primary.png">
+        <item name="Primary Link" icon="presets/way_primary.png" type="way">
             <label text="Edit a Primary Link" />
             <space />
@@ -146,5 +153,5 @@
             </optional>
         </item>
-        <item name="Secondary" icon="presets/way_secondary.png">
+        <item name="Secondary" icon="presets/way_secondary.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=secondary"
                   de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
@@ -166,5 +173,5 @@
             </optional>
         </item>
-        <item name="Tertiary" icon="presets/way_tertiary.png">
+        <item name="Tertiary" icon="presets/way_tertiary.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=tertiary"
                   de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
@@ -185,5 +192,5 @@
             </optional>
         </item>
-        <item name="Unclassified" icon="presets/way_unclassified.png">
+        <item name="Unclassified" icon="presets/way_unclassified.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=unclassified"
                   de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
@@ -204,5 +211,5 @@
             </optional>
         </item>
-        <item name="Residential" icon="presets/residential.png">
+        <item name="Residential" icon="presets/residential.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
                   de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
@@ -222,5 +229,5 @@
             </optional>
         </item>
-        <item name="Living Street" icon="presets/living_street.png">
+        <item name="Living Street" icon="presets/living_street.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street" 
                   de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
@@ -240,5 +247,5 @@
             </optional>
         </item>
-        <item name="Service" icon="presets/way_unclassified.png">
+        <item name="Service" icon="presets/way_unclassified.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
                   de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
@@ -259,5 +266,5 @@
             </optional>
         </item>
-        <item name="Parking Aisle" icon="presets/way_unclassified.png">
+        <item name="Parking Aisle" icon="presets/way_unclassified.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:service=parking_aisle"
                   de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
@@ -273,6 +280,6 @@
         </item>
         <separator/>
-        <item name="Road (Unknown Type)" icon="presets/way_unclassified.png">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road" 
+        <item name="Road (Unknown Type)" icon="presets/way_unclassified.png" type="way">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
                   de:href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
             <label text="Edit a Road of unknown type" />
@@ -2864,6 +2871,5 @@
         </item>
     </group> <!-- Natural -->
-<!-- FIXME: parameter type and element role not yet supported! -->
-<!-- type should be used for all other items also to say if they are used for nodes/ways -->
+<!-- FIXME: element role not yet supported! -->
     <group name="Relations" icon="presets/empty.png">
         <item name="Multipolygon" icon="presets/empty.png" type="relation">