Index: unk/images/presets/slipway.svg
===================================================================
--- /trunk/images/presets/slipway.svg	(revision 875)
+++ 	(revision )
@@ -1,83 +1,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
-   width="753.12"
-   height="671.52002"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   sodipodi:docname="Zeichen_108.svg"
-   sodipodi:docbase="/home/ce/Desktop"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/home/ce/Desktop/slipway.png"
-   inkscape:export-xdpi="3.8199999"
-   inkscape:export-ydpi="3.8199999">
-  <metadata
-     id="metadata17">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     inkscape:window-height="585"
-     inkscape:window-width="827"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     guidetolerance="10.0"
-     gridtolerance="10.0"
-     objecttolerance="10.0"
-     borderopacity="1.0"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     width="32px"
-     height="32px"
-     inkscape:zoom="0.56290206"
-     inkscape:cx="376.56"
-     inkscape:cy="335.76001"
-     inkscape:window-x="0"
-     inkscape:window-y="25"
-     inkscape:current-layer="svg2" />
-  <defs
-     id="defs11" />
-  <g
-     id="g5179"
-     inkscape:export-filename="/home/ce/Desktop/slipway.png"
-     inkscape:export-xdpi="4.9099998"
-     inkscape:export-ydpi="4.9099998">
-    <path
-       inkscape:export-ydpi="4.9099998"
-       inkscape:export-xdpi="4.9099998"
-       inkscape:export-filename="/home/ce/Desktop/slipway.png"
-       id="path5597"
-       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#0000f5;stroke-width:17.71653557;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 691.50541,451.22603 C 699.06724,451.24534 704.64535,453.78747 710.13041,456.75728 L 710.38041,472.06978 C 699.5825,467.55877 688.71997,463.12137 671.00541,472.06978 C 660.39604,475.81404 649.90135,479.87748 635.19291,472.06978 C 622.34277,465.81008 609.09887,462.40753 593.97416,472.06978 C 583.85717,476.49069 573.41935,479.88496 559.34916,472.06978 C 552.99065,469.19901 546.61392,467.30716 540.25541,466.91353 C 534.66371,466.88735 528.35702,468.24568 520.78662,472.06978 C 510.17732,475.81404 499.68262,479.87748 484.97412,472.06978 C 472.12402,465.81008 458.84892,462.40753 443.72412,472.06978 C 433.60722,476.49069 423.16942,479.88496 409.09912,472.06978 C 408.09132,472.31731 402.87692,469.56389 399.56792,467.81978 C 398.90172,467.46866 403.94482,459.26447 405.91162,455.41353 C 419.40322,460.41346 432.69842,462.83764 444.66162,456.75728 C 458.53852,449.20368 471.43812,450.55646 483.78662,456.75728 C 496.04992,461.9706 507.68312,461.63679 518.81792,456.88228 L 518.81792,456.75728 C 519.74962,456.40617 520.65192,456.08933 521.56792,455.75728 C 540.87813,447.88992 550.51891,451.68861 559.88041,456.75728 L 559.88041,456.97603 C 571.96087,460.84855 584.27949,462.16112 594.91166,456.75728 C 608.78848,449.20368 621.68811,450.55646 634.03666,456.75728 C 646.4132,462.01876 658.15206,461.63819 669.38041,456.75728 C 678.55513,452.71944 685.62399,451.21101 691.50541,451.22603 z " />
-    <path
-       inkscape:export-ydpi="4.9099998"
-       inkscape:export-xdpi="4.9099998"
-       inkscape:export-filename="/home/ce/Desktop/slipway.png"
-       id="path2207"
-       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#0000f5;stroke-width:17.71653543;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
-       d="M 689.72889,516.95681 C 697.29072,516.97612 702.86883,519.51825 708.35389,522.48806 L 708.60389,537.80056 C 697.80598,533.28955 686.94345,528.85215 669.22889,537.80056 C 658.61952,541.54482 648.12483,545.60826 633.41639,537.80056 C 620.56625,531.54086 607.32235,528.13831 592.19764,537.80056 C 582.08065,542.22147 571.64283,545.61574 557.57264,537.80056 C 551.21413,534.92979 544.8374,533.03794 538.47889,532.64431 C 532.88719,532.61813 526.5805,533.97646 519.0101,537.80056 C 508.4008,541.54482 497.9061,545.60826 483.1976,537.80056 C 470.3475,531.54086 457.0724,528.13831 441.9476,537.80056 C 431.8307,542.22147 421.3929,545.61574 407.3226,537.80056 C 406.3148,538.04809 401.1004,535.29467 397.7914,533.55056 C 397.1252,533.19944 402.1683,524.99525 404.1351,521.14431 C 417.6267,526.14424 430.9219,528.56842 442.8851,522.48806 C 456.762,514.93446 469.6616,516.28724 482.0101,522.48806 C 494.2734,527.70138 505.9066,527.36757 517.0414,522.61306 L 517.0414,522.48806 C 517.9731,522.13695 518.8754,521.82011 519.7914,521.48806 C 539.10161,513.6207 548.74239,517.41939 558.10389,522.48806 L 558.10389,522.70681 C 570.18435,526.57933 582.50297,527.8919 593.13514,522.48806 C 607.01196,514.93446 619.91159,516.28724 632.26014,522.48806 C 644.63668,527.74954 656.37554,527.36897 667.60389,522.48806 C 676.77861,518.45022 683.84747,516.94179 689.72889,516.95681 z " />
-    <path
-       inkscape:export-ydpi="4.9099998"
-       inkscape:export-xdpi="4.9099998"
-       inkscape:export-filename="/home/ce/Desktop/slipway.png"
-       id="path1889"
-       style="fill:black;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 621.42918,575.26863 L 132.6698,575.26863 L 254.41125,361.49316 L 621.42918,575.26863 z " />
-  </g>
-</svg>
Index: /trunk/presets/presets.xml
===================================================================
--- /trunk/presets/presets.xml	(revision 875)
+++ /trunk/presets/presets.xml	(revision 876)
@@ -300,4 +300,17 @@
 			<text key="width" text="Width (metres)" default="" delete_if_empty="true" />
 		</item>
+		<item name="Bridge" icon="presets/bridge.png">
+			<label text="Edit a Bridge" />
+			<label text=" " />
+			<key key="bridge" value="yes" />
+			<label text=" " />
+			<label text="Optional Attributes:" />
+			<label text=" " />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+			<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
+			<text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
+			<text key="maxweight" text="Max. weight (tonnes)" default="" delete_if_empty="true" />
+			<text key="width" text="Width (metres)" default="" delete_if_empty="true" />
+		</item>
 	</group> <!-- Streets -->
 
@@ -722,5 +735,5 @@
 		</item>
 
-		<item name="Ford" icon="presets/waypoints.png">
+		<item name="Ford" icon="presets/ford.png">
 			<label text="Edit Ford" />
 			<label text=" " />
@@ -740,5 +753,5 @@
 		</item>
 
-		<item name="Traffic Signal" icon="presets/waypoints.png">
+		<item name="Traffic Signal" icon="presets/traffic-light.png">
 			<key key="highway" value="traffic_signals" />
 		</item>
@@ -858,5 +871,5 @@
 
 	<group name="Waterway" icon="presets/waterway.png">
-		<item name="River" icon="presets/waterway.png">
+		<item name="River" icon="presets/river.png">
 			<label text="Edit a River" />
 			<label text=" " />
@@ -1774,5 +1787,5 @@
 		</item>
 
-		<item name="Kiosk" icon="presets/empty.png">
+		<item name="Kiosk" icon="presets/kiosk.png">
 			<label text="Edit Kiosk" />
 			<key key="shop" value="kiosk" />
@@ -1798,5 +1811,5 @@
 		</item>
 
-		<item name="Dry Cleaning" icon="presets/empty.png">
+		<item name="Dry Cleaning" icon="presets/laundry.png">
 			<label text="Edit Dry Cleaning" />
 			<key key="shop" value="dry_cleaning" />
@@ -1804,5 +1817,5 @@
 		</item>
 
-		<item name="Laundry" icon="presets/empty.png">
+		<item name="Laundry" icon="presets/laundry.png">
 			<label text="Edit Laundry" />
 			<key key="shop" value="laundry" />
@@ -1964,5 +1977,5 @@
 
 	<group name="Landuse" icon="presets/landuse.png">
-		<item name="Grave Yard" icon="presets/empty.png">
+		<item name="Grave Yard" icon="presets/graveyard.png">
 			<label text="Edit Grave Yard" />
 			<key key="amenity" value="grave_yard" />
@@ -2007,5 +2020,5 @@
 		</item>
 
-		<item name="Basin" icon="presets/landuse.png">
+		<item name="Basin" icon="presets/landuse_water.png">
 			<label text="Edit Basin Landuse" />
 			<label text=" " />
@@ -2014,5 +2027,5 @@
 		</item>
 
-		<item name="Reservoir" icon="presets/landuse.png">
+		<item name="Reservoir" icon="presets/landuse_water.png">
 			<label text="Edit Reservoir Landuse" />
 			<label text=" " />
@@ -2099,5 +2112,5 @@
 		</item>
 
-		<item name="Cemetery" icon="presets/landuse.png">
+		<item name="Cemetery" icon="presets/cemetery.png">
 			<label text="Edit Cemetery Landuse" />
 			<label text=" " />