From 5d5e29a772db78959cc463f92a2f7e77cf3595c0 Mon Sep 17 00:00:00 2001
From: Quincy Morgan <quincy.morgan@icloud.com>
Date: Mon, 25 Nov 2019 13:44:46 -0500
Subject: [PATCH] Add `man_made=water_tap` preset (close #7066) Add fields for
 `fountain`, `pump`, and `drinking_water` tags to relevant presets Add fields
 and terms to various water source presets Deprecate `man_made=village_pump`

---
 data/deprecated.json                          |  4 ++++
 data/presets.yaml                             | 21 ++++++++++++++++
 data/presets/fields.json                      |  3 +++
 data/presets/fields/drinking_water.json       |  9 +++++++
 data/presets/fields/fountain.json             |  5 ++++
 data/presets/fields/pump.json                 |  5 ++++
 data/presets/presets.json                     | 11 +++++----
 data/presets/presets/amenity/fountain.json    |  6 +++++
 data/presets/presets/amenity/water_point.json | 14 +++++++++++
 data/presets/presets/man_made/water_tap.json  | 24 +++++++++++++++++++
 data/presets/presets/man_made/water_well.json | 12 +++++++++-
 data/presets/presets/natural/spring.json      |  8 ++++++-
 .../presets/presets/waterway/water_point.json | 13 ++++++++++
 data/taginfo.json                             |  5 ++++
 dist/locales/en.json                          | 24 +++++++++++++++----
 15 files changed, 152 insertions(+), 12 deletions(-)
 create mode 100644 data/presets/fields/drinking_water.json
 create mode 100644 data/presets/fields/fountain.json
 create mode 100644 data/presets/fields/pump.json
 create mode 100644 data/presets/presets/man_made/water_tap.json

diff --git a/data/deprecated.json b/data/deprecated.json
index 00b4b8f6b..3cca90ad1 100644
--- a/data/deprecated.json
+++ b/data/deprecated.json
@@ -635,6 +635,10 @@
       "old": {"man_made": "oil_tank"},
       "replace": {"man_made": "storage_tank", "content": "oil"}
     },
+    {
+      "old": {"man_made": "village_pump"},
+      "replace": {"man_made": "water_well"}
+    },
     {
       "old": {"man_made": "wastewater_tank"},
       "replace": {"man_made": "storage_tank", "content": "wastewater"}
diff --git a/data/presets.yaml b/data/presets.yaml
index 3e1c52912..a91cecc01 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -714,6 +714,11 @@ en:
       drink_multi:
         # 'drink:=*'
         label: Drinks
+      drinking_water:
+        # drinking_water=*
+        label: Drinkable
+        # 'terms: drinkworthy,potable'
+        terms: '[translate with synonyms or related terms for ''Drinkable'', separated by commas]'
       drive_through:
         # drive_through=*
         label: Drive-Through
@@ -838,6 +843,9 @@ en:
         label: Type
         # ford field placeholder
         placeholder: Default
+      fountain:
+        # fountain=*
+        label: Type
       frequency:
         # frequency=*
         label: Operating Frequency
@@ -1721,6 +1729,9 @@ en:
       public_bookcase/type:
         # 'public_bookcase:type=*'
         label: Type
+      pump:
+        # pump=*
+        label: Pump
       railway:
         # railway=*
         label: Type
@@ -3076,6 +3087,7 @@ en:
       amenity/fountain:
         # amenity=fountain
         name: Fountain
+        # 'terms: basin,water'
         terms: '<translate with synonyms or related terms for ''Fountain'', separated by commas>'
       amenity/fuel:
         # amenity=fuel
@@ -3787,6 +3799,7 @@ en:
       amenity/water_point:
         # amenity=water_point
         name: RV Drinking Water
+        # 'terms: water faucet,water point,water tap,water source,water spigot'
         terms: '<translate with synonyms or related terms for ''RV Drinking Water'', separated by commas>'
       amenity/watering_place:
         # amenity=watering_place
@@ -6105,6 +6118,11 @@ en:
         name: Wastewater Plant
         # 'terms: sewage*,water treatment plant,reclamation plant'
         terms: '<translate with synonyms or related terms for ''Wastewater Plant'', separated by commas>'
+      man_made/water_tap:
+        # man_made=water_tap
+        name: Water Tap
+        # 'terms: drinking water,water faucet,water point,water source,water spigot'
+        terms: '<translate with synonyms or related terms for ''Water Tap'', separated by commas>'
       man_made/water_tower:
         # man_made=water_tower
         name: Water Tower
@@ -6112,6 +6130,7 @@ en:
       man_made/water_well:
         # man_made=water_well
         name: Water Well
+        # 'terms: aquifer,drinking water,water point,water source'
         terms: '<translate with synonyms or related terms for ''Water Well'', separated by commas>'
       man_made/water_works:
         # man_made=water_works
@@ -6265,6 +6284,7 @@ en:
       natural/spring:
         # natural=spring
         name: Spring
+        # 'terms: aquifer,hydro,seep,water source'
         terms: '<translate with synonyms or related terms for ''Spring'', separated by commas>'
       natural/stone:
         # natural=stone
@@ -8388,6 +8408,7 @@ en:
       waterway/water_point:
         # waterway=water_point
         name: Marine Drinking Water
+        # 'terms: water faucet,water point,water tap,water source,water spigot'
         terms: '<translate with synonyms or related terms for ''Marine Drinking Water'', separated by commas>'
       waterway/waterfall:
         # waterway=waterfall
diff --git a/data/presets/fields.json b/data/presets/fields.json
index ad5f3407d..7b2289e24 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -120,6 +120,7 @@
     "door_type": {"key": "door", "type": "typeCombo", "label": "Type"},
     "door": {"key": "door", "type": "combo", "label": "Door"},
     "drink_multi": {"key": "drink:", "type": "multiCombo", "label": "Drinks"},
+    "drinking_water": {"key": "drinking_water", "type": "check", "label": "Drinkable", "terms": ["drinkworthy", "potable"]},
     "drive_through": {"key": "drive_through", "type": "check", "label": "Drive-Through"},
     "duration": {"key": "duration", "type": "text", "label": "Duration", "placeholder": "00:00"},
     "electrified": {"key": "electrified", "type": "combo", "label": "Electrification", "placeholder": "Contact Line, Electrified Rail...", "strings": {"options": {"contact_line": "Contact Line", "rail": "Electrified Rail", "yes": "Yes (unspecified)", "no": "No"}}},
@@ -147,6 +148,7 @@
     "floating": {"key": "floating", "type": "check", "label": "Floating"},
     "flood_prone": {"key": "flood_prone", "type": "check", "label": "Flood Prone"},
     "ford": {"key": "ford", "type": "typeCombo", "label": "Type", "placeholder": "Default"},
+    "fountain": {"key": "fountain", "type": "combo", "label": "Type"},
     "frequency_electrified": {"key": "frequency", "type": "combo", "label": "Operating Frequency", "prerequisiteTag": {"key": "electrified", "valueNot": "no"}},
     "frequency": {"key": "frequency", "type": "combo", "label": "Operating Frequency"},
     "from": {"key": "from", "type": "text", "label": "From"},
@@ -292,6 +294,7 @@
     "produce": {"key": "produce", "type": "semiCombo", "label": "Produce"},
     "product": {"key": "product", "type": "semiCombo", "label": "Products"},
     "public_bookcase/type": {"key": "public_bookcase:type", "type": "combo", "label": "Type"},
+    "pump": {"key": "pump", "type": "combo", "label": "Pump"},
     "railway": {"key": "railway", "type": "typeCombo", "label": "Type"},
     "railway/position": {"key": "railway:position", "type": "text", "placeholder": "Distance to one decimal (123.4)", "label": "Milestone Position"},
     "railway/signal/direction": {"key": "railway:signal:direction", "type": "combo", "label": "Direction Affected", "strings": {"options": {"forward": "Forward", "backward": "Backward", "both": "Both / All"}}},
diff --git a/data/presets/fields/drinking_water.json b/data/presets/fields/drinking_water.json
new file mode 100644
index 000000000..203940973
--- /dev/null
+++ b/data/presets/fields/drinking_water.json
@@ -0,0 +1,9 @@
+{
+    "key": "drinking_water",
+    "type": "check",
+    "label": "Drinkable",
+    "terms": [
+        "drinkworthy",
+        "potable"
+    ]
+}
diff --git a/data/presets/fields/fountain.json b/data/presets/fields/fountain.json
new file mode 100644
index 000000000..de00d7ceb
--- /dev/null
+++ b/data/presets/fields/fountain.json
@@ -0,0 +1,5 @@
+{
+    "key": "fountain",
+    "type": "combo",
+    "label": "Type"
+}
diff --git a/data/presets/fields/pump.json b/data/presets/fields/pump.json
new file mode 100644
index 000000000..a5c71ce7f
--- /dev/null
+++ b/data/presets/fields/pump.json
@@ -0,0 +1,5 @@
+{
+    "key": "pump",
+    "type": "combo",
+    "label": "Pump"
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 5ddc8eeb3..2c7e9ca6f 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -126,7 +126,7 @@
     "amenity/fast_food/sandwich": {"icon": "temaki-sandwich", "geometry": ["point", "area"], "terms": ["breakfast", "cafe", "café", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "fast_food", "cuisine": "sandwich"}, "reference": {"key": "cuisine", "value": "sandwich"}, "name": "Sandwich Fast Food"},
     "amenity/fire_station": {"icon": "maki-fire-station", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["email", "fax", "phone", "polling_station", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": [], "tags": {"amenity": "fire_station"}, "name": "Fire Station"},
     "amenity/food_court": {"icon": "maki-restaurant", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["capacity", "diet_multi", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "outdoor_seating", "phone", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["fast food", "restaurant", "food"], "tags": {"amenity": "food_court"}, "name": "Food Court"},
-    "amenity/fountain": {"icon": "temaki-fountain", "fields": ["name", "operator", "height", "lit"], "moreFields": ["covered", "indoor", "level", "manufacturer"], "geometry": ["point", "area"], "tags": {"amenity": "fountain"}, "name": "Fountain"},
+    "amenity/fountain": {"icon": "temaki-fountain", "fields": ["name", "operator", "fountain", "drinking_water", "height", "lit"], "moreFields": ["covered", "indoor", "level", "manufacturer"], "geometry": ["point", "area"], "tags": {"amenity": "fountain"}, "terms": ["basin", "water"], "name": "Fountain"},
     "amenity/fuel": {"icon": "maki-fuel", "fields": ["name", "brand", "operator", "address", "fuel_multi", "self_service"], "moreFields": ["building", "email", "fax", "opening_hours", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["petrol", "fuel", "gasoline", "propane", "diesel", "lng", "cng", "biodiesel"], "tags": {"amenity": "fuel"}, "name": "Gas Station"},
     "amenity/grave_yard": {"icon": "maki-cemetery", "fields": ["religion", "address"], "moreFields": ["email", "fax", "phone", "website"], "geometry": ["point", "area"], "tags": {"amenity": "grave_yard"}, "name": "Graveyard"},
     "amenity/grit_bin": {"icon": "fas-box", "fields": ["operator", "access_simple", "material", "collection_times"], "moreFields": ["colour", "height", "lit"], "geometry": ["point", "vertex"], "tags": {"amenity": "grit_bin"}, "terms": ["salt", "sand"], "name": "Grit Bin"},
@@ -268,7 +268,7 @@
     "amenity/waste_disposal": {"icon": "fas-dumpster", "fields": ["operator", "waste", "collection_times", "access_simple"], "moreFields": ["brand", "colour", "height", "manufacturer", "material"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "waste_disposal"}, "terms": ["garbage", "rubbish", "litter", "trash"], "name": "Garbage Dumpster"},
     "amenity/waste_transfer_station": {"icon": "maki-waste-basket", "fields": ["name", "operator", "operator/type", "waste", "address", "opening_hours", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["email", "fax", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["dump", "garbage", "recycling", "rubbish", "scrap", "trash"], "tags": {"amenity": "waste_transfer_station"}, "name": "Waste Transfer Station"},
     "amenity/waste/dog_excrement": {"icon": "maki-waste-basket", "fields": ["collection_times"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "waste_basket", "waste": "dog_excrement"}, "reference": {"key": "waste", "value": "dog_excrement"}, "terms": ["bin", "garbage", "rubbish", "litter", "trash", "poo", "dog"], "name": "Dog Excrement Bin"},
-    "amenity/water_point": {"icon": "maki-drinking-water", "fields": ["operator", "fee", "payment_multi_fee", "charge_fee", "opening_hours"], "geometry": ["area", "vertex", "point"], "tags": {"amenity": "water_point"}, "name": "RV Drinking Water"},
+    "amenity/water_point": {"icon": "maki-drinking-water", "fields": ["operator", "access_simple", "fee", "payment_multi_fee", "charge_fee", "opening_hours"], "moreFields": ["covered", "drinking_water", "lit", "ref"], "geometry": ["area", "vertex", "point"], "tags": {"amenity": "water_point"}, "terms": ["water faucet", "water point", "water tap", "water source", "water spigot"], "name": "RV Drinking Water"},
     "amenity/watering_place": {"icon": "maki-drinking-water", "fields": ["operator", "fee", "payment_multi_fee", "charge_fee", "opening_hours"], "geometry": ["area", "vertex", "point"], "tags": {"amenity": "watering_place"}, "name": "Animal Watering Place"},
     "amenity/weighbridge": {"icon": "fas-weight", "fields": ["ref", "operator", "access_simple", "maxweight"], "moreFields": ["address", "colour", "lit", "manufacturer", "material", "wheelchair"], "geometry": ["point", "vertex"], "terms": ["weigh station", "weighbridge"], "tags": {"amenity": "weighbridge"}, "name": "Truck Scale"},
     "area": {"fields": ["name"], "geometry": ["area"], "tags": {"area": "yes"}, "terms": ["polygon"], "name": "Area", "matchScore": 0.1},
@@ -771,8 +771,9 @@
     "man_made/tunnel": {"icon": "tnp-2009642", "fields": ["name", "tunnel", "layer", "width", "length", "height"], "geometry": ["area"], "tags": {"man_made": "tunnel"}, "addTags": {"man_made": "tunnel", "layer": "-1"}, "removeTags": {"man_made": "tunnel", "layer": "*"}, "reference": {"key": "man_made", "value": "tunnel"}, "terms": ["bore", "dig", "shaft", "underground passage", "underpass"], "name": "Tunnel Area"},
     "man_made/utility_pole": {"icon": "temaki-utility_pole", "fields": ["ref", "operator", "utility_semi", "height", "material"], "moreFields": ["colour", "manufacturer"], "geometry": ["point", "vertex"], "tags": {"man_made": "utility_pole"}, "name": "Utility Pole"},
     "man_made/wastewater_plant": {"icon": "temaki-waste", "fields": ["name", "operator", "address"], "moreFields": ["email", "fax", "phone", "website"], "geometry": ["point", "area"], "terms": ["sewage*", "water treatment plant", "reclamation plant"], "tags": {"man_made": "wastewater_plant"}, "name": "Wastewater Plant"},
+    "man_made/water_tap": {"icon": "maki-drinking-water", "fields": ["ref", "operator", "drinking_water", "access_simple"], "geometry": ["point", "vertex"], "tags": {"man_made": "water_tap"}, "terms": ["drinking water", "water faucet", "water point", "water source", "water spigot"], "name": "Water Tap"},
     "man_made/water_tower": {"icon": "maki-water", "fields": ["operator", "height"], "geometry": ["point", "area"], "tags": {"man_made": "water_tower"}, "name": "Water Tower"},
-    "man_made/water_well": {"icon": "maki-water", "fields": ["operator"], "geometry": ["point", "area"], "tags": {"man_made": "water_well"}, "name": "Water Well"},
+    "man_made/water_well": {"icon": "maki-water", "fields": ["ref", "operator", "drinking_water", "pump", "access_simple"], "geometry": ["point", "area"], "tags": {"man_made": "water_well"}, "terms": ["aquifer", "drinking water", "water point", "water source"], "name": "Water Well"},
     "man_made/water_works": {"icon": "maki-water", "fields": ["name", "operator", "address"], "geometry": ["point", "area"], "tags": {"man_made": "water_works"}, "name": "Water Works"},
     "man_made/watermill": {"icon": "maki-watermill", "fields": ["building_area"], "geometry": ["point", "area"], "terms": ["water", "wheel", "mill"], "tags": {"man_made": "watermill"}, "name": "Watermill"},
     "man_made/windmill": {"icon": "maki-windmill", "fields": ["building_area"], "geometry": ["point", "area"], "terms": ["wind", "wheel", "mill"], "tags": {"man_made": "windmill"}, "name": "Windmill"},
@@ -803,7 +804,7 @@
     "natural/scree": {"geometry": ["area"], "tags": {"natural": "scree"}, "terms": ["loose rocks"], "name": "Scree"},
     "natural/scrub": {"geometry": ["area"], "tags": {"natural": "scrub"}, "terms": ["bush", "shrubs"], "name": "Scrub"},
     "natural/shingle": {"geometry": ["area"], "tags": {"natural": "shingle"}, "terms": ["beach", "gravel", "pebbles", "riverbed", "rounded rock fragments"], "name": "Shingle"},
-    "natural/spring": {"icon": "maki-water", "fields": ["name", "intermittent"], "geometry": ["point", "vertex"], "tags": {"natural": "spring"}, "terms": [], "name": "Spring"},
+    "natural/spring": {"icon": "maki-water", "fields": ["name", "drinking_water", "intermittent"], "geometry": ["point", "vertex"], "tags": {"natural": "spring"}, "terms": ["aquifer", "hydro", "seep", "water source"], "name": "Spring"},
     "natural/stone": {"icon": "temaki-boulder1", "fields": ["name"], "geometry": ["point", "area"], "tags": {"natural": "stone"}, "terms": ["boulder", "stone", "rock"], "name": "Unattached Stone / Boulder"},
     "natural/tree_row": {"icon": "maki-park", "fields": ["leaf_type", "leaf_cycle", "denotation"], "geometry": ["line"], "tags": {"natural": "tree_row"}, "terms": [], "name": "Tree Row"},
     "natural/tree": {"icon": "maki-park", "fields": ["leaf_type_singular", "leaf_cycle_singular", "denotation", "diameter"], "moreFields": ["species/wikidata"], "geometry": ["point", "vertex"], "tags": {"natural": "tree"}, "terms": [], "name": "Tree"},
@@ -1264,7 +1265,7 @@
     "waterway/sanitary_dump_station": {"icon": "temaki-storage_tank", "fields": ["name", "operator", "access_simple", "fee", "payment_multi_fee", "charge_fee", "water_point"], "moreFields": ["opening_hours", "seamark/type"], "geometry": ["point", "vertex", "area"], "terms": ["Boat", "Watercraft", "Sanitary", "Dump Station", "Pumpout", "Pump out", "Elsan", "CDP", "CTDP", "Chemical Toilet"], "tags": {"waterway": "sanitary_dump_station"}, "name": "Marine Toilet Disposal"},
     "waterway/stream_intermittent": {"icon": "iD-waterway-stream", "fields": ["{waterway/stream}"], "moreFields": ["{waterway/stream}"], "geometry": ["line"], "terms": ["arroyo", "beck", "branch", "brook", "burn", "course", "creek", "drift", "flood", "flow", "gully", "run", "runnel", "rush", "spate", "spritz", "tributary", "wadi", "wash", "watercourse"], "tags": {"waterway": "stream", "intermittent": "yes"}, "reference": {"key": "waterway", "value": "stream"}, "name": "Intermittent Stream"},
     "waterway/stream": {"icon": "iD-waterway-stream", "fields": ["name", "structure_waterway", "width", "intermittent"], "moreFields": ["covered", "fishing", "salt", "tidal"], "geometry": ["line"], "terms": ["beck", "branch", "brook", "burn", "course", "creek", "current", "drift", "flood", "flow", "freshet", "race", "rill", "rindle", "rivulet", "run", "runnel", "rush", "spate", "spritz", "surge", "tide", "torrent", "tributary", "watercourse"], "tags": {"waterway": "stream"}, "name": "Stream"},
-    "waterway/water_point": {"icon": "maki-drinking-water", "geometry": ["area", "vertex", "point"], "tags": {"waterway": "water_point"}, "name": "Marine Drinking Water"},
+    "waterway/water_point": {"icon": "maki-drinking-water", "fields": ["{amenity/water_point}"], "moreFields": ["{amenity/water_point}"], "geometry": ["area", "vertex", "point"], "tags": {"waterway": "water_point"}, "terms": ["water faucet", "water point", "water tap", "water source", "water spigot"], "name": "Marine Drinking Water"},
     "waterway/waterfall": {"icon": "maki-waterfall", "fields": ["name", "height", "width", "intermittent"], "geometry": ["vertex"], "terms": ["fall"], "tags": {"waterway": "waterfall"}, "name": "Waterfall"},
     "waterway/weir": {"icon": "maki-dam", "fields": ["name", "operator", "height", "material"], "moreFields": ["seamark/type"], "geometry": ["vertex", "line"], "terms": ["low-head dam", "low-rise dam", "wier"], "tags": {"waterway": "weir"}, "name": "Weir"},
     "amenity/animal_boarding/PetsHotel": {"name": "PetsHotel", "icon": "maki-veterinary", "imageURL": "https://graph.facebook.com/PetSmart/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q67141961", "amenity": "animal_boarding"}, "addTags": {"amenity": "animal_boarding", "animal_boarding": "dog;cat", "brand": "PetsHotel", "brand:wikidata": "Q67141961", "name": "PetsHotel"}, "countryCodes": ["ca", "us"], "terms": [], "matchScore": 2, "suggestion": true},
diff --git a/data/presets/presets/amenity/fountain.json b/data/presets/presets/amenity/fountain.json
index bb3116457..2bd46138c 100644
--- a/data/presets/presets/amenity/fountain.json
+++ b/data/presets/presets/amenity/fountain.json
@@ -3,6 +3,8 @@
     "fields": [
         "name",
         "operator",
+        "fountain",
+        "drinking_water",
         "height",
         "lit"
     ],
@@ -19,5 +21,9 @@
     "tags": {
         "amenity": "fountain"
     },
+    "terms": [
+        "basin",
+        "water"
+    ],
     "name": "Fountain"
 }
diff --git a/data/presets/presets/amenity/water_point.json b/data/presets/presets/amenity/water_point.json
index 9e1efbd28..b3fd536f3 100644
--- a/data/presets/presets/amenity/water_point.json
+++ b/data/presets/presets/amenity/water_point.json
@@ -2,11 +2,18 @@
     "icon": "maki-drinking-water",
     "fields": [
         "operator",
+        "access_simple",
         "fee",
         "payment_multi_fee",
         "charge_fee",
         "opening_hours"
     ],
+    "moreFields": [
+        "covered",
+        "drinking_water",
+        "lit",
+        "ref"
+    ],
     "geometry": [
         "area",
         "vertex",
@@ -15,5 +22,12 @@
     "tags": {
         "amenity": "water_point"
     },
+    "terms": [
+        "water faucet",
+        "water point",
+        "water tap",
+        "water source",
+        "water spigot"
+    ],
     "name": "RV Drinking Water"
 }
diff --git a/data/presets/presets/man_made/water_tap.json b/data/presets/presets/man_made/water_tap.json
new file mode 100644
index 000000000..9c4a7606e
--- /dev/null
+++ b/data/presets/presets/man_made/water_tap.json
@@ -0,0 +1,24 @@
+{
+    "icon": "maki-drinking-water",
+    "fields": [
+        "ref",
+        "operator",
+        "drinking_water",
+        "access_simple"
+    ],
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "tags": {
+        "man_made": "water_tap"
+    },
+    "terms": [
+        "drinking water",
+        "water faucet",
+        "water point",
+        "water source",
+        "water spigot"
+    ],
+    "name": "Water Tap"
+}
diff --git a/data/presets/presets/man_made/water_well.json b/data/presets/presets/man_made/water_well.json
index a653713e0..2761c73d0 100644
--- a/data/presets/presets/man_made/water_well.json
+++ b/data/presets/presets/man_made/water_well.json
@@ -1,7 +1,11 @@
 {
     "icon": "maki-water",
     "fields": [
-        "operator"
+        "ref",
+        "operator",
+        "drinking_water",
+        "pump",
+        "access_simple"
     ],
     "geometry": [
         "point",
@@ -10,5 +14,11 @@
     "tags": {
         "man_made": "water_well"
     },
+    "terms": [
+        "aquifer",
+        "drinking water",
+        "water point",
+        "water source"
+    ],
     "name": "Water Well"
 }
diff --git a/data/presets/presets/natural/spring.json b/data/presets/presets/natural/spring.json
index 49f0f6fb4..22d9478a3 100644
--- a/data/presets/presets/natural/spring.json
+++ b/data/presets/presets/natural/spring.json
@@ -2,6 +2,7 @@
     "icon": "maki-water",
     "fields": [
         "name",
+        "drinking_water",
         "intermittent"
     ],
     "geometry": [
@@ -11,6 +12,11 @@
     "tags": {
         "natural": "spring"
     },
-    "terms": [],
+    "terms": [
+        "aquifer",
+        "hydro",
+        "seep",
+        "water source"
+    ],
     "name": "Spring"
 }
diff --git a/data/presets/presets/waterway/water_point.json b/data/presets/presets/waterway/water_point.json
index a7bad2434..7829fb525 100644
--- a/data/presets/presets/waterway/water_point.json
+++ b/data/presets/presets/waterway/water_point.json
@@ -1,5 +1,11 @@
 {
     "icon": "maki-drinking-water",
+    "fields": [
+        "{amenity/water_point}"
+    ],
+    "moreFields": [
+        "{amenity/water_point}"
+    ],
     "geometry": [
         "area",
         "vertex",
@@ -8,5 +14,12 @@
     "tags": {
         "waterway": "water_point"
     },
+    "terms": [
+        "water faucet",
+        "water point",
+        "water tap",
+        "water source",
+        "water spigot"
+    ],
     "name": "Marine Drinking Water"
 }
diff --git a/data/taginfo.json b/data/taginfo.json
index 4bed502d4..1ef7b9047 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -746,6 +746,7 @@
     {"key": "man_made", "value": "tunnel", "description": "🄿 Tunnel Area", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/the-noun-project/2009642.svg"},
     {"key": "man_made", "value": "utility_pole", "description": "🄿 Utility Pole", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/utility_pole.svg"},
     {"key": "man_made", "value": "wastewater_plant", "description": "🄿 Wastewater Plant", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/waste.svg"},
+    {"key": "man_made", "value": "water_tap", "description": "🄿 Water Tap", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/drinking-water-15.svg"},
     {"key": "man_made", "value": "water_tower", "description": "🄿 Water Tower", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/water-15.svg"},
     {"key": "man_made", "value": "water_well", "description": "🄿 Water Well", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/water-15.svg"},
     {"key": "man_made", "value": "water_works", "description": "🄿 Water Works", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/water-15.svg"},
@@ -1426,6 +1427,7 @@
     {"key": "dog", "value": "no", "description": "🄵 Dogs"},
     {"key": "door", "description": "🄵 Type, 🄵 Door"},
     {"key": "drink:", "description": "🄵 Drinks"},
+    {"key": "drinking_water", "description": "🄵 Drinkable"},
     {"key": "drive_through", "description": "🄵 Drive-Through"},
     {"key": "duration", "description": "🄵 Duration"},
     {"key": "electrified", "value": "contact_line", "description": "🄵 Electrification"},
@@ -1455,6 +1457,7 @@
     {"key": "flag:type", "description": "🄵 Flag Type"},
     {"key": "floating", "description": "🄵 Floating"},
     {"key": "flood_prone", "description": "🄵 Flood Prone"},
+    {"key": "fountain", "description": "🄵 Type"},
     {"key": "frequency", "description": "🄵 Operating Frequency"},
     {"key": "from", "description": "🄵 From"},
     {"key": "fuel:", "description": "🄵 Fuel Types"},
@@ -1651,6 +1654,7 @@
     {"key": "produce", "description": "🄵 Produce"},
     {"key": "product", "description": "🄵 Products"},
     {"key": "public_bookcase:type", "description": "🄵 Type"},
+    {"key": "pump", "description": "🄵 Pump"},
     {"key": "railway:position", "description": "🄵 Milestone Position"},
     {"key": "railway:signal:direction", "value": "forward", "description": "🄵 Direction Affected"},
     {"key": "railway:signal:direction", "value": "backward", "description": "🄵 Direction Affected"},
@@ -2019,6 +2023,7 @@
     {"key": "man_made", "value": "MDF", "description": "🄳 ➜ telecom=exchange"},
     {"key": "man_made", "value": "fuel_storage_tank", "description": "🄳 ➜ man_made=storage_tank + content=fuel"},
     {"key": "man_made", "value": "oil_tank", "description": "🄳 ➜ man_made=storage_tank + content=oil"},
+    {"key": "man_made", "value": "village_pump", "description": "🄳 ➜ man_made=water_well"},
     {"key": "man_made", "value": "wastewater_tank", "description": "🄳 ➜ man_made=storage_tank + content=wastewater"},
     {"key": "man_made", "value": "water_tank", "description": "🄳 ➜ man_made=storage_tank + content=water"},
     {"key": "man_made", "value": "weigh_bridge", "description": "🄳 ➜ amenity=weighbridge"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index cdd71b0e9..527248585 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -3089,6 +3089,10 @@
                 "drink_multi": {
                     "label": "Drinks"
                 },
+                "drinking_water": {
+                    "label": "Drinkable",
+                    "terms": "drinkworthy,potable"
+                },
                 "drive_through": {
                     "label": "Drive-Through",
                     "terms": ""
@@ -3199,6 +3203,9 @@
                     "label": "Type",
                     "placeholder": "Default"
                 },
+                "fountain": {
+                    "label": "Type"
+                },
                 "frequency_electrified": {
                     "label": "Operating Frequency",
                     "terms": ""
@@ -3926,6 +3933,9 @@
                 "public_bookcase/type": {
                     "label": "Type"
                 },
+                "pump": {
+                    "label": "Pump"
+                },
                 "railway": {
                     "label": "Type"
                 },
@@ -5147,7 +5157,7 @@
                 },
                 "amenity/fountain": {
                     "name": "Fountain",
-                    "terms": ""
+                    "terms": "basin,water"
                 },
                 "amenity/fuel": {
                     "name": "Gas Station",
@@ -5715,7 +5725,7 @@
                 },
                 "amenity/water_point": {
                     "name": "RV Drinking Water",
-                    "terms": ""
+                    "terms": "water faucet,water point,water tap,water source,water spigot"
                 },
                 "amenity/watering_place": {
                     "name": "Animal Watering Place",
@@ -7700,13 +7710,17 @@
                     "name": "Wastewater Plant",
                     "terms": "sewage*,water treatment plant,reclamation plant"
                 },
+                "man_made/water_tap": {
+                    "name": "Water Tap",
+                    "terms": "drinking water,water faucet,water point,water source,water spigot"
+                },
                 "man_made/water_tower": {
                     "name": "Water Tower",
                     "terms": ""
                 },
                 "man_made/water_well": {
                     "name": "Water Well",
-                    "terms": ""
+                    "terms": "aquifer,drinking water,water point,water source"
                 },
                 "man_made/water_works": {
                     "name": "Water Works",
@@ -7830,7 +7844,7 @@
                 },
                 "natural/spring": {
                     "name": "Spring",
-                    "terms": ""
+                    "terms": "aquifer,hydro,seep,water source"
                 },
                 "natural/stone": {
                     "name": "Unattached Stone / Boulder",
@@ -9651,7 +9665,7 @@
                 },
                 "waterway/water_point": {
                     "name": "Marine Drinking Water",
-                    "terms": ""
+                    "terms": "water faucet,water point,water tap,water source,water spigot"
                 },
                 "waterway/waterfall": {
                     "name": "Waterfall",