Merge branch 'master' into validation

data/presets.yaml

@@ -187,6 +187,9 @@ en:
       animal_shelter:
         # animal_shelter=*
         label: For Animals
+      architect:
+        # architect=*
+        label: Architect
       area/highway:
         # 'area:highway=*'
         label: Type
@@ -1479,6 +1482,9 @@ en:
         label: Type
       restrictions:
         label: Turn Restrictions
+      roof/colour:
+        # 'roof:colour=*'
+        label: Roof Color
       rooms:
         # rooms=*
         label: Rooms

data/presets/fields.json

@@ -18,6 +18,7 @@
     "animal_boarding": {"key": "animal_boarding", "type": "semiCombo", "label": "For Animals"},
     "animal_breeding": {"key": "animal_breeding", "type": "semiCombo", "label": "For Animals"},
     "animal_shelter": {"key": "animal_shelter", "type": "semiCombo", "label": "For Animals"},
+    "architect": {"key": "architect", "type": "text", "label": "Architect"},
     "area/highway": {"key": "area:highway", "type": "typeCombo", "label": "Type"},
     "artist": {"key": "artist_name", "type": "text", "label": "Artist"},
     "artwork_type": {"key": "artwork_type", "type": "combo", "label": "Type"},
@@ -262,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"},

data/presets/fields/architect.json

@@ -0,0 +1,5 @@
+{
+    "key": "architect",
+    "type": "text",
+    "label": "Architect"
+}

data/presets/fields/roof/colour.json

@@ -0,0 +1,5 @@
+{
+    "key": "roof:colour",
+    "type": "combo",
+    "label": "Roof Color"
+}

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": ["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},

data/presets/presets/building.json

@@ -8,7 +8,9 @@
         "address"
     ],
     "moreFields": [
+        "architect",
         "building/material",
+        "roof/colour",
         "smoking",
         "wheelchair"
     ],

data/taginfo.json

@@ -1093,6 +1093,7 @@
     {"key": "animal_boarding", "description": "🄵 For Animals"},
     {"key": "animal_breeding", "description": "🄵 For Animals"},
     {"key": "animal_shelter", "description": "🄵 For Animals"},
+    {"key": "architect", "description": "🄵 Architect"},
     {"key": "artist_name", "description": "🄵 Artist"},
     {"key": "artwork_type", "description": "🄵 Type"},
     {"key": "atm", "description": "🄵 ATM"},
@@ -1415,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"},

dist/locales/en.json

@@ -2081,6 +2081,9 @@
                 "animal_shelter": {
                     "label": "For Animals"
                 },
+                "architect": {
+                    "label": "Architect"
+                },
                 "area/highway": {
                     "label": "Type"
                 },
@@ -3176,6 +3179,9 @@
                 "restrictions": {
                     "label": "Turn Restrictions"
                 },
+                "roof/colour": {
+                    "label": "Roof Color"
+                },
                 "rooms": {
                     "label": "Rooms"
                 },