Merge pull request #5970 from alphagamer7/master

Added bar=yes field for issue #5947

data/presets.yaml

@@ -210,6 +210,9 @@ en:
       backrest:
         # backrest=*
         label: Backrest
+      bar:
+        # bar=*
+        label: Bar
       barrier:
         # barrier=*
         label: Type

data/presets/fields.json

@@ -25,6 +25,7 @@
     "atm": {"key": "atm", "type": "check", "label": "ATM"},
     "attraction": {"key": "attraction", "type": "typeCombo", "label": "Type"},
     "backrest": {"key": "backrest", "type": "check", "label": "Backrest"},
+    "bar": {"key": "bar", "type": "check", "label": "Bar"},
     "barrier": {"key": "barrier", "type": "typeCombo", "label": "Type"},
     "basin": {"key": "basin", "type": "combo", "label": "Type"},
     "bath/open_air": {"key": "bath:open_air", "label": "Open Air", "type": "check"},

data/presets/fields/bar.json

@@ -0,0 +1,5 @@
+{
+    "key": "bar",
+    "type": "check",
+    "label": "Bar"
+}

data/presets/presets.json

@@ -65,7 +65,7 @@
     "amenity/biergarten": {"icon": "maki-beer", "fields": ["name", "address", "building", "outdoor_seating", "brewery"], "moreFields": ["{amenity/bar}"], "geometry": ["point", "area"], "tags": {"amenity": "biergarten"}, "terms": ["beer", "bier", "booze"], "name": "Biergarten"},
     "amenity/boat_rental": {"icon": "temaki-boating", "fields": ["name", "operator", "fee", "payment_multi"], "moreFields": ["address", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "boat_rental"}, "name": "Boat Rental"},
     "amenity/bureau_de_change": {"icon": "maki-bank", "fields": ["name", "operator", "payment_multi", "currency_multi", "address", "building_area"], "moreFields": ["opening_hours", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["bureau de change", "money changer"], "tags": {"amenity": "bureau_de_change"}, "name": "Currency Exchange"},
-    "amenity/cafe": {"icon": "maki-cafe", "fields": ["name", "cuisine", "address", "building_area", "outdoor_seating"], "moreFields": ["diet_multi", "takeaway", "delivery", "capacity", "opening_hours", "smoking", "payment_multi", "internet_access", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["bistro", "coffee", "tea"], "tags": {"amenity": "cafe"}, "name": "Cafe"},
+    "amenity/cafe": {"icon": "maki-cafe", "fields": ["name", "cuisine", "address", "building_area", "outdoor_seating"], "moreFields": ["diet_multi", "takeaway", "delivery", "capacity", "opening_hours", "smoking", "payment_multi", "internet_access", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair", "bar"], "geometry": ["point", "area"], "terms": ["bistro", "coffee", "tea"], "tags": {"amenity": "cafe"}, "name": "Cafe"},
     "amenity/car_pooling": {"icon": "maki-car", "fields": ["name", "operator", "capacity", "address", "opening_hours", "lit"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "car_pooling"}, "name": "Car Pooling"},
     "amenity/car_rental": {"icon": "maki-car-rental", "fields": ["name", "operator", "address", "opening_hours", "payment_multi"], "moreFields": ["brand", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "car_rental"}, "name": "Car Rental"},
     "amenity/car_sharing": {"icon": "maki-car", "fields": ["name", "operator", "capacity", "address", "payment_multi", "supervised"], "moreFields": ["lit", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "car_sharing"}, "name": "Car Sharing"},
@@ -147,7 +147,7 @@
     "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"], "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": ["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/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"},
@@ -992,7 +992,7 @@
     "tourism/gallery": {"icon": "maki-art-gallery", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["art*", "exhibit*", "paint*", "photo*", "sculpt*"], "tags": {"tourism": "gallery"}, "name": "Art Gallery"},
     "tourism/guest_house": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "rooms", "internet_access"], "moreFields": ["smoking", "payment_multi", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"tourism": "guest_house"}, "terms": ["B&B", "Bed and Breakfast"], "name": "Guest House"},
     "tourism/hostel": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "rooms", "internet_access"], "moreFields": ["smoking", "payment_multi", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"tourism": "hostel"}, "name": "Hostel"},
-    "tourism/hotel": {"icon": "maki-lodging", "fields": ["name", "brand", "address", "building_area", "rooms", "internet_access"], "moreFields": ["operator", "smoking", "payment_multi", "internet_access/fee", "internet_access/ssid", "stars", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"tourism": "hotel"}, "name": "Hotel"},
+    "tourism/hotel": {"icon": "maki-lodging", "fields": ["name", "brand", "address", "building_area", "rooms", "internet_access"], "moreFields": ["operator", "smoking", "payment_multi", "internet_access/fee", "internet_access/ssid", "stars", "website", "phone", "email", "fax", "wheelchair", "bar"], "geometry": ["point", "area"], "tags": {"tourism": "hotel"}, "name": "Hotel"},
     "tourism/information": {"icon": "maki-information", "fields": ["information", "operator", "address", "building_area"], "geometry": ["point", "vertex", "area"], "tags": {"tourism": "information"}, "name": "Information"},
     "tourism/information/board": {"icon": "maki-information", "fields": ["name", "operator", "board_type", "direction"], "geometry": ["point", "vertex"], "tags": {"tourism": "information", "information": "board"}, "reference": {"key": "information", "value": "board"}, "name": "Information Board"},
     "tourism/information/guidepost": {"icon": "maki-information", "fields": ["name", "elevation", "operator", "ref"], "moreFields": ["material"], "geometry": ["point", "vertex"], "terms": ["signpost"], "tags": {"tourism": "information", "information": "guidepost"}, "reference": {"key": "information", "value": "guidepost"}, "name": "Guidepost"},

data/presets/presets/amenity/cafe.json

@@ -22,7 +22,8 @@
         "phone",
         "email",
         "fax",
-        "wheelchair"
+        "wheelchair",
+        "bar"
     ],
     "geometry": [
         "point",
@@ -37,4 +38,4 @@
         "amenity": "cafe"
     },
     "name": "Cafe"
-}
+}

data/presets/presets/amenity/restaurant.json

@@ -21,7 +21,8 @@
         "phone",
         "email",
         "fax",
-        "wheelchair"
+        "wheelchair",
+        "bar"
     ],
     "geometry": [
         "point",
@@ -47,4 +48,4 @@
         "amenity": "restaurant"
     },
     "name": "Restaurant"
-}
+}

data/presets/presets/tourism/hotel.json

@@ -19,7 +19,8 @@
         "phone",
         "email",
         "fax",
-        "wheelchair"
+        "wheelchair",
+        "bar"
     ],
     "geometry": [
         "point",
@@ -29,4 +30,4 @@
         "tourism": "hotel"
     },
     "name": "Hotel"
-}
+}

data/taginfo.json

@@ -1104,6 +1104,7 @@
     {"key": "artwork_type", "description": "🄵 Type"},
     {"key": "atm", "description": "🄵 ATM"},
     {"key": "backrest", "description": "🄵 Backrest"},
+    {"key": "bar", "description": "🄵 Bar"},
     {"key": "basin", "description": "🄵 Type"},
     {"key": "bath:open_air", "description": "🄵 Open Air"},
     {"key": "bath:sand_bath", "description": "🄵 Sand Bath"},

dist/locales/en.json

@@ -2223,6 +2223,9 @@
                 "backrest": {
                     "label": "Backrest"
                 },
+                "bar": {
+                    "label": "Bar"
+                },
                 "barrier": {
                     "label": "Type"
                 },