Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 3622)
+++ trunk/data/defaultpresets.xml	(revision 3623)
@@ -803,5 +803,5 @@
             <key key="barrier" value="cycle_barrier" />
         </item> <!-- cycle_barrier -->
-        <item name="Block" icon="presets/empty.png" type="node,way,closedway">
+        <item name="Block" icon="presets/block.png" type="node,way,closedway">
             <key key="barrier" value="block" />
         </item> <!-- block -->
@@ -858,20 +858,20 @@
 
         <!-- *** linear barriers *** -->
-        <item name="Hedge" icon="presets/empty.png" type="way,closedway,relation">
+        <item name="Hedge" icon="presets/hedge.png" type="way,closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
             <key key="barrier" value="hedge" />
         </item> <!-- hedge -->
-        <item name="Fence" icon="presets/empty.png" type="way,closedway">
+        <item name="Fence" icon="presets/fence.png" type="way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
             <combo key="barrier" text="Fence" values="fence,wood_fence,wire_fence" default="" delete_if_empty="true" />
         </item> <!-- fence -->
-        <item name="Wall" icon="presets/empty.png" type="way,closedway">
+        <item name="Wall" icon="presets/wall.png" type="way,closedway">
             <key key="barrier" value="wall" />
         </item> <!-- wall -->
-        <item name="City Wall" icon="presets/empty.png" type="way,closedway">
+        <item name="City Wall" icon="presets/city_wall.png" type="way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
             <key key="barrier" value="city_wall" />
         </item> <!-- city_wall -->
-        <item name="Retaining Wall" icon="presets/empty.png" type="way,closedway">
+        <item name="Retaining Wall" icon="presets/retaining_wall.png" type="way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall" />
             <key key="barrier" value="retaining_wall" />
@@ -1052,5 +1052,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Dam" icon="presets/empty.png" type="node,way,closedway">
+        <item name="Dam" icon="presets/dam.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
             <label text="Edit Dam" />
@@ -1060,5 +1060,5 @@
             <text key="wikipedia" text="Wikipedia" default="" delete_if_empty="true" />
         </item>
-         <item name="Groyne" icon="presets/empty.png" type="node,way,closedway">
+         <item name="Groyne" icon="presets/groyne.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dgroyne" />
             <label text="Edit Groyne" />
@@ -1097,5 +1097,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Coastline" icon="presets/empty.png" type="node,way,closedway,relation">
+        <item name="Coastline" icon="presets/coastline.png" type="node,way,closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
             <label text="Edit Coastline" />
@@ -1121,10 +1121,10 @@
             <combo key="wetland" text="Type" values="swamp,bog,marsh,reedbed,saltmarsh,tidalflat,mangrove" default="" delete_if_empty="true" />
         </item>
-        <item name="Mud" icon="presets/empty.png" type="node,closedway,relation">
+        <item name="Mud" icon="presets/mud.png" type="node,closedway,relation">
             <label text="Edit Mud" />
             <key key="natural" value="mud" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Beach" icon="styles/standard/rendering/beach.png" type="node,closedway,relation">
+        <item name="Beach" icon="presets/beach.png" type="node,closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
             <label text="Edit Beach" />
@@ -1132,10 +1132,10 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Bay" icon="presets/empty.png" type="node,closedway,relation">
+        <item name="Bay" icon="presets/bay.png" type="node,closedway,relation">
             <label text="Edit Bay" />
             <key key="natural" value="bay" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Cliff" icon="presets/empty.png" type="node,way,closedway,relation">
+        <item name="Cliff" icon="presets/cliff.png" type="node,way,closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
             <label text="Edit Cliff" />
@@ -1525,4 +1525,5 @@
                 <combo key="rental" text="Rental" values="yes,brand,no" default="" delete_if_empty="true" />
                 <combo key="repair" text="Repair" values="yes,brand,oldtimer,no" default="" delete_if_empty="true" />
+                <combo key="inspection" text="Inspection" values="yes,DEKRA,GTÜ,MOT,TÜV,no" default="" delete_if_empty="true" />
                 <combo key="parts" text="Parts" values="yes,brand,oldtimer,no" default="" delete_if_empty="true" />
                 <combo key="clothes" text="Clothes" values="yes,brand,no" default="" delete_if_empty="true" />
@@ -1680,5 +1681,5 @@
         </item>
         <separator/>
-        <item name="Runway" icon="presets/empty.png" type="way">
+        <item name="Runway" icon="presets/runway.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
             <label text="Edit Runway" />
@@ -1688,5 +1689,5 @@
             </optional>
         </item>
-        <item name="Taxiway" icon="presets/empty.png" type="way">
+        <item name="Taxiway" icon="presets/taxiway.png" type="way">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
             <label text="Edit Taxiway" />
@@ -1704,15 +1705,15 @@
             </optional>
         </item>
-        <item name="Apron" icon="presets/empty.png" type="closedway">
+        <item name="Apron" icon="presets/apron.png" type="closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
             <label text="Apron" />
             <key key="aeroway" value="apron" />
         </item>
-        <item name="Hangar" icon="presets/empty.png" type="closedway">
+        <item name="Hangar" icon="presets/hangar.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
             <label text="Hangar" />
             <key key="building" value="hangar" />
         </item>
-        <item name="Beacon" icon="presets/empty.png" type="node">
+        <item name="Beacon" icon="styles/standard/misc/landmark/beacon.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
             <label text="Beacon" />
@@ -1731,5 +1732,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Gate" name_context="airport" icon="presets/empty.png" type="node">
+        <item name="Gate" name_context="airport" icon="presets/aeroway_gate.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
             <label text="Edit Terminal Gate" />
@@ -2968,5 +2969,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Water Well" icon="presets/empty.png" type="node">
+        <item name="Water Well" icon="presets/water_well.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dwater_well" />
             <label text="Edit Water Well" />
@@ -2975,5 +2976,5 @@
         </item>
         <separator/>
-        <item name="Lighthouse" icon="presets/lighthouse.png" type="node,closedway">
+        <item name="Lighthouse" icon="styles/standard/misc/landmark/lighthouse.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
             <label text="Edit Lighthouse" />
@@ -2994,4 +2995,15 @@
             <combo key="opening_hours" text="Operation times" values="Mo-Fr 22:00-05:00" default="" delete_if_empty="true" />                                                                                        
         </item> 
+        <item name="Measurement Station" icon="presets/measurement_station.png" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/measurement_station" />
+            <label text="Edit Measurement Station" />
+            <space />            
+            <key key="man_made" value="measurement_station" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="operator" text="Operator" default="" delete_if_empty="true" />             
+            <combo key="measurement" text="Measurement" values="particulate_matter,seismic,water_level,weather" default="" delete_if_empty="true" />
+            <combo key="recording" text="Recording" values="manually,automated,remote,no" default="" delete_if_empty="true" />  
+            <combo key="display" text="Display" values="analog,digital,no" default="" delete_if_empty="true" />                                     
+       </item>                	
         <item name="Survey Point" icon="presets/survey_point.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />