From 8f5ab67a9cd4b908e5d827b791685f86ba4517ca Mon Sep 17 00:00:00 2001
From: Quincy Morgan <quincy.morgan@icloud.com>
Date: Fri, 25 Jan 2019 14:02:57 -0500
Subject: [PATCH] Add roof:colour field to moreFields of building presets

---
 data/presets.yaml                    | 3 +++
 data/presets/fields.json             | 1 +
 data/presets/fields/roof/colour.json | 5 +++++
 data/presets/presets.json            | 2 +-
 data/presets/presets/building.json   | 1 +
 data/taginfo.json                    | 1 +
 dist/locales/en.json                 | 3 +++
 7 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 data/presets/fields/roof/colour.json

diff --git a/data/presets.yaml b/data/presets.yaml
index ff3061aa9..75e7c401c 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -1482,6 +1482,9 @@ en:
         label: Type
       restrictions:
         label: Turn Restrictions
+      roof/colour:
+        # 'roof:colour=*'
+        label: Roof Color
       rooms:
         # rooms=*
         label: Rooms
diff --git a/data/presets/fields.json b/data/presets/fields.json
index dd48f220e..169daf0a3 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -263,6 +263,7 @@
     "religion": {"key": "religion", "type": "combo", "label": "Religion"},
     "restriction": {"key": "restriction", "type": "combo", "label": "Type"},
     "restrictions": {"type": "restrictions", "geometry": "vertex", "icon": "iD-restrictions", "reference": {"rtype": "restriction"}, "label": "Turn Restrictions"},
+    "roof/colour": {"key": "roof:colour", "type": "combo", "label": "Roof Color"},
     "rooms": {"key": "rooms", "type": "number", "minValue": 0, "label": "Rooms"},
     "route_master": {"key": "route_master", "type": "combo", "label": "Type"},
     "route": {"key": "route", "type": "combo", "label": "Type"},
diff --git a/data/presets/fields/roof/colour.json b/data/presets/fields/roof/colour.json
new file mode 100644
index 000000000..7f5758892
--- /dev/null
+++ b/data/presets/fields/roof/colour.json
@@ -0,0 +1,5 @@
+{
+    "key": "roof:colour",
+    "type": "combo",
+    "label": "Roof Color"
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index c9a55a308..88540d925 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -251,7 +251,7 @@
     "boundary/administrative": {"name": "Administrative Boundary", "geometry": ["line"], "tags": {"boundary": "administrative"}, "fields": ["name", "admin_level"]},
     "bridge/support": {"icon": "fas-archway", "fields": ["bridge/support"], "moreFields": ["material", "seamark/type"], "geometry": ["point", "vertex", "area"], "tags": {"bridge:support": "*"}, "name": "Bridge Support"},
     "bridge/support/pier": {"icon": "fas-archway", "fields": ["bridge/support"], "moreFields": ["material", "seamark/type"], "geometry": ["point", "vertex", "area"], "tags": {"bridge:support": "pier"}, "name": "Bridge Pier"},
-    "building": {"icon": "maki-home", "fields": ["name", "building", "levels", "height", "address"], "moreFields": ["architect", "building/material", "smoking", "wheelchair"], "geometry": ["point", "area"], "tags": {"building": "*"}, "matchScore": 0.6, "terms": [], "name": "Building"},
+    "building": {"icon": "maki-home", "fields": ["name", "building", "levels", "height", "address"], "moreFields": ["architect", "building/material", "roof/colour", "smoking", "wheelchair"], "geometry": ["point", "area"], "tags": {"building": "*"}, "matchScore": 0.6, "terms": [], "name": "Building"},
     "building/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", "searchable": false},
diff --git a/data/presets/presets/building.json b/data/presets/presets/building.json
index a745db22a..dc6464d10 100644
--- a/data/presets/presets/building.json
+++ b/data/presets/presets/building.json
@@ -10,6 +10,7 @@
     "moreFields": [
         "architect",
         "building/material",
+        "roof/colour",
         "smoking",
         "wheelchair"
     ],
diff --git a/data/taginfo.json b/data/taginfo.json
index 0d4ffa032..4942d5b54 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1416,6 +1416,7 @@
     {"key": "type", "description": "🄵 Type"},
     {"key": "religion", "description": "🄵 Religion"},
     {"key": "restriction", "description": "🄵 Type"},
+    {"key": "roof:colour", "description": "🄵 Roof Color"},
     {"key": "rooms", "description": "🄵 Rooms"},
     {"key": "route_master", "description": "🄵 Type"},
     {"key": "route", "description": "🄵 Type"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 8239201f1..666844530 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -3078,6 +3078,9 @@
                 "restrictions": {
                     "label": "Turn Restrictions"
                 },
+                "roof/colour": {
+                    "label": "Roof Color"
+                },
                 "rooms": {
                     "label": "Rooms"
                 },