From bcc09eb8b5b3c9fe166f160d74338045eb7d06ff Mon Sep 17 00:00:00 2001
From: Quincy Morgan <quincy.morgan@icloud.com>
Date: Wed, 2 Oct 2019 13:13:06 +0200
Subject: [PATCH] Add Type field to `landuse=residential` for the `residential`
 subkey

---
 data/presets.yaml                             | 3 +++
 data/presets/fields.json                      | 1 +
 data/presets/fields/residential.json          | 5 +++++
 data/presets/presets.json                     | 2 +-
 data/presets/presets/landuse/residential.json | 4 ++++
 data/taginfo.json                             | 1 +
 dist/locales/en.json                          | 4 ++++
 7 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 data/presets/fields/residential.json

diff --git a/data/presets.yaml b/data/presets.yaml
index 9c0d8320b..4c667a357 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -1810,6 +1810,9 @@ en:
           # reservation=yes
           'yes': Accepted
         terms: '[translate with synonyms or related terms for ''Reservations'', separated by commas]'
+      residential:
+        # residential=*
+        label: Type
       resort:
         # resort=*
         label: Type
diff --git a/data/presets/fields.json b/data/presets/fields.json
index e8213e704..0609662da 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -310,6 +310,7 @@
     "relation": {"key": "type", "type": "combo", "label": "Type"},
     "religion": {"key": "religion", "type": "combo", "label": "Religion"},
     "reservation": {"key": "reservation", "type": "combo", "label": "Reservations", "strings": {"options": {"yes": "Accepted", "no": "Not Accepted", "required": "Required", "recommended": "Recommended"}}},
+    "residential": {"key": "residential", "type": "combo", "label": "Type"},
     "resort": {"key": "resort", "type": "combo", "label": "Type"},
     "resource": {"key": "resource", "type": "semiCombo", "label": "Resources"},
     "restriction": {"key": "restriction", "type": "combo", "label": "Type"},
diff --git a/data/presets/fields/residential.json b/data/presets/fields/residential.json
new file mode 100644
index 000000000..8de70a9ff
--- /dev/null
+++ b/data/presets/fields/residential.json
@@ -0,0 +1,5 @@
+{
+    "key": "residential",
+    "type": "combo",
+    "label": "Type"
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 88958c38e..837e27b17 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -615,7 +615,7 @@
     "landuse/railway": {"icon": "maki-rail", "fields": ["operator"], "geometry": ["area"], "tags": {"landuse": "railway"}, "terms": ["rail", "train", "track"], "name": "Railway Corridor"},
     "landuse/recreation_ground": {"icon": "maki-pitch", "geometry": ["area"], "fields": ["name"], "moreFields": ["address", "email", "fax", "phone", "website"], "tags": {"landuse": "recreation_ground"}, "terms": ["playing fields"], "name": "Recreation Ground"},
     "landuse/religious": {"icon": "maki-place-of-worship", "geometry": ["area"], "fields": ["name", "religion", "denomination"], "moreFields": ["address", "email", "fax", "phone", "website"], "tags": {"landuse": "religious"}, "terms": [], "name": "Religious Area"},
-    "landuse/residential": {"icon": "maki-building", "geometry": ["area"], "tags": {"landuse": "residential"}, "terms": [], "matchScore": 0.9, "name": "Residential Area"},
+    "landuse/residential": {"icon": "maki-building", "fields": ["name", "residential"], "geometry": ["area"], "tags": {"landuse": "residential"}, "terms": [], "matchScore": 0.9, "name": "Residential Area"},
     "landuse/residential/apartments": {"icon": "maki-building", "fields": ["name", "operator", "address"], "geometry": ["point", "area"], "tags": {"residential": "apartments"}, "addTags": {"landuse": "residential", "residential": "apartments"}, "reference": {"key": "residential", "value": "apartments"}, "terms": ["flat", "residence", "tenement"], "name": "Apartment Complex"},
     "landuse/retail": {"icon": "maki-commercial", "geometry": ["area"], "fields": ["name"], "moreFields": ["address", "email", "fax", "phone", "website"], "tags": {"landuse": "retail"}, "matchScore": 0.9, "name": "Retail Area"},
     "landuse/vineyard": {"fields": ["name", "operator", "grape_variety"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "vineyard"}, "addTags": {"landuse": "vineyard", "crop": "grape"}, "removeTags": {"landuse": "vineyard", "crop": "grape", "grape_variety": "*"}, "terms": ["grape", "wine"], "name": "Vineyard"},
diff --git a/data/presets/presets/landuse/residential.json b/data/presets/presets/landuse/residential.json
index 5b2686df9..99e68d292 100644
--- a/data/presets/presets/landuse/residential.json
+++ b/data/presets/presets/landuse/residential.json
@@ -1,5 +1,9 @@
 {
     "icon": "maki-building",
+    "fields": [
+        "name",
+        "residential"
+    ],
     "geometry": [
         "area"
     ],
diff --git a/data/taginfo.json b/data/taginfo.json
index cf97bbe10..d59e0932b 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1641,6 +1641,7 @@
     {"key": "reservation", "value": "no", "description": "🄵 Reservations"},
     {"key": "reservation", "value": "required", "description": "🄵 Reservations"},
     {"key": "reservation", "value": "recommended", "description": "🄵 Reservations"},
+    {"key": "residential", "description": "🄵 Type"},
     {"key": "resort", "description": "🄵 Type"},
     {"key": "resource", "description": "🄵 Resources"},
     {"key": "restriction", "description": "🄵 Type"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index ac23fbca3..5bcfa09fe 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -4174,6 +4174,10 @@
                         "recommended": "Recommended"
                     }
                 },
+                "residential": {
+                    "label": "Type",
+                    "terms": ""
+                },
                 "resort": {
                     "label": "Type",
                     "terms": ""