Index: /trunk/resources/data/defaultpresets.xml
===================================================================
--- /trunk/resources/data/defaultpresets.xml	(revision 16478)
+++ /trunk/resources/data/defaultpresets.xml	(revision 16479)
@@ -3345,5 +3345,26 @@
             <space />
             <reference ref="link_contact_address_payment" />
+            <preset_link preset_name="Public bath" text="Similar but different tags:" />
+            <preset_link preset_name="Sports Centre" text="Similar but different tags:" />
         </item> <!-- Water Park -->
+        <item name="Public bath" icon="presets/leisure/public_bath.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Tag:amenity=public_bath" />
+            <space />
+            <key key="amenity" value="public_bath" />
+            <reference ref="name_operator_oh_wheelchair" />
+            <combo key="bath:type" text="Type" values="hammam,hot_spring,lake,onsen,river,sento,thermal" values_context="bath:type" />
+            <check key="bath:open_air" text="Open air" />
+            <check key="shower" text="Shower" />
+            <checkgroup columns="3">
+                <check key="female" text="Female" text_context="restroom" />
+                <check key="male" text="Male" text_context="restroom" />
+                <check key="unisex" text="Unisex" text_context="restroom" />
+            </checkgroup>
+            <reference ref="fee" />
+            <space />
+            <reference ref="link_contact_address_payment" />
+            <preset_link preset_name="Water Park" text="Similar but different tags:" />
+            <preset_link preset_name="Sports Centre" text="Similar but different tags:" />
+        </item> <!-- Public bath -->
         <item name="Resort" icon="presets/leisure/resort.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:leisure=resort" />
@@ -7685,6 +7706,6 @@
             <text key="description" text="Description" match="key" />
             <space />
-            <preset_link preset_name="Note" text="Similar but different tags:" text_context="note=*, fixme=*, description=*" />
-            <preset_link preset_name="Fixme" text="Similar but different tags:" text_context="note=*, fixme=*, description=*" />
+            <preset_link preset_name="Note" text="Similar but different tags:" />
+            <preset_link preset_name="Fixme" text="Similar but different tags:" />
         </item> <!-- Description -->
         <item name="Note" icon="presets/misc/note.svg" name_context="the tag note=*" type="node,way,closedway,multipolygon,relation" preset_name_label="true">
@@ -7695,6 +7716,6 @@
             <text key="note" text="Note" text_context="the tag note=*" match="key" />
             <space />
-            <preset_link preset_name="Fixme" text="Similar but different tags:" text_context="note=*, fixme=*, description=*" />
-            <preset_link preset_name="Description" text="Similar but different tags:" text_context="note=*, fixme=*, description=*" />
+            <preset_link preset_name="Fixme" text="Similar but different tags:" />
+            <preset_link preset_name="Description" text="Similar but different tags:" />
         </item> <!-- Note -->
         <item name="Fixme" icon="presets/misc/fixme.svg" type="node,way,closedway,multipolygon,relation" preset_name_label="true">
@@ -7705,6 +7726,6 @@
             <text key="fixme" text="Fixme" match="key" />
             <space />
-            <preset_link preset_name="Note" text="Similar but different tags:" text_context="note=*, fixme=*, description=*" />
-            <preset_link preset_name="Description" text="Similar but different tags:" text_context="note=*, fixme=*, description=*" />
+            <preset_link preset_name="Note" text="Similar but different tags:" />
+            <preset_link preset_name="Description" text="Similar but different tags:" />
         </item> <!-- Fixme -->
     </group> <!-- Annotation -->
Index: /trunk/resources/images/presets/leisure/public_bath.svg
===================================================================
--- /trunk/resources/images/presets/leisure/public_bath.svg	(revision 16479)
+++ /trunk/resources/images/presets/leisure/public_bath.svg	(revision 16479)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" 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" width="14" height="14" version="1.1" id="svg8">
+  <defs id="defs2"/>
+  <metadata id="metadata5">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <rect x="0" y="0" width="14" height="14" id="canvas" style="visibility:hidden;fill:none;stroke:none"/>
+  <path d="M 1.65421264,11.0000406 C 1.2278399,11.0000406 0.597367898,11.3624969 0.016138571,11.650988 L 0,13.6777956 C 0.60987926,13.3856384 1.26337235,13.0000135 1.65421378,13.0000135 2.32305249,13.0000135 3.59890634,14 4.30708821,14 4.93781155,14 6.28651045,13.0000135 6.95996245,13.0000135 7.62880117,13.0000135 8.97844268,14 9.6128367,14 10.2816765,14 11.6362175,13.0000135 12.2657132,13.0000135 12.6597037,13.0000135 13.3377157,13.3917234 13.9538671,13.6848255 L 14,11.6613061 C 13.4001924,11.3615898 12.7025208,10.9756248 12.2657166,11.0000406 11.6313211,11.0000406 10.3221171,12.000027 9.61284048,12.000027 9.0226892,12.000027 7.62880495,11.0000406 6.95996623,11.0000406 6.29112752,11.0000406 4.898554,12.000027 4.30709161,12.000027 3.67636846,12.000027 2.36239961,11.0000406 1.65421264,11.0000406 Z M 4.75,4.00031835 C 3.94354839,4.0003754 3,5 3,6.5 V 10 H 4.25 V 6 C 4.25,5.39764301 4.48208677,5.3 4.75,5.3 V 10 H 9.25 V 5.3 C 9.52068931,5.3 9.71255839,5.40093421 9.75,6 V 10 H 11 V 6.5 C 11,5 10.0564516,3.99994295 9.25,4 Z M 6.99999967,0.25 C 6.03349795,0.25 5.25,1.03352486 5.25,2.00000005 5.25,2.96647524 6.03349795,3.75 6.99999967,3.75 7.96650205,3.75 8.75,2.96647524 8.75,2.00000005 8.75,1.03352486 7.96650205,0.25 6.99999967,0.25 Z" style="fill:#734a08;fill-opacity:1;stroke-width:1.329874635" id="public-bath"/>
+</svg>
Index: /trunk/resources/styles/standard/elemstyles.mapcss
===================================================================
--- /trunk/resources/styles/standard/elemstyles.mapcss	(revision 16478)
+++ /trunk/resources/styles/standard/elemstyles.mapcss	(revision 16479)
@@ -3008,4 +3008,5 @@
 area[amenity=cinema],
 area[amenity=dive_centre],
+area[amenity=public_bath],
 area[amenity=arts_centre],
 area[amenity=courthouse],
@@ -3052,4 +3053,8 @@
 node[amenity=dive_centre] {
     icon-image: "presets/leisure/dive_centre.svg";
+    set icon_z17;
+}
+node[amenity=public_bath] {
+    icon-image: "presets/leisure/public_bath.svg";
     set icon_z17;
 }