Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 7488)
+++ trunk/data/defaultpresets.xml	(revision 7490)
@@ -433,4 +433,15 @@
         </optional>
     </chunk>
+    <chunk id="optional_bridge">
+        <optional>
+            <text key="name" text="Name" />
+            <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="1" length="3" />
+            <text key="maxspeed" text="Max. speed (km/h)" />
+            <text key="maxweight" text="Max. weight (tonnes)" />
+            <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
+            <text key="width" text="Width (meters)" />
+            <check key="toll" text="Toll" />
+        </optional>
+    </chunk>
   <!-- Link chunks -->
   <chunk id="link_contact">
@@ -900,28 +911,4 @@
             </optional>
         </item> <!-- Roundabout -->
-        <item name="Bridge" icon="presets/bridge.png" type="way" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Key:bridge"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Key:bridge"
-                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
-                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge"
-                  it.href="http://wiki.openstreetmap.org/wiki/IT:Key:bridge"
-                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:bridge"
-                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Key:bridge"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Key:bridge"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:bridge"
-                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:bridge"
-                  zh_TW.href="http://wiki.openstreetmap.org/wiki/Zh-hant:Key:bridge" />
-            <space />
-            <combo key="bridge" text="Bridge" values="yes,aqueduct,cantilever,covered,low_water_crossing,movable,suspension,swing,trestle,viaduct" match="keyvalue" default="yes" />
-            <optional>
-                <text key="name" text="Name" />
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="1" length="3" />
-                <text key="maxspeed" text="Max. speed (km/h)" />
-                <text key="maxweight" text="Max. weight (tonnes)" />
-                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
-                <text key="width" text="Width (meters)" />
-                <check key="toll" text="Toll" />
-            </optional>
-        </item> <!-- Bridge -->
         <item name="Ford" icon="presets/ford.png" type="node,way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:ford"
@@ -5318,4 +5305,36 @@
         </item> <!-- Surveillance Camera -->
     </group> <!-- Man Made -->
+    <group name="Bridges" icon="presets/bridge.png">
+        <item name="Bridge" icon="presets/bridge.png" type="way,relation" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Key:bridge"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Key:bridge"
+                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge"
+                  it.href="http://wiki.openstreetmap.org/wiki/IT:Key:bridge"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:bridge"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Key:bridge"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Key:bridge"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:bridge"
+                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:bridge"
+                  zh_TW.href="http://wiki.openstreetmap.org/wiki/Zh-hant:Key:bridge" />
+            <space />
+            <combo key="bridge" text="Bridge" values="yes,aqueduct,boardwalk,cantilever,covered,low_water_crossing,trestle,viaduct" match="keyvalue" default="yes" />
+            <combo key="bridge:structure" text="Structure" values="arch,beam,truss,floating,suspension,cable-stayed,simple-suspension,humpback" match="key" />
+            <reference ref="optional_bridge" />
+        </item> <!-- Bridge -->
+        <item name="Movable Bridge" icon="presets/bridge_movable.png" type="way,relation" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Key:bridge:movable"
+                  de.href="http://wiki.openstreetmap.org/wiki/Key:bridge:movable" />
+            <space />
+            <key key="bridge" value="movable" />
+            <combo key="bridge:movable" text="Type" values="bascule,drawbridge,lift,submersible,swing,transporter" match="key" />
+            <reference ref="optional_bridge" />
+        </item> <!-- Movable Bridge -->
+        <item name="Bridge Support" icon="presets/bridge.png" type="node,closedway" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Key:bridge:support" />
+            <space />
+            <combo key="bridge:support" text="Type" values="pier,abutment,lift_pier,pivot_pier" match="key" />
+        </item> <!-- Bridge Support -->
+    </group> <!-- Bridges -->
     <group name="Power" icon="presets/power.png">
         <item name="Power Plant" icon="icons/power_station.png" type="closedway,relation" preset_name_label="true">
Index: trunk/data/validator/combinations.mapcss
===================================================================
--- trunk/data/validator/combinations.mapcss	(revision 7488)
+++ trunk/data/validator/combinations.mapcss	(revision 7490)
@@ -46,4 +46,5 @@
 *[have_riverbank               ][!waterway],
 *[border_type                  ][!boundary],
+*[bridge:structure             ][!bridge],
 *[source:date                  ][!source],
 *[source:name                  ][!name],
@@ -100,4 +101,5 @@
 *[castle_type                  ][historic!=castle],
 *[reservoir_type               ][landuse!=reservoir][water!=reservoir],
+*[bridge:movable               ][bridge!=movable],
 *[bunker_type                  ][military!=bunker] {
   throwWarning: tr("{0} without {1}", "{0.key}", "{1.tag}");
Index: trunk/data/validator/deprecated.mapcss
===================================================================
--- trunk/data/validator/deprecated.mapcss	(revision 7488)
+++ trunk/data/validator/deprecated.mapcss	(revision 7490)
@@ -261,2 +261,22 @@
   assertMatch: "way natural=land";
 }
+
+/* see #10447 - https://wiki.openstreetmap.org/wiki/Proposed_features/Bridge_types#Deprecated_bridge_key_values */
+*[bridge=causeway] {
+  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
+  suggestAlternative: "ford=yes";
+  suggestAlternative: "bridge=low_water_crossing";
+  suggestAlternative: "embankment=yes";
+}
+
+*[bridge=swing] {
+  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
+  suggestAlternative: "bridge:movable=swing";
+  suggestAlternative: "bridge:structure=simple-suspension";
+}
+
+*[bridge=suspension] {
+  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
+  fixAdd: "bridge=yes";
+  fixAdd: "bridge:structure=suspension";
+}