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 1/4] 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"
                 },

From fd5365cd751616c3ec6feed536fd7e9a240e2b98 Mon Sep 17 00:00:00 2001
From: ogbeche77 <ogbeche77@yahoo.com>
Date: Mon, 17 Aug 2020 19:07:49 +0200
Subject: [PATCH 2/4] Units field to Apartment Building

---
 data/presets.yaml                       | 5 +++++
 data/presets/fields.json                | 1 +
 data/presets/fields/building/flats.json | 7 +++++++
 data/taginfo.json                       | 1 +
 dist/locales/en.json                    | 4 ++++
 5 files changed, 18 insertions(+)
 create mode 100644 data/presets/fields/building/flats.json

diff --git a/data/presets.yaml b/data/presets.yaml
index dcb411575..bc65ba26f 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -367,6 +367,11 @@ en:
         label: Building
         # 'terms: structure'
         terms: '[translate with synonyms or related terms for ''Building'', separated by commas]'
+      building/flats:
+        # 'building:flats=*'
+        label: Units
+        # building/flats field placeholder
+        placeholder: '2, 4, 6, 8...'
       building/levels:
         # 'building:levels=*'
         label: Levels
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 32a5ae184..79e26b86a 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -57,6 +57,7 @@
   "bridge/support": {"key": "bridge:support", "type": "typeCombo", "label": "Type"},
   "building_area": {"key": "building", "type": "combo", "default": "yes", "geometry": ["area"], "label": "Building"},
   "building": {"key": "building", "type": "combo", "label": "Building", "terms": ["structure"]},
+  "building/flats": {"key": "building:flats", "type": "number", "minValue": 0, "label": "Units", "placeholder": "2, 4, 6, 8..."},
   "building/levels_building": {"key": "building:levels", "type": "number", "minValue": 0, "label": "Building Levels", "placeholder": "2, 4, 6...", "prerequisiteTag": {"key": "building", "valueNot": "no"}},
   "building/levels": {"key": "building:levels", "type": "number", "minValue": 0, "label": "Levels", "placeholder": "2, 4, 6..."},
   "building/levels/underground": {"key": "building:levels:underground", "type": "number", "minValue": 0, "label": "Underground Levels", "placeholder": "2, 4, 6...", "terms": ["basement levels"]},
diff --git a/data/presets/fields/building/flats.json b/data/presets/fields/building/flats.json
new file mode 100644
index 000000000..513f2c912
--- /dev/null
+++ b/data/presets/fields/building/flats.json
@@ -0,0 +1,7 @@
+{
+    "key": "building:flats",
+    "type": "number",
+    "minValue": 0,
+    "label": "Units",
+    "placeholder": "2, 4, 6, 8..."
+}
\ No newline at end of file
diff --git a/data/taginfo.json b/data/taginfo.json
index 5f59f4632..02e9d0803 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1387,6 +1387,7 @@
     {"key": "boules", "description": "🄵 Type"},
     {"key": "brand", "description": "🄵 Brand"},
     {"key": "brewery", "description": "🄵 Draft Beers"},
+    {"key": "building:flats", "description": "🄵 Units"},
     {"key": "building:levels", "description": "🄵 Building Levels, 🄵 Levels"},
     {"key": "building:levels:underground", "description": "🄵 Underground Levels"},
     {"key": "building:material", "description": "🄵 Material"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 6549f292f..1c8b3f8b9 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -3070,6 +3070,10 @@
                     "label": "Building",
                     "terms": "structure"
                 },
+                "building/flats": {
+                    "label": "Units",
+                    "placeholder": "2, 4, 6, 8..."
+                },
                 "building/levels_building": {
                     "label": "Building Levels",
                     "terms": "",

From cc992ab304769e3f2817adfec3c14d48c523b808 Mon Sep 17 00:00:00 2001
From: ogbeche77 <ogbeche77@yahoo.com>
Date: Thu, 20 Aug 2020 10:34:05 +0200
Subject: [PATCH 3/4] Units field added to Apartment Building

---
 data/presets.yaml                             | 5 -----
 data/presets/fields.json                      | 1 -
 data/presets/fields/flats.json                | 7 -------
 data/presets/presets.json                     | 2 +-
 data/presets/presets/building/apartments.json | 3 +--
 data/taginfo.json                             | 1 -
 dist/locales/en.json                          | 4 ----
 7 files changed, 2 insertions(+), 21 deletions(-)
 delete mode 100644 data/presets/fields/flats.json

diff --git a/data/presets.yaml b/data/presets.yaml
index bc65ba26f..695ac6e40 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -954,11 +954,6 @@ 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 79e26b86a..2adf66076 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -172,7 +172,6 @@
   "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/flats.json b/data/presets/fields/flats.json
deleted file mode 100644
index 1e6624581..000000000
--- a/data/presets/fields/flats.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "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 d0d0df5c9..8dacfe549 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", "fields": ["{building}", "flats"], "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 cc00f75e1..e526b2d42 100644
--- a/data/presets/presets/building/apartments.json
+++ b/data/presets/presets/building/apartments.json
@@ -1,8 +1,7 @@
 {
     "icon": "maki-building",
     "fields": [
-        "{building}",
-        "flats"
+        "building/flats"
     ],
     "geometry": [
         "area"
diff --git a/data/taginfo.json b/data/taginfo.json
index 02e9d0803..4bd1c4afb 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1538,7 +1538,6 @@
     {"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 1c8b3f8b9..d957e7b57 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -3580,10 +3580,6 @@
                 "flag/type": {
                     "label": "Flag Type"
                 },
-                "flats": {
-                    "label": "Flats",
-                    "placeholder": "2, 4, 6, 8..."
-                },
                 "floating": {
                     "label": "Floating"
                 },

From 289c340c3f414a70f8d22c5eeff0db6c10d132e8 Mon Sep 17 00:00:00 2001
From: ogbeche77 <ogbeche77@yahoo.com>
Date: Thu, 20 Aug 2020 20:04:46 +0200
Subject: [PATCH 4/4] Flat field added to apartment building

---
 data/presets/presets.json                     | 2 +-
 data/presets/presets/building/apartments.json | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/data/presets/presets.json b/data/presets/presets.json
index 8dacfe549..83a270dc5 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", "fields": ["building/flats"], "geometry": ["area"], "tags": {"building": "apartments"}, "matchScore": 0.5, "name": "Apartment Building"},
+  "building/apartments": {"icon": "maki-building", "fields": ["{building}", "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 e526b2d42..7c0da5f77 100644
--- a/data/presets/presets/building/apartments.json
+++ b/data/presets/presets/building/apartments.json
@@ -1,6 +1,7 @@
 {
     "icon": "maki-building",
     "fields": [
+        "{building}",
         "building/flats"
     ],
     "geometry": [