Index: /trunk/resources/data/defaultpresets.xml
===================================================================
--- /trunk/resources/data/defaultpresets.xml	(revision 17524)
+++ /trunk/resources/data/defaultpresets.xml	(revision 17525)
@@ -1050,4 +1050,9 @@
             </optional>
         </item> <!-- Ford -->
+        <item name="Traffic Hazard" icon="presets/transport/hazard.svg" type="node,way" preset_name_label="true">
+            <link wiki="Key:hazard" />
+            <space />
+            <combo key="hazard" text="Hazard" values="animal_crossing,bump,children,curve,curves,cyclists,dangerous_junction,dip,falling_rocks,frost_heave,horse_riders,ice,landslide,loose_gravel,low_flying_aircraft,pedestrians,queues_likely,school_zone,side_winds,slippery,turn,turns" values_context="hazard" />
+        </item> <!-- Traffic Hazard -->
     </group> <!-- Streets -->
     <group name="Ways" icon="presets/transport/way/way_unclassified.svg">
@@ -7809,4 +7814,13 @@
             </optional>
         </item> <!-- Protected Area -->
+        <item name="Hazardous Area" icon="presets/misc/boundaries.svg" type="closedway,relation" preset_name_label="true">
+            <link wiki="Tag:boundary=hazard" />
+            <space />
+            <key key="boundary" value="hazard" />
+            <combo key="hazard" text="Hazard" values="contamination,minefield,nuclear,shooting_range,unexploded_ordnance" values_context="hazard" />
+            <optional>
+                <text key="related_law" text="Related law" />
+            </optional>
+        </item> <!-- Hazardous Area -->
         <item name="Maritime" icon="presets/misc/boundaries.svg" type="way,closedway,relation" preset_name_label="true">
             <link wiki="Tag:boundary=maritime" />
Index: /trunk/resources/images/presets/transport/hazard.svg
===================================================================
--- /trunk/resources/images/presets/transport/hazard.svg	(revision 17525)
+++ /trunk/resources/images/presets/transport/hazard.svg	(revision 17525)
@@ -0,0 +1,12 @@
+<svg height="540.0105" width="615.89575" xmlns="http://www.w3.org/2000/svg">
+    <path d="m24.689244-160.5126c.067869-.0509 0 .16968 0 0z" fill="none" stroke="#000"/>
+    <g transform="translate(8.146196 8.022892)">
+        <path d="m299.09375-8c-13.81855.007582-22.12017 13.3760798-27.21875 24.53125-92.81259 161.42762-186.781385 322.24484-278.875 484.03125-5.655568 16.18075 10.5954928 34.34286 27.3125 31.03037 189.5995-.27255 379.23688.62426 568.8125-.49912 16.59057-3.16375 24.67537-26.14951 13.37438-38.92817-95.1358-164.11515-189.09277-328.97051-284.99938-492.60308-4.72476-4.8851321-11.52899-7.8793021-18.40625-7.5625z" fill="#ff0"/>
+        <path d="m597.6 499.6-283.8-491.6c-2.9-5-8.2-8-13.9-8s-11 3.1-13.9 8l-283.8 491.6c-2.9 5-2.9 11.1 0 16 2.9 5 8.2 8 13.9 8h567.6c5.7 0 11-3.1 13.9-8 2.9-5 2.9-11.1 0-16z"/>
+        <path d="m43.9 491.5 256-443.3 256 443.3z" fill="#f7f619"/>
+        <g stroke="#000" stroke-linecap="square" transform="matrix(1.052559 0 0 1.052559 742.3144 -4.92249)">
+            <path d="m-384.00937 417.52725a38.151581 36.156727 0 1 1 -76.30316 0 38.151581 36.156727 0 1 1 76.30316 0z" stroke-opacity=".4" stroke-width=".625148" transform="matrix(.943604 0 0 .995665 -21.96988 1.966567)"/>
+            <path d="m-420.32264 164.9375c-19.61643 0-35.40625 16.12539-35.40625 36.15625l10.46875 126.65625c1.9994 16.38347 3.707 25.66593 10.46875 30.03125 4.41507 2.01148 9.30559 3.15625 14.46875 3.15625 5.13826 0 10.00783-1.13181 14.40625-3.125 6.79959-4.35299 8.52737-13.64238 10.53125-30.0625l10.46875-126.65625c0-20.03086-15.78983-36.15625-35.40625-36.15625z" stroke-width=".841593"/>
+        </g>
+    </g>
+</svg>
Index: /trunk/resources/styles/standard/elemstyles.mapcss
===================================================================
--- /trunk/resources/styles/standard/elemstyles.mapcss	(revision 17524)
+++ /trunk/resources/styles/standard/elemstyles.mapcss	(revision 17525)
@@ -836,4 +836,8 @@
     dashes: 9,9;
     dashes-offset: 9;
+}
+node[hazard] {
+    icon-image: "presets/transport/hazard.svg";
+    set icon_z17;
 }
 area[highway=platform]:closed {
@@ -5085,4 +5089,5 @@
 relation[boundary=political] > way::core_boundary,
 relation[boundary=maritime] > way::core_boundary,
+relation[boundary=hazard] > way::core_boundary,
 relation[boundary=national_park] > way::core_boundary,
 way[boundary=protected_area]::core_boundary,
@@ -5091,4 +5096,5 @@
 way[boundary=political]::core_boundary,
 way[boundary=maritime]::core_boundary,
+way[boundary=hazard]::core_boundary,
 way[boundary=national_park]::core_boundary {
     z-index: 2;