From 5915270331eaafafcbfd3a49dcdd0452624005da Mon Sep 17 00:00:00 2001
From: ogbeche77 <ogbeche77@yahoo.com>
Date: Wed, 12 Aug 2020 14:13:09 +0200
Subject: [PATCH] Flat field added to apartment building

---
 data/presets.yaml                             | 5 +++++
 data/presets/fields.json                      | 1 +
 data/presets/fields/building.json             | 2 +-
 data/presets/fields/capacity.json             | 2 +-
 data/presets/fields/flats.json                | 7 +++++++
 data/presets/presets.json                     | 2 +-
 data/presets/presets/building/apartments.json | 6 +++++-
 data/taginfo.json                             | 1 +
 dist/locales/en.json                          | 4 ++++
 9 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100644 data/presets/fields/flats.json

diff --git a/data/presets.yaml b/data/presets.yaml
index 91621a107..dcb411575 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -949,6 +949,11 @@ en:
       flag/type:
         # 'flag:type=*'
         label: Flag Type
+      flats:
+        # flats=*
+        label: Flats
+        # flats field placeholder
+        placeholder: '2, 4, 6, 8...'
       floating:
         # floating=*
         label: Floating
diff --git a/data/presets/fields.json b/data/presets/fields.json
index c7fc1411e..32a5ae184 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -171,6 +171,7 @@
   "fitness_station": {"key": "fitness_station", "type": "typeCombo", "label": "Equipment Type"},
   "fixme": {"key": "fixme", "type": "textarea", "label": "Fix Me", "universal": true, "terms": ["help request"]},
   "flag/type": {"key": "flag:type", "type": "combo", "label": "Flag Type"},
+  "flats": {"key": "flats", "type": "number", "minValue": 0, "label": "Flats", "placeholder": "2, 4, 6, 8..."},
   "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"},
diff --git a/data/presets/fields/building.json b/data/presets/fields/building.json
index 5d9e7bc95..d560638e8 100644
--- a/data/presets/fields/building.json
+++ b/data/presets/fields/building.json
@@ -5,4 +5,4 @@
     "terms": [
         "structure"
     ]
-}
+}
\ No newline at end of file
diff --git a/data/presets/fields/capacity.json b/data/presets/fields/capacity.json
index 54d242027..16b2e1f51 100644
--- a/data/presets/fields/capacity.json
+++ b/data/presets/fields/capacity.json
@@ -4,4 +4,4 @@
     "minValue": 0,
     "label": "Capacity",
     "placeholder": "50, 100, 200..."
-}
+}
\ No newline at end of file
diff --git a/data/presets/fields/flats.json b/data/presets/fields/flats.json
new file mode 100644
index 000000000..1e6624581
--- /dev/null
+++ b/data/presets/fields/flats.json
@@ -0,0 +1,7 @@
+{
+    "key": "flats",
+    "type": "number",
+    "minValue": 0,
+    "label": "Flats",
+    "placeholder": "2, 4, 6, 8..."
+}
\ No newline at end of file
diff --git a/data/presets/presets.json b/data/presets/presets.json
index f847b5f1a..d0d0df5c9 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -339,7 +339,7 @@
   "building/bunker": {"icon": "temaki-bunker", "geometry": ["area"], "tags": {"building": "bunker"}, "matchScore": 0.5, "name": "Bunker", "searchable": false},
   "building/entrance": {"icon": "maki-entrance-alt1", "fields": [], "moreFields": [], "geometry": ["vertex"], "tags": {"building": "entrance"}, "name": "Entrance/Exit", "searchable": false},
   "building/train_station": {"icon": "maki-building", "geometry": ["point", "vertex", "area"], "tags": {"building": "train_station"}, "matchScore": 0.5, "name": "Train Station Building", "searchable": false},
-  "building/apartments": {"icon": "maki-building", "geometry": ["area"], "tags": {"building": "apartments"}, "matchScore": 0.5, "name": "Apartment Building"},
+  "building/apartments": {"icon": "maki-building", "fields": ["{building}", "flats"], "geometry": ["area"], "tags": {"building": "apartments"}, "matchScore": 0.5, "name": "Apartment Building"},
   "building/barn": {"icon": "temaki-barn", "geometry": ["area"], "tags": {"building": "barn"}, "matchScore": 0.5, "name": "Barn"},
   "building/boathouse": {"icon": "maki-harbor", "geometry": ["area"], "tags": {"building": "boathouse"}, "matchScore": 0.5, "terms": [], "name": "Boathouse"},
   "building/bungalow": {"icon": "maki-home", "geometry": ["area"], "tags": {"building": "bungalow"}, "terms": ["home", "detached"], "matchScore": 0.5, "name": "Bungalow"},
diff --git a/data/presets/presets/building/apartments.json b/data/presets/presets/building/apartments.json
index 608709d26..cc00f75e1 100644
--- a/data/presets/presets/building/apartments.json
+++ b/data/presets/presets/building/apartments.json
@@ -1,5 +1,9 @@
 {
     "icon": "maki-building",
+    "fields": [
+        "{building}",
+        "flats"
+    ],
     "geometry": [
         "area"
     ],
@@ -8,4 +12,4 @@
     },
     "matchScore": 0.5,
     "name": "Apartment Building"
-}
+}
\ No newline at end of file
diff --git a/data/taginfo.json b/data/taginfo.json
index 7d4b07d2f..5f59f4632 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1537,6 +1537,7 @@
     {"key": "fitness_station", "description": "🄵 Equipment Type"},
     {"key": "fixme", "description": "🄵 Fix Me"},
     {"key": "flag:type", "description": "🄵 Flag Type"},
+    {"key": "flats", "description": "🄵 Flats"},
     {"key": "floating", "description": "🄵 Floating"},
     {"key": "flood_prone", "description": "🄵 Flood Prone"},
     {"key": "fountain", "description": "🄵 Type"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index d9306797e..6549f292f 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -3576,6 +3576,10 @@
                 "flag/type": {
                     "label": "Flag Type"
                 },
+                "flats": {
+                    "label": "Flats",
+                    "placeholder": "2, 4, 6, 8..."
+                },
                 "floating": {
                     "label": "Floating"
                 },