Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 9522)
+++ trunk/data/defaultpresets.xml	(revision 9523)
@@ -4685,4 +4685,118 @@
         </item> <!-- Veterinary -->
     </group> <!-- Health -->
+    <group name="Emergency" icon="styles/standard/emergency/ambulance_station.svg">
+        <item name="Ambulance Station" icon="styles/standard/emergency/ambulance_station.svg" type="node,closedway" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:emergency=ambulance_station"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:emergency=ambulance_station"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:emergency=ambulance_station"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:emergency=ambulance_station" />
+            <space />
+            <key key="emergency" value="ambulance_station" />
+            <reference ref="name_operator" />
+            <reference ref="link_contact_address" />
+        </item> <!-- Ambulance Station -->
+        <item name="Automated Defibrillator" icon="presets/aed.svg" type="node" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:emergency=defibrillator"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:emergency=defibrillator"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:emergency=defibrillator"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:emergency=defibrillator"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:emergency=defibrillator"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:emergency=defibrillator" />
+            <space />
+            <key key="emergency" value="defibrillator" />
+            <reference ref="oh_wheelchair" />
+            <text  key="operator" text="Operator" />
+            <check key="indoor" text="Located inside a building?" />
+            <!-- lastcheck is in use for aed devices, but not yet well discussed or documented
+            <optional>
+                <text key="lastcheck"      text="Last check date (YYYY-MM-DD)" />
+                <text key="lastcheck:note" text="Last check note" />
+            </optional>
+            -->
+        </item> <!-- Automated Defibrillator -->
+        <separator />
+        <item name="Fire Extinguisher" icon="styles/standard/emergency/fire_extinguisher.svg" type="node" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:emergency=fire_extinguisher"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:emergency=fire_extinguisher"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:emergency=fire_extinguisher"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:emergency=fire_extinguisher"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:emergency=fire_extinguisher" />
+            <space />
+            <key key="emergency" value="fire_extinguisher" />
+            <text key="ref" text="Reference" />
+            <text key="operator" text="Operator" />
+            <check key="indoor" text="Indoor" />
+        </item> <!-- Fire Extinguisher -->
+        <item name="Fire Hose" icon="styles/standard/emergency/fire_hose.svg" type="node" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:emergency=fire_hose"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:emergency=fire_hose" />
+            <space />
+            <key key="emergency" value="fire_hose" />
+            <text key="ref" text="Reference" />
+            <text key="operator" text="Operator" />
+        </item> <!-- Fire Hose -->
+        <item name="Fire Hydrant" icon="presets/fire_hydrant.png" type="node" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:emergency=fire_hydrant"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:emergency=fire_hydrant"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:emergency=fire_hydrant"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:emergency=fire_hydrant"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:emergency=fire_hydrant"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:emergency=fire_hydrant"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:emergency=fire_hydrant"
+                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:emergency=fire_hydrant" />
+            <space />
+            <key key="emergency" value="fire_hydrant" />
+            <combo key="fire_hydrant:type" text="Type" values="underground,pillar,wall,pond" values_context="pipeline" default="pillar" />
+            <combo key="fire_hydrant:diameter" text="Diameter (in mm)" values="50,80,100,150,200,250,300,400" />
+            <space />
+            <reference ref="name_ref" />
+            <text key="operator" text="Operator" />
+            <space />
+            <combo key="fire_hydrant:position" text="Hydrant Position" values="lane,parking_lot,sidewalk,green" values_context="hydrant position" />
+            <combo key="fire_hydrant:pressure" text="Pressure (in bar)" values="5,6,8,suction" />
+            <text key="fire_hydrant:count" text="Count" />
+        </item> <!-- Fire Hydrant -->
+        <item name="Water Tank" icon="styles/standard/emergency/water_tank.svg" type="node,closedway" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:emergency=water_tank"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:emergency=fire_hose"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:emergency=fire_hose"
+                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:emergency=fire_hose" />
+            <space />
+            <key key="emergency" value="water_tank" />
+            <reference ref="name_ref_operator" />
+            <space />
+            <text key="water_tank:volume" text="Volume (in liters)" />
+        </item> <!-- Water Tank -->
+        <separator />
+        <item name="Assembly Point" icon="styles/standard/emergency/assembly_point.svg" type="node" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:emergency=assembly_point"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:emergency=assembly_point" />
+            <space />
+            <key key="emergency" value="assembly_point" />
+            <reference ref="name_ref_operator" />
+        </item> <!-- Assembly Point -->
+        <item name="Emergency Phone" icon="styles/standard/vehicle/emergency_phone.png" type="node" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:emergency=phone"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:emergency=phone"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:emergency=phone"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:emergency=phone"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:emergency=phone" />
+            <key key="emergency" value="phone" />
+            <text key="ref" text="Reference" />
+            <text key="operator" text="Operator" />
+        </item> <!-- Emergency Phone -->
+        <item name="Siren" icon="styles/standard/emergency/siren.svg" type="node" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:emergency=siren"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:emergency=siren"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:emergency=siren" />
+            <key key="emergency" value="siren" />
+            <text key="ref" text="Reference" />
+            <text key="operator" text="Operator" />
+            <space />
+            <combo key="siren:type" text="Type" values="pneumatic,electronic,mechanical" />
+            <combo key="siren:purpose" text="Purpose" values="tornado,fire,air_raid,civil_defense" />
+            <text key="siren:range" text="Range (in meters)" />
+        </item> <!-- Emergency Phone -->
+    </group> <!-- Emergency -->
     <group name="Social Facility" icon="styles/standard/social_facility/outreach.svg">
         <item name="Nursing Home" icon="styles/standard/social_facility/nursing_home.svg" type="node,closedway" preset_name_label="true">
@@ -4849,12 +4963,4 @@
             <preset_link preset_name="Payment Methods" />
         </item> <!-- Telephone -->
-        <item name="Emergency Phone" icon="styles/standard/vehicle/emergency_phone.png" type="node" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:emergency=phone"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:emergency=phone"
-                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:emergency=phone"
-                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:emergency=phone"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:emergency=phone" />
-            <key key="emergency" value="phone" />
-        </item> <!-- Emergency Phone -->
         <item name="Internet Access" icon="presets/network-wireless.svg" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:internet_access"
@@ -4869,23 +4975,4 @@
             <reference ref="internet" />
         </item> <!-- Internet Access -->
-        <item name="Automated Defibrillator" icon="presets/aed.svg" type="node" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:emergency=defibrillator"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:emergency=defibrillator"
-                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:emergency=defibrillator"
-                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:emergency=defibrillator"
-                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:emergency=defibrillator"
-                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:emergency=defibrillator" />
-            <space />
-            <key key="emergency" value="defibrillator" />
-            <reference ref="oh_wheelchair" />
-            <text  key="operator" text="Operator" />
-            <check key="indoor" text="Located inside a building?" />
-            <!-- lastcheck is in use for aed devices, but not yet well discussed or documented
-            <optional>
-                <text key="lastcheck"      text="Last check date (YYYY-MM-DD)" />
-                <text key="lastcheck:note" text="Last check note" />
-            </optional>
-            -->
-        </item> <!-- Automated Defibrillator -->
         <item name="Clock" icon="styles/standard/service/clock.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=clock"
@@ -5082,25 +5169,4 @@
             </optional>
         </item> <!-- Drinking Water -->
-        <item name="Fire Hydrant" icon="presets/fire_hydrant.png" type="node" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:emergency=fire_hydrant"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:emergency=fire_hydrant"
-                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:emergency=fire_hydrant"
-                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:emergency=fire_hydrant"
-                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:emergency=fire_hydrant"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:emergency=fire_hydrant"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:emergency=fire_hydrant"
-                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:emergency=fire_hydrant" />
-            <space />
-            <key key="emergency" value="fire_hydrant" />
-            <combo key="fire_hydrant:type" text="Type" values="underground,pillar,wall,pond" values_context="pipeline" default="pillar" />
-            <combo key="fire_hydrant:diameter" text="Diameter (in mm)" values="50,80,100,150,200,250,300,400" />
-            <space />
-            <reference ref="name_ref" />
-            <text key="operator" text="Operator" />
-            <space />
-            <combo key="fire_hydrant:position" text="Hydrant Position" values="lane,parking_lot,sidewalk,green" values_context="hydrant position" />
-            <combo key="fire_hydrant:pressure" text="Pressure (in bar)" values="5,6,8,suction" />
-            <text key="fire_hydrant:count" text="Count" />
-        </item> <!-- Fire Hydrant -->
         <item name="Compressed Air" icon="styles/standard/vehicle/compressed_air.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=compressed_air"
Index: trunk/styles/standard/elemstyles.mapcss
===================================================================
--- trunk/styles/standard/elemstyles.mapcss	(revision 9522)
+++ trunk/styles/standard/elemstyles.mapcss	(revision 9523)
@@ -2380,4 +2380,57 @@
 }
 
+/******************/
+/* emergency tags */
+/******************/
+area[emergency=ambulance_station],
+area[emergency=water_tank] {
+    fill-color: emergency#eeeeee;
+}
+node[emergency=ambulance_station] {
+    icon-image: "emergency/ambulance_station.svg";
+    set icon_z17;
+    text: auto;
+}
+node[emergency=water_tank] {
+    icon-image: "emergency/water_tank.svg";
+    set icon_z17;
+    text: auto;
+}
+node[emergency=phone] {
+    icon-image: "vehicle/emergency_phone.png";
+    set icon_z17;
+    text: auto;
+}
+node[emergency=defibrillator] {
+    icon-image: "presets/aed.svg";
+    set icon_z17;
+    text: auto;
+}
+node[emergency=fire_hydrant] {
+    icon-image: "service/fire_hydrant.png";
+    set icon_z17;
+    text: auto;
+}
+node[emergency=fire_extinguisher] {
+    icon-image: "emergency/fire_extinguisher.svg";
+    set icon_z17;
+    text: auto;
+}
+node[emergency=fire_hose] {
+    icon-image: "emergency/fire_hose.svg";
+    set icon_z17;
+    text: auto;
+}
+node[emergency=assembly_point] {
+    icon-image: "emergency/assembly_point.svg";
+    set icon_z17;
+    text: auto;
+}
+node[emergency=siren] {
+    icon-image: "emergency/siren.svg";
+    set icon_z17;
+    text: auto;
+}
+
 /****************/
 /* amenity tags */
@@ -2584,14 +2637,4 @@
 area[amenity=sanitary_dump_station] {
     fill-color: amenity_light#f7efb7;
-}
-node[emergency=phone] {
-    icon-image: "vehicle/emergency_phone.png";
-    set icon_z17;
-    text: auto;
-}
-node[emergency=defibrillator] {
-    icon-image: "presets/aed.svg";
-    set icon_z17;
-    text: auto;
 }
 node[amenity=toilets] {
@@ -2983,9 +3026,4 @@
 node[amenity=bbq] {
     icon-image: "leisure/bbq.png";
-    set icon_z17;
-    text: auto;
-}
-node[emergency=fire_hydrant] {
-    icon-image: "service/fire_hydrant.png";
     set icon_z17;
     text: auto;