From 57371ed51510a14d441d761eac2bfc70ea989982 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Wed, 21 Aug 2013 16:41:06 -0700
Subject: [PATCH] Refine toilet preset

Fixes #1697
---
 data/presets.yaml                         |  2 ++
 data/presets/fields.json                  |  5 +++++
 data/presets/fields/toilets/disposal.json |  5 +++++
 data/presets/presets.json                 | 14 ++++++++++++--
 data/presets/presets/amenity/toilets.json | 14 ++++++++++++--
 dist/locales/en.json                      |  5 ++++-
 6 files changed, 40 insertions(+), 5 deletions(-)
 create mode 100644 data/presets/fields/toilets/disposal.json

diff --git a/data/presets.yaml b/data/presets.yaml
index 97af88f3a..a2b3fb0b5 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -234,6 +234,8 @@ en:
         label: Supervised
       surface: 
         label: Surface
+      toilets/disposal: 
+        label: Disposal
       tourism: 
         label: Type
       towertype: 
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 6960433fb..812832a43 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -572,6 +572,11 @@
         "type": "combo",
         "label": "Surface"
     },
+    "toilets/disposal": {
+        "key": "toilets:disposal",
+        "type": "combo",
+        "label": "Disposal"
+    },
     "tourism": {
         "key": "tourism",
         "type": "combo",
diff --git a/data/presets/fields/toilets/disposal.json b/data/presets/fields/toilets/disposal.json
new file mode 100644
index 000000000..1ca02b975
--- /dev/null
+++ b/data/presets/fields/toilets/disposal.json
@@ -0,0 +1,5 @@
+{
+    "key": "toilets:disposal",
+    "type": "combo",
+    "label": "Disposal"
+}
\ No newline at end of file
diff --git a/data/presets/presets.json b/data/presets/presets.json
index fbdfe287a..f52f47f93 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -1078,8 +1078,10 @@
     },
     "amenity/toilets": {
         "fields": [
+            "toilets/disposal",
             "operator",
-            "building_area"
+            "building_area",
+            "access"
         ],
         "geometry": [
             "point",
@@ -1088,7 +1090,15 @@
         ],
         "terms": [
             "bathroom",
-            "restroom"
+            "restroom",
+            "outhouse",
+            "privy",
+            "head",
+            "lavatory",
+            "latrine",
+            "water closet",
+            "WC",
+            "W.C."
         ],
         "tags": {
             "amenity": "toilets"
diff --git a/data/presets/presets/amenity/toilets.json b/data/presets/presets/amenity/toilets.json
index fb03ce27b..1893840b2 100644
--- a/data/presets/presets/amenity/toilets.json
+++ b/data/presets/presets/amenity/toilets.json
@@ -1,7 +1,9 @@
 {
     "fields": [
+        "toilets/disposal",
         "operator",
-        "building_area"
+        "building_area",
+        "access"
     ],
     "geometry": [
         "point",
@@ -10,7 +12,15 @@
     ],
     "terms": [
         "bathroom",
-        "restroom"
+        "restroom",
+        "outhouse",
+        "privy",
+        "head",
+        "lavatory",
+        "latrine",
+        "water closet",
+        "WC",
+        "W.C."
     ],
     "tags": {
         "amenity": "toilets"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index e63f7775e..c612b9aa5 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -695,6 +695,9 @@
             "surface": {
                 "label": "Surface"
             },
+            "toilets/disposal": {
+                "label": "Disposal"
+            },
             "tourism": {
                 "label": "Type"
             },
@@ -945,7 +948,7 @@
             },
             "amenity/toilets": {
                 "name": "Toilets",
-                "terms": "bathroom,restroom"
+                "terms": "bathroom,restroom,outhouse,privy,head,lavatory,latrine,water closet,WC,W.C."
             },
             "amenity/townhall": {
                 "name": "Town Hall",