Index: /trunk/presets/presets.xml
===================================================================
--- /trunk/presets/presets.xml	(revision 1467)
+++ /trunk/presets/presets.xml	(revision 1468)
@@ -793,7 +793,4 @@
             <text key="alt_name" text="Second Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Signpost" icon="presets/empty.png" type="node">
-            <key key="amenity" value="signpost" />
-        </item>
         <item name="Speed Camera" icon="presets/speed_camera.png" type="node">
             <key key="highway" value="speed_camera" />
@@ -1630,11 +1627,13 @@
             <key key="tourism" value="attraction" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
-        </item>
-        <item name="Information point" icon="presets/information.png" type="node,way,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=information" />
-            <label text="Edit Information Point" />
+            <text key="opening_hours" text="Opening Hours" default="" delete_if_empty="true" />
+        </item>
+        <item name="Information Office" icon="presets/informationoffice.png" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
+            <label text="Edit Information Office" />
             <key key="tourism" value="information" />
-            <combo key="information" text="type" values="office,map,citymap,hikingmap,bicyclemap,board,history,nature,wildlife,guidepost" default="" delete_if_empty="true" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <key key="information" value="office" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="opening_hours" text="Opening Hours" default="" delete_if_empty="true" />
         </item>
         <item name="Museum" icon="presets/State_Public.png" type="node,way,closedway">
@@ -1670,4 +1669,29 @@
         </item>
         <separator/>
+        <item name="(Hiking-)Guidepost" icon="presets/guidepost.png" type="node">
+            <link href="http://wiki.openstreetmap.org/index.php/Proposed_features/Guidepost" />
+            <key key="tourism" value="information" />
+            <key key="information" value="guidepost" />
+        </item>
+        <item name="Map" icon="presets/map.png" type="node">
+            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
+            <key key="tourism" value="information" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="information" text="Map Type" values="map,citymap,hikingmap,bicyclemap" default="map" delete_if_empty="true" />
+            <text key="description" text="Closer Description" default="" delete_if_empty="true" />
+        </item>
+        <item name="Information Board" icon="presets/board.png" type="node">
+            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
+            <key key="tourism" value="information" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="information" text="Board Type" values="board,history,nature,wildlife" default="board" delete_if_empty="true" />
+            <text key="description" text="Closer Description" default="" delete_if_empty="true" />
+        </item>
+        <item name="Other Information Points" icon="presets/information.png" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
+            <key key="tourism" value="information" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="description" text="Closer Description" default="" delete_if_empty="true" />
+        </item>
         <item name="Shelter" icon="presets/shelter.png" type="node,way,closedway">
             <label text="Edit Shelter" />
Index: /trunk/styles/standard/elemstyles.xml
===================================================================
--- /trunk/styles/standard/elemstyles.xml	(revision 1467)
+++ /trunk/styles/standard/elemstyles.xml	(revision 1468)
@@ -2145,6 +2145,7 @@
 
 	<rule>
+    <!-- deprecated; use information=guidepost instead -->
 		<condition k="amenity" v="signpost"/>
-		<icon annotate="true" src="place/locality.png"/>
+    <icon annotate="true" src="misc/deprecated.png"/>
 		<line width="2" realwidth="5" dashed="true" colour="deprecated#ff0000"/>
 		<scale_min>1</scale_min>
@@ -2478,12 +2479,4 @@
 
 	<rule>
-		<condition k="tourism" v="information"/>
-		<icon annotate="true" src="misc/information.png"/>
-		<area colour="tourism#e180a2"/>
-		<scale_min>1</scale_min>
-		<scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
 		<condition k="tourism" v="hotel"/>
 		<icon annotate="true" src="accommodation.png"/>
@@ -2592,4 +2585,91 @@
 		<condition k="tourism" v="museum"/>
 		<icon annotate="true" src="sightseeing/museum.png"/>
+		<area colour="tourism#e180a2"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+<!-- information tags -->
+	<rule>
+		<condition k="information" v="guidepost"/>
+		<icon annotate="true" src="misc/information/guidepost.png"/>
+		<scale_min>1</scale_min>
+		<scale_max>40000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="information" v="office"/>
+		<icon annotate="true" src="misc/information/informationoffice.png"/>
+		<area colour="tourism#e180a2"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="information" v="map"/>
+		<icon annotate="true" src="misc/information/map.png"/>
+		<scale_min>1</scale_min>
+		<scale_max>40000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="information" v="bicyclemap"/>
+		<icon annotate="true" src="misc/information/map_bicycle.png"/>
+		<scale_min>1</scale_min>
+		<scale_max>40000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="information" v="hikingmap"/>
+		<icon annotate="true" src="misc/information/map_hiking.png"/>
+		<scale_min>1</scale_min>
+		<scale_max>40000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="information" v="pistemap"/>
+		<icon annotate="true" src="misc/information/map_skiing.png"/>
+		<scale_min>1</scale_min>
+		<scale_max>40000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="information" v="citymap"/>
+		<icon annotate="true" src="misc/information/map_city.png"/>
+		<scale_min>1</scale_min>
+		<scale_max>40000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="information" v="board"/>
+		<icon annotate="true" src="misc/information/board.png"/>
+		<scale_min>1</scale_min>
+		<scale_max>40000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="information" v="nature"/>
+		<icon annotate="true" src="misc/information/board_nature.png"/>
+		<scale_min>1</scale_min>
+		<scale_max>40000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="information" v="history"/>
+		<icon annotate="true" src="misc/information/board_history.png"/>
+		<scale_min>1</scale_min>
+		<scale_max>40000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="information" v="wildlife"/>
+		<icon annotate="true" src="misc/information/board_wildlife.png"/>
+		<scale_min>1</scale_min>
+		<scale_max>40000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="tourism" v="information"/>
+		<icon annotate="true" src="misc/information.png"/>
 		<area colour="tourism#e180a2"/>
 		<scale_min>1</scale_min>