Add Reservations field to relevant tourism and amenity presets

Add Stars field to the Restaurant preset Replace the Outdoor Seating field with the Phone field as a default field for the Restaurant preset, since it is more relevant
2026-04-21 11:16:36 +02:00 · 2019-04-17 15:13:12 -07:00
parent daf3a703aa
commit 0ec4f6fbf8
19 changed files with 105 additions and 51 deletions
@@ -459,6 +459,10 @@
      "old": {"power_rating": "*"},
      "replace": {"generator:output": "$1"}
    },
+    {
+      "old": {"reservations": "*"},
+      "replace": {"reservation": "$1"}
+    },
    {
      "old": {"roof:color": "*"},
      "replace": {"roof:colour": "$1"}
@@ -1562,6 +1562,18 @@ en:
      religion:
        # religion=*
        label: Religion
+      reservation:
+        # reservation=*
+        label: Reservations
+        options:
+          # reservation=no
+          'no': Not Accepted
+          # reservation=recommended
+          recommended: Recommended
+          # reservation=required
+          required: Required
+          # reservation=yes
+          'yes': Accepted
      resource:
        # resource=*
        label: Resources
@@ -284,6 +284,7 @@
    "ref/isil": {"key": "ref:isil", "type": "text", "label": "ISIL Code"},
    "relation": {"key": "type", "type": "combo", "label": "Type"},
    "religion": {"key": "religion", "type": "combo", "label": "Religion"},
+    "reservation": {"key": "reservation", "type": "combo", "label": "Reservations", "strings": {"options": {"yes": "Accepted", "no": "Not Accepted", "required": "Required", "recommended": "Recommended"}}},
    "resource": {"key": "resource", "type": "semiCombo", "label": "Resources"},
    "restriction": {"key": "restriction", "type": "combo", "label": "Type"},
    "restrictions": {"type": "restrictions", "geometry": "vertex", "icon": "iD-restrictions", "reference": {"rtype": "restriction"}, "label": "Turn Restrictions"},
@@ -0,0 +1,13 @@
+{
+    "key": "reservation",
+    "type": "combo",
+    "label": "Reservations",
+    "strings": {
+        "options": {
+            "yes": "Accepted",
+            "no": "Not Accepted",
+            "required": "Required",
+            "recommended": "Recommended"
+        }
+    }
+}
@@ -72,7 +72,7 @@
    "amenity/biergarten": {"icon": "fas-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_fee"], "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": ["air_conditioning", "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/cafe": {"icon": "maki-cafe", "fields": ["name", "cuisine", "address", "building_area", "outdoor_seating"], "moreFields": ["air_conditioning", "bar", "capacity", "delivery", "diet_multi", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "opening_hours", "payment_multi", "phone", "reservation", "smoking", "takeaway", "website", "wheelchair"], "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"},
@@ -159,7 +159,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_fee", "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": ["air_conditioning", "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": {"icon": "maki-restaurant", "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "phone"], "moreFields": ["air_conditioning", "bar", "brewery", "capacity", "delivery", "diet_multi", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "microbrewery", "outdoor_seating", "reservation", "smoking", "stars", "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"},
@@ -206,7 +206,7 @@
    "amenity/university": {"icon": "maki-college", "fields": ["{amenity/college}"], "moreFields": ["{amenity/college}"], "geometry": ["point", "area"], "terms": ["college", "graduate school", "PhD program", "master's degree program"], "tags": {"amenity": "university"}, "name": "University Grounds"},
    "amenity/vehicle_inspection": {"icon": "maki-car", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["car inspection"], "tags": {"amenity": "vehicle_inspection"}, "name": "Vehicle Inspection"},
    "amenity/vending_machine": {"icon": "temaki-vending_machine", "fields": ["vending", "operator", "payment_multi", "currency_multi"], "geometry": ["point"], "terms": [], "tags": {"amenity": "vending_machine"}, "matchScore": 0.9, "name": "Vending Machine"},
-    "amenity/vending_machine/news_papers": {"icon": "temaki-vending_machine", "fields": ["{amenity/vending_machine/newspapers}"], "geometry": ["point"], "terms": ["newspaper"], "tags": {"amenity": "vending_machine", "vending": "news_papers"}, "reference": {"key": "vending", "value": "newspapers"}, "name": "Newspaper Vending Machine", "searchable": false},
+    "amenity/vending_machine/news_papers": {"icon": "temaki-vending_machine", "fields": ["{amenity/vending_machine/newspapers}"], "geometry": ["point"], "tags": {"amenity": "vending_machine", "vending": "news_papers"}, "reference": {"key": "vending", "value": "newspapers"}, "name": "Newspaper Vending Machine", "searchable": false},
    "amenity/vending_machine/cigarettes": {"icon": "temaki-vending_machine", "geometry": ["point"], "terms": ["cigarette"], "tags": {"amenity": "vending_machine", "vending": "cigarettes"}, "reference": {"key": "vending", "value": "cigarettes"}, "name": "Cigarette Vending Machine"},
    "amenity/vending_machine/coffee": {"icon": "temaki-vending_machine", "geometry": ["point"], "terms": ["coffee"], "tags": {"amenity": "vending_machine", "vending": "coffee"}, "reference": {"key": "vending", "value": "coffee"}, "name": "Coffee Vending Machine"},
    "amenity/vending_machine/condoms": {"icon": "temaki-vending_machine", "geometry": ["point"], "terms": ["condom"], "tags": {"amenity": "vending_machine", "vending": "condoms"}, "reference": {"key": "vending", "value": "condoms"}, "name": "Condom Vending Machine"},
@@ -1044,19 +1044,19 @@
    "shop/wine": {"icon": "maki-alcohol-shop", "geometry": ["point", "area"], "tags": {"shop": "wine"}, "name": "Wine Shop"},
    "tactile_paving": {"icon": "temaki-blind", "fields": ["colour", "description"], "geometry": ["vertex", "point", "line", "area"], "tags": {"tactile_paving": "*"}, "matchScore": 0.25, "terms": ["blind path", "detectable warning surfaces", "tactile ground surface indicators", "tactile walking surface indicators", "truncated domes", "visually impaired path"], "name": "Tactile Paving"},
    "telecom/data_center": {"icon": "fas-server", "fields": ["name", "ref", "operator", "building_area"], "moreFields": ["address", "phone", "website"], "geometry": ["point", "area"], "tags": {"telecom": "data_center"}, "terms": ["computer systems storage", "information technology", "server farm", "the cloud", "telecommunications"], "name": "Data Center"},
-    "tourism/alpine_hut": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "internet_access", "fee", "payment_multi_fee"], "moreFields": ["internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["climbing hut"], "tags": {"tourism": "alpine_hut"}, "name": "Alpine Hut"},
-    "tourism/apartment": {"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": "apartment"}, "name": "Guest Apartment / Condo"},
+    "tourism/alpine_hut": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "internet_access", "fee", "payment_multi_fee"], "moreFields": ["internet_access/fee", "internet_access/ssid", "website", "phone", "reservation", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["climbing hut"], "tags": {"tourism": "alpine_hut"}, "name": "Alpine Hut"},
+    "tourism/apartment": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "rooms", "internet_access"], "moreFields": ["email", "fax", "internet_access/fee", "internet_access/ssid", "payment_multi", "phone", "reservation", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"tourism": "apartment"}, "name": "Guest Apartment / Condo"},
    "tourism/aquarium": {"icon": "maki-aquarium", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["fee", "payment_multi_fee", "smoking", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["fish", "sea", "water"], "tags": {"tourism": "aquarium"}, "name": "Aquarium"},
    "tourism/artwork": {"icon": "maki-art-gallery", "fields": ["name", "artwork_type", "artist"], "moreFields": ["material", "website"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "artwork"}, "terms": ["mural", "sculpture", "statue"], "name": "Artwork"},
    "tourism/artwork/mural": {"icon": "maki-art-gallery", "fields": ["name", "artist"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "artwork", "artwork_type": "mural"}, "reference": {"key": "artwork_type", "value": "mural"}, "terms": ["fresco", "wall painting"], "name": "Mural"},
    "tourism/artwork/sculpture": {"icon": "maki-art-gallery", "fields": ["name", "artist", "material"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "artwork", "artwork_type": "sculpture"}, "reference": {"key": "artwork_type", "value": "sculpture"}, "terms": ["statue", "figure", "carving"], "name": "Sculpture"},
    "tourism/artwork/statue": {"icon": "maki-art-gallery", "fields": ["name", "artist", "material"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "artwork", "artwork_type": "statue"}, "reference": {"key": "artwork_type", "value": "statue"}, "terms": ["sculpture", "figure", "carving"], "name": "Statue"},
    "tourism/attraction": {"icon": "maki-star", "fields": ["name", "operator", "address"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "attraction"}, "matchScore": 0.75, "name": "Tourist Attraction"},
-    "tourism/camp_site": {"icon": "maki-campsite", "fields": ["name", "operator", "address", "access_simple", "capacity", "fee", "payment_multi_fee", "internet_access"], "moreFields": ["internet_access/fee", "internet_access/ssid", "sanitary_dump_station", "power_supply", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["tent", "rv"], "tags": {"tourism": "camp_site"}, "name": "Campground"},
-    "tourism/caravan_site": {"icon": "temaki-rv_park", "fields": ["name", "address", "capacity", "sanitary_dump_station", "power_supply", "internet_access"], "moreFields": ["operator", "fee", "payment_multi_fee", "internet_access/fee", "internet_access/ssid", "smoking", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["Motor Home", "Camper"], "tags": {"tourism": "caravan_site"}, "name": "RV Park"},
-    "tourism/chalet": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "internet_access"], "moreFields": ["air_conditioning", "smoking", "payment_multi", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["holiday", "holiday cottage", "holiday home", "vacation", "vacation home"], "tags": {"tourism": "chalet"}, "name": "Holiday Cottage"},
+    "tourism/camp_site": {"icon": "maki-campsite", "fields": ["name", "operator", "address", "access_simple", "capacity", "fee", "payment_multi_fee", "internet_access"], "moreFields": ["email", "fax", "internet_access/fee", "internet_access/ssid", "phone", "power_supply", "reservation", "sanitary_dump_station", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["tent", "rv"], "tags": {"tourism": "camp_site"}, "name": "Campground"},
+    "tourism/caravan_site": {"icon": "temaki-rv_park", "fields": ["name", "address", "capacity", "sanitary_dump_station", "power_supply", "internet_access"], "moreFields": ["operator", "fee", "payment_multi_fee", "internet_access/fee", "internet_access/ssid", "smoking", "website", "phone", "email", "fax", "wheelchair", "reservation"], "geometry": ["point", "vertex", "area"], "terms": ["Motor Home", "Camper"], "tags": {"tourism": "caravan_site"}, "name": "RV Park"},
+    "tourism/chalet": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "internet_access"], "moreFields": ["air_conditioning", "smoking", "payment_multi", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair", "reservation"], "geometry": ["point", "area"], "terms": ["holiday", "holiday cottage", "holiday home", "vacation", "vacation home"], "tags": {"tourism": "chalet"}, "name": "Holiday Cottage"},
    "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": ["air_conditioning", "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/guest_house": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "rooms", "internet_access"], "moreFields": ["air_conditioning", "smoking", "payment_multi", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair", "reservation"], "geometry": ["point", "area"], "tags": {"tourism": "guest_house"}, "terms": ["B&B", "Bed and Breakfast"], "name": "Guest House"},
    "tourism/hostel": {"icon": "maki-lodging", "fields": ["{tourism/guest_house}"], "moreFields": ["{tourism/guest_house}"], "geometry": ["point", "area"], "tags": {"tourism": "hostel"}, "name": "Hostel"},
    "tourism/hotel": {"icon": "fas-concierge-bell", "fields": ["{tourism/motel}"], "moreFields": ["{tourism/motel}", "stars", "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"},
@@ -1065,13 +1065,13 @@
    "tourism/information/map": {"icon": "fas-map", "fields": ["operator", "map_type", "map_size", "direction"], "geometry": ["point", "vertex"], "tags": {"tourism": "information", "information": "map"}, "reference": {"key": "information", "value": "map"}, "name": "Map"},
    "tourism/information/office": {"icon": "maki-information", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["internet_access", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "vertex", "area"], "tags": {"tourism": "information", "information": "office"}, "reference": {"key": "information", "value": "office"}, "name": "Tourist Information Office"},
    "tourism/information/route_marker": {"icon": "maki-information", "fields": ["ref", "operator", "colour", "material", "elevation"], "geometry": ["point", "vertex"], "terms": ["cairn", "painted blaze", "route flag", "route marker", "stone pile", "trail blaze", "trail post", "way marker"], "tags": {"tourism": "information", "information": "route_marker"}, "reference": {"key": "information", "value": "route_marker"}, "name": "Trail Marker"},
-    "tourism/motel": {"icon": "maki-lodging", "fields": ["name", "brand", "address", "building_area", "rooms", "internet_access"], "moreFields": ["air_conditioning", "operator", "smoking", "payment_multi", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"tourism": "motel"}, "name": "Motel"},
+    "tourism/motel": {"icon": "maki-lodging", "fields": ["name", "brand", "address", "building_area", "rooms", "internet_access"], "moreFields": ["air_conditioning", "email", "fax", "internet_access/fee", "internet_access/ssid", "operator", "payment_multi", "phone", "reservation", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"tourism": "motel"}, "name": "Motel"},
    "tourism/museum": {"icon": "temaki-museum", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["air_conditioning", "fee", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["art*", "exhibit*", "gallery", "foundation", "hall", "institution", "paint*", "photo*", "sculpt*"], "tags": {"tourism": "museum"}, "name": "Museum"},
-    "tourism/picnic_site": {"icon": "maki-picnic-site", "fields": ["name", "operator", "address", "access_simple", "capacity"], "moreFields": ["smoking", "fee", "payment_multi_fee", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["camp"], "tags": {"tourism": "picnic_site"}, "name": "Picnic Site"},
+    "tourism/picnic_site": {"icon": "maki-picnic-site", "fields": ["name", "operator", "address", "access_simple", "capacity"], "moreFields": ["smoking", "fee", "payment_multi_fee", "phone", "reservation", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["camp"], "tags": {"tourism": "picnic_site"}, "name": "Picnic Site"},
    "tourism/theme_park": {"icon": "maki-amusement-park", "fields": ["name", "operator", "address", "opening_hours"], "moreFields": ["payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"tourism": "theme_park"}, "name": "Theme Park"},
    "tourism/trail_riding_station": {"icon": "maki-horse-riding", "fields": ["name", "horse_stables", "horse_riding", "horse_dressage"], "moreFields": ["address", "opening_hours", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "tags": {"tourism": "trail_riding_station"}, "name": "Trail Riding Station", "matchScore": 2},
    "tourism/viewpoint": {"icon": "temaki-binoculars", "geometry": ["point", "vertex"], "fields": ["direction"], "tags": {"tourism": "viewpoint"}, "name": "Viewpoint"},
-    "tourism/wilderness_hut": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "fee", "payment_multi_fee", "fireplace"], "moreFields": ["wheelchair"], "geometry": ["point", "area"], "terms": ["wilderness hut", "backcountry hut", "bothy"], "tags": {"tourism": "wilderness_hut"}, "name": "Wilderness Hut"},
+    "tourism/wilderness_hut": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "fee", "payment_multi_fee", "fireplace"], "moreFields": ["reservation", "wheelchair"], "geometry": ["point", "area"], "terms": ["wilderness hut", "backcountry hut", "bothy"], "tags": {"tourism": "wilderness_hut"}, "name": "Wilderness Hut"},
    "tourism/zoo": {"icon": "temaki-zoo", "fields": ["name", "operator", "address", "opening_hours", "fee"], "moreFields": ["payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["animal"], "tags": {"tourism": "zoo"}, "name": "Zoo"},
    "traffic_calming": {"icon": "temaki-diamond", "fields": ["traffic_calming", "surface", "direction_vertex"], "geometry": ["vertex", "line", "area"], "tags": {"traffic_calming": "*"}, "terms": ["bump", "hump", "slow", "speed"], "name": "Traffic Calming"},
    "traffic_calming/bump": {"icon": "temaki-diamond", "fields": ["surface", "direction_vertex"], "geometry": ["vertex", "line"], "terms": ["hump", "speed", "slow"], "tags": {"traffic_calming": "bump"}, "name": "Speed Bump"},
@@ -9,22 +9,23 @@
    ],
    "moreFields": [
        "air_conditioning",
-        "diet_multi",
-        "takeaway",
-        "delivery",
+        "bar",
        "capacity",
-        "opening_hours",
-        "smoking",
-        "payment_multi",
+        "delivery",
+        "diet_multi",
+        "email",
+        "fax",
        "internet_access",
        "internet_access/fee",
        "internet_access/ssid",
-        "website",
+        "opening_hours",
+        "payment_multi",
        "phone",
-        "email",
-        "fax",
-        "wheelchair",
-        "bar"
+        "reservation",
+        "smoking",
+        "takeaway",
+        "website",
+        "wheelchair"
    ],
    "geometry": [
        "point",
@@ -6,7 +6,7 @@
        "address",
        "building_area",
        "opening_hours",
-        "outdoor_seating"
+        "phone"
    ],
    "moreFields": [
        "air_conditioning",
@@ -21,8 +21,10 @@
        "internet_access/fee",
        "internet_access/ssid",
        "microbrewery",
-        "phone",
+        "outdoor_seating",
+        "reservation",
        "smoking",
+        "stars",
        "takeaway",
        "website",
        "wheelchair"
@@ -6,9 +6,6 @@
    "geometry": [
        "point"
    ],
-    "terms": [
-        "newspaper"
-    ],
    "tags": {
        "amenity": "vending_machine",
        "vending": "news_papers"
@@ -14,6 +14,7 @@
        "internet_access/ssid",
        "website",
        "phone",
+        "reservation",
        "email",
        "fax",
        "wheelchair"
@@ -9,14 +9,15 @@
        "internet_access"
    ],
    "moreFields" : [
-        "smoking",
-        "payment_multi",
-        "internet_access/fee",
-        "internet_access/ssid",
-        "website",
-        "phone",
        "email",
        "fax",
+        "internet_access/fee",
+        "internet_access/ssid",
+        "payment_multi",
+        "phone",
+        "reservation",
+        "smoking",
+        "website",
        "wheelchair"
    ],
    "geometry": [
@@ -11,14 +11,15 @@
        "internet_access"
    ],
    "moreFields" : [
-        "internet_access/fee",
-        "internet_access/ssid",
-        "sanitary_dump_station",
-        "power_supply",
-        "website",
-        "phone",
        "email",
        "fax",
+        "internet_access/fee",
+        "internet_access/ssid",
+        "phone",
+        "power_supply",
+        "reservation",
+        "sanitary_dump_station",
+        "website",
        "wheelchair"
    ],
    "geometry": [
@@ -19,7 +19,8 @@
        "phone",
        "email",
        "fax",
-        "wheelchair"
+        "wheelchair",
+        "reservation"
    ],
    "geometry": [
        "point",
@@ -17,7 +17,8 @@
        "phone",
        "email",
        "fax",
-        "wheelchair"
+        "wheelchair",
+        "reservation"
    ],
    "geometry": [
        "point",
@@ -18,7 +18,8 @@
        "phone",
        "email",
        "fax",
-        "wheelchair"
+        "wheelchair",
+        "reservation"
    ],
    "geometry": [
        "point",
@@ -10,15 +10,16 @@
    ],
    "moreFields" : [
        "air_conditioning",
-        "operator",
-        "smoking",
-        "payment_multi",
-        "internet_access/fee",
-        "internet_access/ssid",
-        "website",
-        "phone",
        "email",
        "fax",
+        "internet_access/fee",
+        "internet_access/ssid",
+        "operator",
+        "payment_multi",
+        "phone",
+        "reservation",
+        "smoking",
+        "website",
        "wheelchair"
    ],
    "geometry": [
@@ -11,6 +11,8 @@
        "smoking",
        "fee",
        "payment_multi_fee",
+        "phone",
+        "reservation",
        "website",
        "wheelchair"
    ],
@@ -10,6 +10,7 @@
        "fireplace"
    ],
    "moreFields": [
+        "reservation",
        "wheelchair"
    ],
    "geometry": [
@@ -1492,6 +1492,10 @@
    {"key": "ref:isil", "description": "🄵 ISIL Code"},
    {"key": "type", "description": "🄵 Type"},
    {"key": "religion", "description": "🄵 Religion"},
+    {"key": "reservation", "value": "yes", "description": "🄵 Reservations"},
+    {"key": "reservation", "value": "no", "description": "🄵 Reservations"},
+    {"key": "reservation", "value": "required", "description": "🄵 Reservations"},
+    {"key": "reservation", "value": "recommended", "description": "🄵 Reservations"},
    {"key": "resource", "description": "🄵 Resources"},
    {"key": "restriction", "description": "🄵 Type"},
    {"key": "roof:colour", "description": "🄵 Roof Color"},
@@ -1789,6 +1793,7 @@
    {"key": "power", "value": "underground_cable", "description": "🄳 ➜ power=cable + location=underground"},
    {"key": "power_source", "description": "🄳 ➜ generator:source=*"},
    {"key": "power_rating", "description": "🄳 ➜ generator:output=*"},
+    {"key": "reservations", "description": "🄳 ➜ reservation=*"},
    {"key": "roof:color", "description": "🄳 ➜ roof:colour=*"},
    {"key": "route", "value": "ncn", "description": "🄳 ➜ route=bicycle + network=ncn"},
    {"key": "shop", "value": "adult", "description": "🄳 ➜ shop=erotic"},
@@ -3511,6 +3511,15 @@
                "religion": {
                    "label": "Religion"
                },
+                "reservation": {
+                    "label": "Reservations",
+                    "options": {
+                        "yes": "Accepted",
+                        "no": "Not Accepted",
+                        "required": "Required",
+                        "recommended": "Recommended"
+                    }
+                },
                "resource": {
                    "label": "Resources"
                },
@@ -4897,7 +4906,7 @@
                },
                "amenity/vending_machine/news_papers": {
                    "name": "Newspaper Vending Machine",
-                    "terms": "newspaper"
+                    "terms": ""
                },
                "amenity/vending_machine/cigarettes": {
                    "name": "Cigarette Vending Machine",