From 291f5887e9c43b162bc17c32ed9c6f3f616befde Mon Sep 17 00:00:00 2001 From: Quincy Morgan <2046746+quincylvania@users.noreply.github.com> Date: Tue, 6 Oct 2020 09:34:45 -0400 Subject: [PATCH] Followup to #8013 --- data/presets.yaml | 7 ++++++- data/presets/presets.json | 3 ++- data/presets/presets/golf/clubhouse.json | 22 +++++++++++++--------- data/taginfo.json | 1 + dist/locales/en.json | 6 +++++- 5 files changed, 27 insertions(+), 12 deletions(-) diff --git a/data/presets.yaml b/data/presets.yaml index 87bb76eda..9d6f6883a 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -5124,6 +5124,11 @@ en: # golf=cartpath name: Golf Cartpath terms: '' + golf/clubhouse: + # golf=clubhouse + name: Golf Clubhouse + # 'terms: club house,golf clubhouse,golf house,pro shop' + terms: '' golf/driving_range: # golf=driving_range name: Driving Range @@ -8666,7 +8671,7 @@ en: shop/wigs: # shop=wigs name: Wig Shop - # 'terms: hair extentions' + # 'terms: hair extensions,hair extentions' terms: '' shop/window_blind: # shop=window_blind diff --git a/data/presets/presets.json b/data/presets/presets.json index 2be29280d..4e33c4cb3 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -484,6 +484,7 @@ "ford": {"icon": "temaki-pedestrian", "fields": ["name", "depth", "access", "seasonal"], "moreFields": ["gnis/feature_id"], "geometry": ["vertex"], "tags": {"ford": "yes"}, "name": "Ford"}, "golf/bunker": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "bunker"}, "addTags": {"golf": "bunker", "natural": "sand"}, "terms": ["hazard", "bunker"], "name": "Sand Trap"}, "golf/cartpath": {"icon": "temaki-golf_cart", "fields": ["{golf/path}", "maxspeed"], "geometry": ["line"], "tags": {"golf": "cartpath"}, "addTags": {"golf": "cartpath", "golf_cart": "designated", "highway": "service"}, "name": "Golf Cartpath"}, + "golf/clubhouse": {"icon": "maki-golf", "fields": ["name", "operator", "address", "building_area", "access_simple"], "moreFields": ["air_conditioning", "fee", "payment_multi_fee", "charge_fee", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "opening_hours", "opening_hours/covid19", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["club house", "golf clubhouse", "golf house", "pro shop"], "tags": {"golf": "clubhouse"}, "name": "Golf Clubhouse"}, "golf/driving_range": {"icon": "maki-golf", "fields": ["name", "capacity"], "geometry": ["area"], "tags": {"golf": "driving_range"}, "addTags": {"golf": "driving_range", "landuse": "grass"}, "name": "Driving Range"}, "golf/fairway": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "fairway"}, "addTags": {"golf": "fairway", "landuse": "grass"}, "name": "Fairway"}, "golf/green": {"icon": "temaki-golf_green", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "green"}, "addTags": {"golf": "green", "landuse": "grass"}, "name": "Putting Green"}, @@ -1233,7 +1234,7 @@ "shop/water": {"icon": "temaki-water_bottle", "geometry": ["point", "area"], "tags": {"shop": "water"}, "name": "Drinking Water Shop"}, "shop/weapons": {"icon": "temaki-dagger", "geometry": ["point", "area"], "terms": ["ammo", "gun", "knife", "knives"], "tags": {"shop": "weapons"}, "name": "Weapon Shop"}, "shop/wholesale": {"icon": "maki-warehouse", "fields": ["{shop}", "wholesale"], "geometry": ["point", "area"], "terms": ["warehouse club", "cash and carry"], "tags": {"shop": "wholesale"}, "name": "Wholesale Store"}, - "shop/wigs": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["hair extentions"], "tags": {"shop": "wigs"}, "name": "Wig Shop"}, + "shop/wigs": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["hair extensions", "hair extentions"], "tags": {"shop": "wigs"}, "name": "Wig Shop"}, "shop/window_blind": {"icon": "temaki-window", "geometry": ["point", "area"], "tags": {"shop": "window_blind"}, "name": "Window Blind Store"}, "shop/wine": {"icon": "maki-alcohol-shop", "moreFields": ["{shop}", "min_age"], "geometry": ["point", "area"], "tags": {"shop": "wine"}, "name": "Wine Shop"}, "telecom/data_center": {"icon": "fas-server", "fields": ["name", "ref", "operator", "building_area"], "moreFields": ["address", "gnis/feature_id", "phone", "website"], "geometry": ["point", "area"], "tags": {"telecom": "data_center"}, "terms": ["computer systems storage", "information technology", "server farm", "the cloud", "telecommunications"], "name": "Data Center"}, diff --git a/data/presets/presets/golf/clubhouse.json b/data/presets/presets/golf/clubhouse.json index 4f378f7bc..4296ddf83 100644 --- a/data/presets/presets/golf/clubhouse.json +++ b/data/presets/presets/golf/clubhouse.json @@ -1,4 +1,4 @@ -{ +{ "icon": "maki-golf", "fields": [ "name", @@ -9,12 +9,17 @@ ], "moreFields": [ "air_conditioning", - "level", - "opening_hours", - "opening_hours/covid19", "fee", "payment_multi_fee", "charge_fee", + "internet_access", + "internet_access/fee", + "internet_access/ssid", + "level", + "opening_hours", + "opening_hours/covid19", + "phone", + "website", "wheelchair" ], "geometry": [ @@ -22,14 +27,13 @@ "area" ], "terms": [ - "golf house", - "leisure feature", - "leisure", + "club house", "golf clubhouse", - "club house" + "golf house", + "pro shop" ], "tags": { "golf": "clubhouse" }, - "name": "Clubhouse" + "name": "Golf Clubhouse" } diff --git a/data/taginfo.json b/data/taginfo.json index f0dd1701f..eb5d380b6 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -480,6 +480,7 @@ {"key": "ford", "value": "yes", "description": "🄿 Ford", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/pedestrian.svg"}, {"key": "golf", "value": "bunker", "description": "🄿 Sand Trap", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/golf-15.svg"}, {"key": "golf", "value": "cartpath", "description": "🄿 Golf Cartpath", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/golf_cart.svg"}, + {"key": "golf", "value": "clubhouse", "description": "🄿 Golf Clubhouse", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/golf-15.svg"}, {"key": "golf", "value": "driving_range", "description": "🄿 Driving Range", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/golf-15.svg"}, {"key": "golf", "value": "fairway", "description": "🄿 Fairway", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/golf-15.svg"}, {"key": "golf", "value": "green", "description": "🄿 Putting Green", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/golf_green.svg"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index e07b274e4..94c46d98a 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -7270,6 +7270,10 @@ "name": "Golf Cartpath", "terms": "" }, + "golf/clubhouse": { + "name": "Golf Clubhouse", + "terms": "club house,golf clubhouse,golf house,pro shop" + }, "golf/driving_range": { "name": "Driving Range", "terms": "" @@ -10235,7 +10239,7 @@ }, "shop/wigs": { "name": "Wig Shop", - "terms": "hair extentions" + "terms": "hair extensions,hair extentions" }, "shop/window_blind": { "name": "Window Blind Store",