From 889821d3834e694b6352c68fd17793af83ebbdf5 Mon Sep 17 00:00:00 2001
From: Martin Raifer <martin@raifer.tech>
Date: Mon, 10 Jan 2022 12:32:08 +0100
Subject: [PATCH] more details for water tank presets:

* allow emergency=water_tank also on reservoirs
* add (optional) "covered" field to water tanks, closes #344
---
 .../emergency/water_reservoir covered.json    | 29 ++++++++++++++++
 data/presets/emergency/water_reservoir.json   | 33 +++++++++++++++++++
 data/presets/emergency/water_tank.json        | 14 ++++++--
 data/presets/man_made/reservoir_covered.json  |  1 -
 data/presets/man_made/storage_tank/water.json |  5 +++
 interim/source_strings.yaml                   | 15 +++++++--
 6 files changed, 91 insertions(+), 6 deletions(-)
 create mode 100644 data/presets/emergency/water_reservoir covered.json
 create mode 100644 data/presets/emergency/water_reservoir.json

diff --git a/data/presets/emergency/water_reservoir covered.json b/data/presets/emergency/water_reservoir covered.json
new file mode 100644
index 00000000..55ba8ea9
--- /dev/null
+++ b/data/presets/emergency/water_reservoir covered.json	
@@ -0,0 +1,29 @@
+{
+    "icon": "maki-water",
+    "fields": [
+        "name",
+        "ref",
+        "operator",
+        "capacity_volume",
+        "layer"
+    ],
+    "moreFields": [
+        "water_tank/volume"
+    ],
+    "geometry": [
+        "point",
+        "vertex",
+        "area"
+    ],
+    "terms": [
+        "cistern",
+        "reservoir",
+        "extinguishing",
+        "firefighting"
+    ],
+    "tags": {
+        "emergency": "water_tank",
+        "man_made": "reservoir_covered"
+    },
+    "name": "Emergency Water Reservoir (Underground)"
+}
diff --git a/data/presets/emergency/water_reservoir.json b/data/presets/emergency/water_reservoir.json
new file mode 100644
index 00000000..a6a428ef
--- /dev/null
+++ b/data/presets/emergency/water_reservoir.json
@@ -0,0 +1,33 @@
+{
+    "icon": "maki-water",
+    "fields": [
+        "name",
+        "operator",
+        "water",
+        "covered"
+    ],
+    "moreFields": [
+        "ref"
+    ],
+    "geometry": [
+        "point",
+        "vertex",
+        "area"
+    ],
+    "terms": [
+        "basin",
+        "reservoir",
+        "extinguishing",
+        "firefighting"
+    ],
+    "tags": {
+        "emergency": "water_tank",
+        "landuse": "reservoir"
+    },
+    "addTags": {
+        "emergency": "water_tank",
+        "landuse": "reservoir",
+        "natural": "water"
+    },
+    "name": "Emergency Water Reservoir"
+}
diff --git a/data/presets/emergency/water_tank.json b/data/presets/emergency/water_tank.json
index 4cccd7ed..bb78b257 100644
--- a/data/presets/emergency/water_tank.json
+++ b/data/presets/emergency/water_tank.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-water",
+    "icon": "temaki-storage_tank",
     "fields": [
         "name",
         "ref",
@@ -8,6 +8,7 @@
         "drinking_water"
     ],
     "moreFields": [
+        "covered",
         "height",
         "material"
     ],
@@ -19,10 +20,17 @@
     "terms": [
         "water tank",
         "cistern",
-        "reservoir"
+        "extinguishing",
+        "firefighting"
     ],
     "tags": {
-        "emergency": "water_tank"
+        "emergency": "water_tank",
+        "landuse": "reservoir"
+    },
+    "addTags": {
+        "emergency": "water_tank",
+        "man_made": "storage_tank",
+        "content": "water"
     },
     "name": "Emergency Water Tank"
 }
diff --git a/data/presets/man_made/reservoir_covered.json b/data/presets/man_made/reservoir_covered.json
index 3335d9f0..7f832c52 100644
--- a/data/presets/man_made/reservoir_covered.json
+++ b/data/presets/man_made/reservoir_covered.json
@@ -5,7 +5,6 @@
         "operator",
         "capacity_volume",
         "access_simple",
-        "location",
         "layer"
     ],
     "moreFields": [
diff --git a/data/presets/man_made/storage_tank/water.json b/data/presets/man_made/storage_tank/water.json
index 3ce6068c..e258f697 100644
--- a/data/presets/man_made/storage_tank/water.json
+++ b/data/presets/man_made/storage_tank/water.json
@@ -4,6 +4,11 @@
         "point",
         "area"
     ],
+    "moreFields": [
+        "{man_made/storage_tank}",
+        "covered",
+        "ref"
+    ],
     "terms": [
         "cistern",
         "water tower"
diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml
index 33e4965c..e5cb8d51 100644
--- a/interim/source_strings.yaml
+++ b/interim/source_strings.yaml
@@ -3235,6 +3235,7 @@ en:
         label: Volume (Liters)
         # water_tank/volume field placeholder
         placeholder: '10000, 20000, 30000…'
+        terms: '[translate with synonyms or related terms for ''Volume (Liters)'', separated by commas]'
       water_volume:
         # water_volume=*
         label: Water Reserve Volume (m³)
@@ -5477,10 +5478,20 @@ en:
         name: Siren
         # 'terms: air raid,loud,noise,storm,tornado,warning'
         terms: '<translate with synonyms or related terms for ''Siren'', separated by commas>'
+      emergency/water_reservoir:
+        # 'emergency=water_tank + landuse=reservoir\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
+        name: Emergency Water Reservoir
+        # 'terms: basin,reservoir,extinguishing,firefighting'
+        terms: '<translate with synonyms or related terms for ''Emergency Water Reservoir'', separated by commas>'
+      emergency/water_reservoir covered:
+        # 'emergency=water_tank + man_made=reservoir_covered\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
+        name: Emergency Water Reservoir (Underground)
+        # 'terms: cistern,reservoir,extinguishing,firefighting'
+        terms: '<translate with synonyms or related terms for ''Emergency Water Reservoir (Underground)'', separated by commas>'
       emergency/water_tank:
-        # 'emergency=water_tank\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
+        # 'emergency=water_tank + landuse=reservoir\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
         name: Emergency Water Tank
-        # 'terms: water tank,cistern,reservoir'
+        # 'terms: water tank,cistern,extinguishing,firefighting'
         terms: '<translate with synonyms or related terms for ''Emergency Water Tank'', separated by commas>'
       emergency/yes:
         # 'emergency=yes\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'