From 3ea11f21d5fca48550cc4645fe51fcd7729173eb Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Wed, 13 Mar 2019 12:35:31 -0400 Subject: [PATCH] Add microbrewery field to pub and restaurant presets Add Brewpub preset --- data/presets.yaml | 8 ++++++ data/presets/fields.json | 1 + data/presets/fields/microbrewery.json | 5 ++++ data/presets/presets.json | 5 ++-- data/presets/presets/amenity/pub.json | 11 ++++---- .../presets/amenity/pub/microbrewery.json | 26 +++++++++++++++++++ data/presets/presets/amenity/restaurant.json | 20 +++++++------- data/taginfo.json | 2 ++ dist/locales/en.json | 7 +++++ 9 files changed, 69 insertions(+), 16 deletions(-) create mode 100644 data/presets/fields/microbrewery.json create mode 100644 data/presets/presets/amenity/pub/microbrewery.json diff --git a/data/presets.yaml b/data/presets.yaml index efd9516da..66e77dae2 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -1037,6 +1037,9 @@ en: memorial: # memorial=* label: Type + microbrewery: + # microbrewery=* + label: Microbrewery minspeed: # minspeed=* label: Minimum Speed Limit @@ -2745,6 +2748,11 @@ en: name: LGBTQ+ Pub # 'terms: gay pub,lesbian pub,lgbtq pub,lgbt pub,lgb pub' terms: '' + amenity/pub/microbrewery: + # 'amenity=pub, microbrewery=yes' + name: Brewpub + # 'terms: alcohol,drink,dive,beer,bier,booze,craft brewery,microbrewery,small batch brewery' + terms: '' amenity/public_bath: # amenity=public_bath name: Public Bath diff --git a/data/presets/fields.json b/data/presets/fields.json index 6dc212485..d99f88e66 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -199,6 +199,7 @@ "maxstay": {"key": "maxstay", "type": "combo", "label": "Max Stay", "options": ["15 min", "30 min", "45 min", "1 hr", "1.5 hr", "2 hr", "2.5 hr", "3 hr", "4 hr", "1 day", "2 day"], "snake_case": false}, "maxweight": {"key": "maxweight", "type": "combo", "label": "Max Weight", "snake_case": false}, "memorial": {"key": "memorial", "type": "typeCombo", "label": "Type"}, + "microbrewery": {"key": "microbrewery", "type": "check", "label": "Microbrewery"}, "minspeed": {"key": "minspeed", "type": "maxspeed", "label": "Minimum Speed Limit", "placeholder": "20, 30, 40..."}, "monitoring_multi": {"key": "monitoring:", "type": "multiCombo", "label": "Monitoring"}, "mtb/scale": {"key": "mtb:scale", "type": "combo", "label": "Mountain Biking Difficulty", "placeholder": "0, 1, 2, 3...", "strings": {"options": {"0": "0: Solid gravel/packed earth, no obstacles, wide curves", "1": "1: Some loose surface, small obstacles, wide curves", "2": "2: Much loose surface, large obstacles, easy hairpins", "3": "3: Slippery surface, large obstacles, tight hairpins", "4": "4: Loose surface or boulders, dangerous hairpins", "5": "5: Maximum difficulty, boulder fields, landslides", "6": "6: Not rideable except by the very best mountain bikers"}}}, diff --git a/data/presets/fields/microbrewery.json b/data/presets/fields/microbrewery.json new file mode 100644 index 000000000..3c04e0769 --- /dev/null +++ b/data/presets/fields/microbrewery.json @@ -0,0 +1,5 @@ +{ + "key": "microbrewery", + "type": "check", + "label": "Microbrewery" +} diff --git a/data/presets/presets.json b/data/presets/presets.json index a49444362..23aeabd73 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -144,14 +144,15 @@ "amenity/post_box": {"icon": "temaki-post_box", "fields": ["operator", "collection_times", "drive_through", "ref"], "moreFields": ["wheelchair"], "geometry": ["point", "vertex"], "tags": {"amenity": "post_box"}, "terms": ["letter", "post"], "name": "Mailbox"}, "amenity/post_office": {"icon": "maki-post", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["letter", "mail"], "tags": {"amenity": "post_office"}, "name": "Post Office"}, "amenity/prison": {"icon": "maki-prison", "fields": ["name", "operator", "address"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["cell", "jail"], "tags": {"amenity": "prison"}, "name": "Prison Grounds"}, - "amenity/pub": {"icon": "maki-beer", "fields": ["name", "address", "building_area", "opening_hours", "smoking", "brewery"], "moreFields": ["outdoor_seating", "diet_multi", "payment_multi", "internet_access", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "pub"}, "terms": ["alcohol", "drink", "dive", "beer", "bier", "booze"], "name": "Pub"}, + "amenity/pub": {"icon": "maki-beer", "fields": ["name", "address", "building_area", "opening_hours", "smoking", "brewery"], "moreFields": ["diet_multi", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "microbrewery", "outdoor_seating", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "pub"}, "terms": ["alcohol", "drink", "dive", "beer", "bier", "booze"], "name": "Pub"}, "amenity/pub/lgbtq": {"icon": "maki-beer", "geometry": ["point", "area"], "tags": {"amenity": "pub", "lgbtq": "primary"}, "terms": ["gay pub", "lesbian pub", "lgbtq pub", "lgbt pub", "lgb pub"], "name": "LGBTQ+ Pub"}, + "amenity/pub/microbrewery": {"icon": "maki-beer", "geometry": ["point", "area"], "tags": {"amenity": "pub", "microbrewery": "yes"}, "reference": {"key": "microbrewery"}, "terms": ["alcohol", "drink", "dive", "beer", "bier", "booze", "craft brewery", "microbrewery", "small batch brewery"], "name": "Brewpub"}, "amenity/public_bath": {"icon": "maki-water", "fields": ["name", "bath/type", "bath/open_air", "bath/sand_bath", "address", "building_area", "fee"], "moreFields": ["opening_hours", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "public_bath"}, "terms": ["onsen", "foot bath", "hot springs"], "name": "Public Bath"}, "amenity/public_bookcase": {"icon": "maki-library", "fields": ["name", "operator", "capacity", "website", "lit"], "moreFields": ["wheelchair"], "geometry": ["point", "area"], "terms": ["library", "bookcrossing"], "tags": {"amenity": "public_bookcase"}, "name": "Public Bookcase"}, "amenity/ranger_station": {"icon": "maki-ranger-station", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["visitor center", "visitor centre", "permit center", "permit centre", "backcountry office", "warden office", "warden center"], "tags": {"amenity": "ranger_station"}, "name": "Ranger Station"}, "amenity/recycling_centre": {"icon": "maki-recycling", "fields": ["name", "operator", "address", "building", "opening_hours", "recycling_accepts"], "moreFields": ["fee", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["bottle", "can", "dump", "glass", "garbage", "rubbish", "scrap", "trash"], "tags": {"amenity": "recycling", "recycling_type": "centre"}, "reference": {"key": "recycling_type", "value": "*"}, "name": "Recycling Center"}, "amenity/recycling_container": {"icon": "maki-recycling", "fields": ["recycling_accepts", "collection_times"], "geometry": ["point", "area"], "terms": ["bin", "can", "bottle", "glass", "garbage", "rubbish", "scrap", "trash"], "tags": {"amenity": "recycling", "recycling_type": "container"}, "reference": {"key": "amenity", "value": "recycling"}, "name": "Recycling Container"}, - "amenity/restaurant": {"icon": "maki-restaurant", "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "outdoor_seating"], "moreFields": ["takeaway", "delivery", "capacity", "diet_multi", "smoking", "internet_access", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair", "bar"], "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "coffee", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant"}, "name": "Restaurant"}, + "amenity/restaurant": {"icon": "maki-restaurant", "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "outdoor_seating"], "moreFields": ["bar", "brewery", "capacity", "delivery", "diet_multi", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "microbrewery", "phone", "smoking", "takeaway", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "coffee", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant"}, "name": "Restaurant"}, "amenity/restaurant/american": {"icon": "maki-restaurant", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "coffee", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant", "cuisine": "american"}, "reference": {"key": "cuisine", "value": "american"}, "name": "American Restaurant"}, "amenity/restaurant/asian": {"icon": "maki-restaurant-noodle", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant", "cuisine": "asian"}, "reference": {"key": "cuisine", "value": "asian"}, "name": "Asian Restaurant"}, "amenity/restaurant/chinese": {"icon": "maki-restaurant-noodle", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant", "cuisine": "chinese"}, "reference": {"key": "cuisine", "value": "chinese"}, "name": "Chinese Restaurant"}, diff --git a/data/presets/presets/amenity/pub.json b/data/presets/presets/amenity/pub.json index 795558665..f98fed737 100644 --- a/data/presets/presets/amenity/pub.json +++ b/data/presets/presets/amenity/pub.json @@ -9,16 +9,17 @@ "brewery" ], "moreFields": [ - "outdoor_seating", "diet_multi", - "payment_multi", + "email", + "fax", "internet_access", "internet_access/fee", "internet_access/ssid", - "website", + "microbrewery", + "outdoor_seating", + "payment_multi", "phone", - "email", - "fax", + "website", "wheelchair" ], "geometry": [ diff --git a/data/presets/presets/amenity/pub/microbrewery.json b/data/presets/presets/amenity/pub/microbrewery.json new file mode 100644 index 000000000..d02868d3d --- /dev/null +++ b/data/presets/presets/amenity/pub/microbrewery.json @@ -0,0 +1,26 @@ +{ + "icon": "maki-beer", + "geometry": [ + "point", + "area" + ], + "tags": { + "amenity": "pub", + "microbrewery": "yes" + }, + "reference": { + "key": "microbrewery" + }, + "terms": [ + "alcohol", + "drink", + "dive", + "beer", + "bier", + "booze", + "craft brewery", + "microbrewery", + "small batch brewery" + ], + "name": "Brewpub" +} diff --git a/data/presets/presets/amenity/restaurant.json b/data/presets/presets/amenity/restaurant.json index 5f61f7d96..8e6aa9e81 100644 --- a/data/presets/presets/amenity/restaurant.json +++ b/data/presets/presets/amenity/restaurant.json @@ -9,20 +9,22 @@ "outdoor_seating" ], "moreFields": [ - "takeaway", - "delivery", + "bar", + "brewery", "capacity", + "delivery", "diet_multi", - "smoking", + "email", + "fax", "internet_access", "internet_access/fee", "internet_access/ssid", - "website", + "microbrewery", "phone", - "email", - "fax", - "wheelchair", - "bar" + "smoking", + "takeaway", + "website", + "wheelchair" ], "geometry": [ "point", @@ -48,4 +50,4 @@ "amenity": "restaurant" }, "name": "Restaurant" -} \ No newline at end of file +} diff --git a/data/taginfo.json b/data/taginfo.json index 233c77c5f..bdb24eaa9 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -146,6 +146,7 @@ {"key": "amenity", "value": "post_office", "description": "🄿 Post Office", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/post-15.svg?sanitize=true"}, {"key": "amenity", "value": "prison", "description": "🄿 Prison Grounds", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/prison-15.svg?sanitize=true"}, {"key": "amenity", "value": "pub", "description": "🄿 Pub", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/beer-15.svg?sanitize=true"}, + {"key": "microbrewery", "value": "yes", "description": "🄿 Brewpub", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/beer-15.svg?sanitize=true"}, {"key": "amenity", "value": "public_bath", "description": "🄿 Public Bath", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/water-15.svg?sanitize=true"}, {"key": "amenity", "value": "public_bookcase", "description": "🄿 Public Bookcase", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/library-15.svg?sanitize=true"}, {"key": "amenity", "value": "ranger_station", "description": "🄿 Ranger Station", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/ranger-station-15.svg?sanitize=true"}, @@ -1341,6 +1342,7 @@ {"key": "maxstay", "description": "🄵 Max Stay"}, {"key": "maxweight", "description": "🄵 Max Weight"}, {"key": "memorial", "description": "🄵 Type"}, + {"key": "microbrewery", "description": "🄵 Microbrewery"}, {"key": "minspeed", "description": "🄵 Minimum Speed Limit"}, {"key": "monitoring:", "description": "🄵 Monitoring"}, {"key": "mtb:scale", "value": "0", "description": "🄵 Mountain Biking Difficulty"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 0d912c50a..b8a6c1829 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -3000,6 +3000,9 @@ "memorial": { "label": "Type" }, + "microbrewery": { + "label": "Microbrewery" + }, "minspeed": { "label": "Minimum Speed Limit", "placeholder": "20, 30, 40..." @@ -4485,6 +4488,10 @@ "name": "LGBTQ+ Pub", "terms": "gay pub,lesbian pub,lgbtq pub,lgbt pub,lgb pub" }, + "amenity/pub/microbrewery": { + "name": "Brewpub", + "terms": "alcohol,drink,dive,beer,bier,booze,craft brewery,microbrewery,small batch brewery" + }, "amenity/public_bath": { "name": "Public Bath", "terms": "onsen,foot bath,hot springs"