Index: /trunk/presets/presets.xml
===================================================================
--- /trunk/presets/presets.xml	(revision 1983)
+++ /trunk/presets/presets.xml	(revision 1984)
@@ -1686,6 +1686,5 @@
         <separator/>
         <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" />
+            <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
             <key key="tourism" value="information" />
             <key key="information" value="office" />
@@ -1694,18 +1693,29 @@
         </item>
         <item name="Map" icon="presets/map.png" type="node">
-            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
+            <link href="http://wiki.openstreetmap.org/wiki/Key: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" />
+            <key key="information" value="map" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="map_type" text="Detail Grade" values="topo,street,scheme" default="" delete_if_empty="true" />
+            <combo key="map_size" text="Shown Area" values="site,city,region" default="" delete_if_empty="true" />
             <text key="description" text="Closer Description" default="" delete_if_empty="true" />
+            <space />
+            <label text="Routes shown for:" />
+            <check key="hiking" text="Hiking" default="off" delete_if_empty="true" />
+            <check key="bicycle" text="Cycling" default="off" delete_if_empty="true" />
+            <check key="mtb" text="Mountainbiking" default="off" delete_if_empty="true" />
+            <check key="ski" text="Skiing" default="off" delete_if_empty="true" />
+            <check key="horse" text="Riding" default="off" delete_if_empty="true" />
+            <label text="... other transportation modes possible" />
         </item>
         <item name="Information Board" icon="presets/board.png" type="node">
-            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:information%3Dboard" />
             <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" />
+            <key key="information" value="board" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="board_type" text="Board Content" values="notice,history,nature,wildlife,plants" default="board" delete_if_empty="true" />
             <text key="description" text="Closer Description" default="" delete_if_empty="true" />
         </item>
-        <item name="Guidepost (Hiking)" icon="presets/guidepost.png" type="node">
+        <item name="Guidepost" icon="presets/guidepost.png" type="node">
             <link href="http://wiki.openstreetmap.org/index.php/Proposed_features/Guidepost" />
             <key key="tourism" value="information" />
@@ -1713,4 +1723,35 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
             <text key="ele" text="Elevation" default="" delete_if_empty="true" />
+            <space />
+            <label text="Routes shown for:" />
+            <check key="hiking" text="Hiking" default="off" delete_if_empty="true" />
+            <check key="bicycle" text="Cycling" default="off" delete_if_empty="true" />
+            <check key="mtb" text="Mountainbiking" default="off" delete_if_empty="true" />
+            <check key="ski" text="Skiing" default="off" delete_if_empty="true" />
+            <check key="horse" text="Riding" default="off" delete_if_empty="true" />
+            <label text="... other transportation modes possible" />
+        </item>
+        <item name="Information Terminal" icon="presets/information.png" type="node">
+            <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
+            <key key="tourism" value="information" />
+            <key key="information" value="terminal" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="description" text="Closer description" default="" delete_if_empty="true" />
+            <text key="operator" text="Operator" default="" delete_if_empty="true" />
+            <text key="ref" text="Reference number" default="" delete_if_empty="true" />
+            <combo key="fee" text="Fee" values="yes,no" default="" delete_if_empty="true" />
+        </item>
+        <item name="Audioguide" icon="presets/information.png" type="node">
+            <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
+            <key key="tourism" value="information" />
+            <key key="information" value="audioguide" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="description" text="Closer description" default="" delete_if_empty="true" />
+            <text key="operator" text="Operator" default="" delete_if_empty="true" />
+            <text key="ref" text="Reference number" default="" delete_if_empty="true" />
+            <combo key="fee" text="Fee" values="yes,no" default="" delete_if_empty="true" />
+            <space />
+            <label text="Audioguide via mobile phone?" />
+            <text key="phone" text="Phone number" default="" delete_if_empty="true" />
         </item>
         <item name="Other Information Points" icon="presets/information.png" type="node,closedway">
Index: /trunk/styles/standard/elemstyles.xml
===================================================================
--- /trunk/styles/standard/elemstyles.xml	(revision 1983)
+++ /trunk/styles/standard/elemstyles.xml	(revision 1984)
@@ -2969,55 +2969,6 @@
 
 	<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>