From 94b0376ccf10189d9966a61ba5dcfe46b5724514 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Mon, 29 Apr 2019 10:21:31 -0700 Subject: [PATCH] Add building fields to more building presets (re: #6238) --- data/presets/presets.json | 12 ++++++------ data/presets/presets/building/carport.json | 2 +- data/presets/presets/building/garage.json | 2 +- data/presets/presets/building/garages.json | 2 +- data/presets/presets/building/grandstand.json | 4 ---- data/presets/presets/building/hut.json | 3 --- data/presets/presets/building/roof.json | 3 +-- 7 files changed, 10 insertions(+), 18 deletions(-) diff --git a/data/presets/presets.json b/data/presets/presets.json index d8b278a04..a04b2e0fd 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -291,7 +291,7 @@ "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"}, "building/cabin": {"icon": "maki-home", "geometry": ["area"], "tags": {"building": "cabin"}, "matchScore": 0.5, "name": "Cabin"}, - "building/carport": {"icon": "fas-warehouse", "fields": ["height", "capacity"], "geometry": ["area"], "tags": {"building": "carport"}, "matchScore": 0.5, "terms": ["covered parking space", "garage", "car", "porch"], "name": "Carport"}, + "building/carport": {"icon": "fas-warehouse", "fields": ["{building}", "capacity"], "geometry": ["area"], "tags": {"building": "carport"}, "matchScore": 0.5, "terms": ["covered parking space", "garage", "car", "porch"], "name": "Carport"}, "building/cathedral": {"icon": "maki-place-of-worship", "geometry": ["area"], "tags": {"building": "cathedral"}, "matchScore": 0.5, "name": "Cathedral Building"}, "building/chapel": {"icon": "maki-place-of-worship", "geometry": ["area"], "tags": {"building": "chapel"}, "matchScore": 0.5, "name": "Chapel Building"}, "building/church": {"icon": "maki-place-of-worship", "geometry": ["area"], "tags": {"building": "church"}, "matchScore": 0.5, "name": "Church Building"}, @@ -303,14 +303,14 @@ "building/dormitory": {"icon": "maki-building", "fields": ["{building}", "smoking"], "geometry": ["area"], "tags": {"building": "dormitory"}, "matchScore": 0.5, "name": "Dormitory"}, "building/farm_auxiliary": {"icon": "maki-farm", "geometry": ["area"], "tags": {"building": "farm_auxiliary"}, "matchScore": 0.5, "name": "Farm Building"}, "building/farm": {"icon": "maki-farm", "geometry": ["area"], "tags": {"building": "farm"}, "matchScore": 0.5, "name": "Farm House"}, - "building/garage": {"icon": "fas-warehouse", "fields": ["name", "capacity"], "geometry": ["area"], "tags": {"building": "garage"}, "matchScore": 0.5, "name": "Garage"}, - "building/garages": {"icon": "fas-warehouse", "fields": ["name", "capacity"], "geometry": ["area"], "tags": {"building": "garages"}, "matchScore": 0.5, "name": "Garages"}, - "building/grandstand": {"icon": "maki-building", "fields": ["name", "height"], "geometry": ["area"], "tags": {"building": "grandstand"}, "terms": ["tribune", "stand", "stands", "bleachers"], "matchScore": 0.5, "name": "Grandstand"}, + "building/garage": {"icon": "fas-warehouse", "fields": ["{building}", "capacity"], "geometry": ["area"], "tags": {"building": "garage"}, "matchScore": 0.5, "name": "Garage"}, + "building/garages": {"icon": "fas-warehouse", "fields": ["{building}", "capacity"], "geometry": ["area"], "tags": {"building": "garages"}, "matchScore": 0.5, "name": "Garages"}, + "building/grandstand": {"icon": "maki-building", "geometry": ["area"], "tags": {"building": "grandstand"}, "terms": ["tribune", "stand", "stands", "bleachers"], "matchScore": 0.5, "name": "Grandstand"}, "building/greenhouse": {"icon": "maki-garden-centre", "geometry": ["area"], "tags": {"building": "greenhouse"}, "matchScore": 0.5, "name": "Greenhouse"}, "building/hospital": {"icon": "maki-building", "geometry": ["area"], "tags": {"building": "hospital"}, "matchScore": 0.5, "name": "Hospital Building"}, "building/hotel": {"icon": "maki-building", "fields": ["{building}", "smoking"], "geometry": ["area"], "tags": {"building": "hotel"}, "matchScore": 0.5, "name": "Hotel Building"}, "building/house": {"icon": "maki-home", "geometry": ["area"], "tags": {"building": "house"}, "terms": ["home", "family", "residence", "dwelling"], "matchScore": 0.5, "name": "House"}, - "building/hut": {"icon": "maki-home", "fields": ["name"], "geometry": ["area"], "tags": {"building": "hut"}, "matchScore": 0.5, "name": "Hut"}, + "building/hut": {"icon": "maki-home", "geometry": ["area"], "tags": {"building": "hut"}, "matchScore": 0.5, "name": "Hut"}, "building/industrial": {"icon": "maki-industry", "geometry": ["area"], "tags": {"building": "industrial"}, "matchScore": 0.5, "name": "Industrial Building"}, "building/kindergarten": {"icon": "maki-building", "geometry": ["area"], "terms": ["kindergarden", "pre-school"], "tags": {"building": "kindergarten"}, "matchScore": 0.5, "name": "Preschool/Kindergarten Building"}, "building/mosque": {"icon": "maki-place-of-worship", "geometry": ["area"], "tags": {"building": "mosque"}, "matchScore": 0.5, "name": "Mosque Building"}, @@ -318,7 +318,7 @@ "building/public": {"icon": "maki-building", "fields": ["{building}", "smoking"], "geometry": ["area"], "tags": {"building": "public"}, "matchScore": 0.5, "name": "Public Building"}, "building/residential": {"icon": "maki-residential-community", "geometry": ["area"], "tags": {"building": "residential"}, "matchScore": 0.5, "name": "Residential Building"}, "building/retail": {"icon": "maki-commercial", "fields": ["{building}", "smoking"], "geometry": ["area"], "tags": {"building": "retail"}, "matchScore": 0.5, "name": "Retail Building"}, - "building/roof": {"icon": "maki-shelter", "fields": ["name", "address", "layer"], "geometry": ["area"], "tags": {"building": "roof"}, "matchScore": 0.5, "name": "Roof"}, + "building/roof": {"icon": "maki-shelter", "fields": ["{building}", "layer"], "geometry": ["area"], "tags": {"building": "roof"}, "matchScore": 0.5, "name": "Roof"}, "building/ruins": {"icon": "temaki-ruins", "geometry": ["area"], "tags": {"building": "ruins"}, "matchScore": 0.5, "name": "Building Ruins"}, "building/school": {"icon": "maki-building", "geometry": ["area"], "terms": ["academy", "elementary school", "middle school", "high school"], "tags": {"building": "school"}, "matchScore": 0.5, "name": "School Building"}, "building/semidetached_house": {"icon": "maki-home", "geometry": ["area"], "tags": {"building": "semidetached_house"}, "terms": ["home", "double", "duplex", "twin", "family", "residence", "dwelling"], "matchScore": 0.5, "name": "Semi-Detached House"}, diff --git a/data/presets/presets/building/carport.json b/data/presets/presets/building/carport.json index 06aa5a79c..dac54e2d0 100644 --- a/data/presets/presets/building/carport.json +++ b/data/presets/presets/building/carport.json @@ -1,7 +1,7 @@ { "icon": "fas-warehouse", "fields": [ - "height", + "{building}", "capacity" ], "geometry": [ diff --git a/data/presets/presets/building/garage.json b/data/presets/presets/building/garage.json index 8cc77f8b5..1e20eb4bd 100644 --- a/data/presets/presets/building/garage.json +++ b/data/presets/presets/building/garage.json @@ -1,7 +1,7 @@ { "icon": "fas-warehouse", "fields": [ - "name", + "{building}", "capacity" ], "geometry": [ diff --git a/data/presets/presets/building/garages.json b/data/presets/presets/building/garages.json index 79a6d7933..887a264f2 100644 --- a/data/presets/presets/building/garages.json +++ b/data/presets/presets/building/garages.json @@ -1,7 +1,7 @@ { "icon": "fas-warehouse", "fields": [ - "name", + "{building}", "capacity" ], "geometry": [ diff --git a/data/presets/presets/building/grandstand.json b/data/presets/presets/building/grandstand.json index 46b41c563..e27f052a5 100644 --- a/data/presets/presets/building/grandstand.json +++ b/data/presets/presets/building/grandstand.json @@ -1,9 +1,5 @@ { "icon": "maki-building", - "fields": [ - "name", - "height" - ], "geometry": [ "area" ], diff --git a/data/presets/presets/building/hut.json b/data/presets/presets/building/hut.json index 6e0335f34..5693655d2 100644 --- a/data/presets/presets/building/hut.json +++ b/data/presets/presets/building/hut.json @@ -1,8 +1,5 @@ { "icon": "maki-home", - "fields": [ - "name" - ], "geometry": [ "area" ], diff --git a/data/presets/presets/building/roof.json b/data/presets/presets/building/roof.json index 3df90136c..b419deb93 100644 --- a/data/presets/presets/building/roof.json +++ b/data/presets/presets/building/roof.json @@ -1,8 +1,7 @@ { "icon": "maki-shelter", "fields": [ - "name", - "address", + "{building}", "layer" ], "geometry": [