Merge branch 'use-maki-5.0.0-icons' of https://github.com/quincylvania/iD into quincylvania-use-maki-5.0.0-icons

data/presets.yaml

@@ -2364,6 +2364,36 @@ en:
         name: Fast Food
         # 'terms: restaurant,takeaway'
         terms: '<translate with synonyms or related terms for ''Fast Food'', separated by commas>'
+      amenity/fast_food/burger:
+        # 'amenity=fast_food, cuisine=burger'
+        name: Burger Shop
+        # 'terms: breakfast,dine,dining,dinner,drive-in,eat,grill,lunch,table'
+        terms: '<translate with synonyms or related terms for ''Burger Shop'', separated by commas>'
+      amenity/fast_food/chicken:
+        # 'amenity=fast_food, cuisine=chicken'
+        name: Chicken Shop
+        # 'terms: breakfast,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table'
+        terms: '<translate with synonyms or related terms for ''Chicken Shop'', separated by commas>'
+      amenity/fast_food/fish_and_chips:
+        # 'amenity=fast_food, cuisine=fish_and_chips'
+        name: Fish & Chips Shop
+        # 'terms: breakfast,cafe,café,dine,dining,dinner,drive-in,eat,grill,lunch,table,french fries'
+        terms: '<translate with synonyms or related terms for ''Fish & Chips Shop'', separated by commas>'
+      amenity/fast_food/kebab:
+        # 'amenity=fast_food, cuisine=kebab'
+        name: Kebab Shop
+        # 'terms: bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table'
+        terms: '<translate with synonyms or related terms for ''Kebab Shop'', separated by commas>'
+      amenity/fast_food/pizza:
+        # 'amenity=fast_food, cuisine=pizza'
+        name: Pizza Shop
+        # 'terms: dine,dining,dinner,drive-in,eat,lunch,table,deep dish,thin crust,slice'
+        terms: '<translate with synonyms or related terms for ''Pizza Shop'', separated by commas>'
+      amenity/fast_food/sandwich:
+        # 'amenity=fast_food, cuisine=sandwich'
+        name: Sandwich Shop
+        # 'terms: breakfast,cafe,café,dine,dining,dinner,drive-in,eat,grill,lunch,table'
+        terms: '<translate with synonyms or related terms for ''Sandwich Shop'', separated by commas>'
       amenity/ferry_terminal:
         # amenity=ferry_terminal
         name: Ferry Station / Terminal
@@ -2593,6 +2623,96 @@ en:
         name: Restaurant
         # 'terms: bar,breakfast,cafe,café,canteen,coffee,dine,dining,dinner,drive-in,eat,grill,lunch,table'
         terms: '<translate with synonyms or related terms for ''Restaurant'', separated by commas>'
+      amenity/restaurant/american:
+        # 'amenity=restaurant, cuisine=american'
+        name: American Restaurant
+        # 'terms: bar,breakfast,cafe,café,canteen,coffee,dine,dining,dinner,drive-in,eat,grill,lunch,table'
+        terms: '<translate with synonyms or related terms for ''American Restaurant'', separated by commas>'
+      amenity/restaurant/asian:
+        # 'amenity=restaurant, cuisine=asian'
+        name: Asian Restaurant
+        # 'terms: bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table'
+        terms: '<translate with synonyms or related terms for ''Asian Restaurant'', separated by commas>'
+      amenity/restaurant/chinese:
+        # 'amenity=restaurant, cuisine=chinese'
+        name: Chinese Restaurant
+        # 'terms: bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table'
+        terms: '<translate with synonyms or related terms for ''Chinese Restaurant'', separated by commas>'
+      amenity/restaurant/french:
+        # 'amenity=restaurant, cuisine=french'
+        name: French Restaurant
+        # 'terms: bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table'
+        terms: '<translate with synonyms or related terms for ''French Restaurant'', separated by commas>'
+      amenity/restaurant/german:
+        # 'amenity=restaurant, cuisine=german'
+        name: German Restaurant
+        # 'terms: bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table'
+        terms: '<translate with synonyms or related terms for ''German Restaurant'', separated by commas>'
+      amenity/restaurant/greek:
+        # 'amenity=restaurant, cuisine=greek'
+        name: Greek Restaurant
+        # 'terms: bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table,gyros,pitas,olives'
+        terms: '<translate with synonyms or related terms for ''Greek Restaurant'', separated by commas>'
+      amenity/restaurant/indian:
+        # 'amenity=restaurant, cuisine=indian'
+        name: Indian Restaurant
+        # 'terms: bar,breakfast,dine,dining,dinner,drive-in,eat,grill,lunch,table,curry'
+        terms: '<translate with synonyms or related terms for ''Indian Restaurant'', separated by commas>'
+      amenity/restaurant/italian:
+        # 'amenity=restaurant, cuisine=italian'
+        name: Italian Restaurant
+        # 'terms: bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table,pasta,pizza'
+        terms: '<translate with synonyms or related terms for ''Italian Restaurant'', separated by commas>'
+      amenity/restaurant/japanese:
+        # 'amenity=restaurant, cuisine=japanese'
+        name: Japanese Restaurant
+        # 'terms: bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table'
+        terms: '<translate with synonyms or related terms for ''Japanese Restaurant'', separated by commas>'
+      amenity/restaurant/mexican:
+        # 'amenity=restaurant, cuisine=mexican'
+        name: Mexican Restaurant
+        # 'terms: bar,breakfast,dine,dining,dinner,drive-in,eat,grill,lunch,table,tacos,burritos,enchiladas,fajitas,nachos,tortillas,salsa,tamales,quesadillas'
+        terms: '<translate with synonyms or related terms for ''Mexican Restaurant'', separated by commas>'
+      amenity/restaurant/noodle:
+        # 'amenity=restaurant, cuisine=noodle'
+        name: Noodle Restaurant
+        # 'terms: bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table,ramen noodles,soup,soba noodles,cellophane noodles,rice noodles'
+        terms: '<translate with synonyms or related terms for ''Noodle Restaurant'', separated by commas>'
+      amenity/restaurant/pizza:
+        # 'amenity=restaurant, cuisine=pizza'
+        name: Pizza Restaurant
+        # 'terms: bar,dine,dining,dinner,drive-in,eat,lunch,table,deep dish,thin crust,slice'
+        terms: '<translate with synonyms or related terms for ''Pizza Restaurant'', separated by commas>'
+      amenity/restaurant/seafood:
+        # 'amenity=restaurant, cuisine=seafood'
+        name: Seafood Restaurant
+        # 'terms: bar,breakfast,cafe,café,dine,dining,dinner,drive-in,eat,grill,lunch,table,fish,shellfish,molluscs,crustaceans,clams,oysters,lobsters,crab,shrimp,squid,octopus'
+        terms: '<translate with synonyms or related terms for ''Seafood Restaurant'', separated by commas>'
+      amenity/restaurant/steakhouse:
+        # 'amenity=restaurant, cuisine=steak_house'
+        name: Steakhouse
+        # 'terms: bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table,steak house,chop house,beef'
+        terms: '<translate with synonyms or related terms for ''Steakhouse'', separated by commas>'
+      amenity/restaurant/sushi:
+        # 'amenity=restaurant, cuisine=sushi'
+        name: Sushi Restaurant
+        # 'terms: bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table'
+        terms: '<translate with synonyms or related terms for ''Sushi Restaurant'', separated by commas>'
+      amenity/restaurant/thai:
+        # 'amenity=restaurant, cuisine=thai'
+        name: Thai Restaurant
+        # 'terms: bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table'
+        terms: '<translate with synonyms or related terms for ''Thai Restaurant'', separated by commas>'
+      amenity/restaurant/turkish:
+        # 'amenity=restaurant, cuisine=turkish'
+        name: Turkish Restaurant
+        # 'terms: bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table'
+        terms: '<translate with synonyms or related terms for ''Turkish Restaurant'', separated by commas>'
+      amenity/restaurant/vietnamese:
+        # 'amenity=restaurant, cuisine=vietnamese'
+        name: Vietnamese Restaurant
+        # 'terms: bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table'
+        terms: '<translate with synonyms or related terms for ''Vietnamese Restaurant'', separated by commas>'
       amenity/sanitary_dump_station:
         # amenity=sanitary_dump_station
         name: RV Toilet Disposal

data/presets/presets.json

@@ -61,10 +61,10 @@
     "amenity/bureau_de_change": {"icon": "maki-bank", "fields": ["name", "currency_multi", "operator", "address", "building_area", "opening_hours"], "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", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "geometry": ["point", "area"], "terms": ["bistro", "coffee", "tea"], "tags": {"amenity": "cafe"}, "name": "Cafe"},
     "amenity/car_pooling": {"icon": "maki-car", "fields": ["name", "operator", "capacity"], "geometry": ["point", "area"], "tags": {"amenity": "car_pooling"}, "name": "Car Pooling"},
-    "amenity/car_rental": {"icon": "maki-car", "fields": ["name", "operator", "payment_multi"], "geometry": ["point", "area"], "tags": {"amenity": "car_rental"}, "name": "Car Rental"},
+    "amenity/car_rental": {"icon": "maki-car-rental", "fields": ["name", "operator", "payment_multi"], "geometry": ["point", "area"], "tags": {"amenity": "car_rental"}, "name": "Car Rental"},
     "amenity/car_sharing": {"icon": "maki-car", "fields": ["name", "operator", "capacity", "payment_multi"], "geometry": ["point", "area"], "tags": {"amenity": "car_sharing"}, "name": "Car Sharing"},
     "amenity/car_wash": {"icon": "maki-car", "fields": ["address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"amenity": "car_wash"}, "name": "Car Wash"},
-    "amenity/casino": {"icon": "temaki-dice", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi", "smoking"], "geometry": ["point", "area"], "terms": ["gambling", "roulette", "craps", "poker", "blackjack"], "tags": {"amenity": "casino"}, "name": "Casino"},
+    "amenity/casino": {"icon": "maki-casino", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi", "smoking"], "geometry": ["point", "area"], "terms": ["gambling", "roulette", "craps", "poker", "blackjack"], "tags": {"amenity": "casino"}, "name": "Casino"},
     "amenity/charging_station": {"icon": "fas-charging-station", "fields": ["operator", "capacity"], "geometry": ["point"], "tags": {"amenity": "charging_station"}, "terms": ["EV", "Electric Vehicle", "Supercharger"], "name": "Charging Station"},
     "amenity/childcare": {"icon": "maki-school", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "terms": ["daycare", "orphanage", "playgroup"], "tags": {"amenity": "childcare"}, "name": "Nursery/Childcare"},
     "amenity/cinema": {"icon": "maki-cinema", "fields": ["name", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["drive-in", "film", "flick", "movie", "theater", "picture", "show", "screen"], "tags": {"amenity": "cinema"}, "name": "Cinema"},
@@ -85,6 +85,12 @@
     "amenity/driving_school": {"icon": "maki-car", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"amenity": "driving_school"}, "name": "Driving School"},
     "amenity/embassy": {"icon": "maki-embassy", "fields": ["name", "country", "address", "building_area"], "geometry": ["point", "area"], "tags": {"amenity": "embassy"}, "name": "Embassy"},
     "amenity/fast_food": {"icon": "maki-fast-food", "fields": ["name", "cuisine", "operator", "address", "building_area", "opening_hours", "takeaway", "delivery", "drive_through", "smoking", "outdoor_seating"], "geometry": ["point", "area"], "tags": {"amenity": "fast_food"}, "terms": ["restaurant", "takeaway"], "name": "Fast Food"},
+    "amenity/fast_food/burger": {"icon": "maki-fast-food", "fields": ["name", "cuisine", "operator", "address", "building_area", "opening_hours", "takeaway", "delivery", "drive_through", "smoking", "outdoor_seating"], "geometry": ["point", "area"], "terms": ["breakfast", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "fast_food", "cuisine": "burger"}, "reference": {"key": "cuisine", "value": "burger"}, "name": "Burger Shop"},
+    "amenity/fast_food/chicken": {"icon": "fas-drumstick-bite", "fields": ["name", "cuisine", "operator", "address", "building_area", "opening_hours", "takeaway", "delivery", "drive_through", "smoking", "outdoor_seating"], "geometry": ["point", "area"], "terms": ["breakfast", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "fast_food", "cuisine": "chicken"}, "reference": {"key": "cuisine", "value": "chicken"}, "name": "Chicken Shop"},
+    "amenity/fast_food/fish_and_chips": {"icon": "fas-fish", "fields": ["name", "cuisine", "operator", "address", "building_area", "opening_hours", "takeaway", "delivery", "drive_through", "smoking", "outdoor_seating"], "geometry": ["point", "area"], "terms": ["breakfast", "cafe", "café", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table", "french fries"], "tags": {"amenity": "fast_food", "cuisine": "fish_and_chips"}, "reference": {"key": "cuisine", "value": "fish_and_chips"}, "name": "Fish & Chips Shop"},
+    "amenity/fast_food/kebab": {"icon": "maki-restaurant", "fields": ["name", "cuisine", "operator", "address", "building_area", "opening_hours", "takeaway", "delivery", "drive_through", "smoking", "outdoor_seating"], "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "fast_food", "cuisine": "kebab"}, "reference": {"key": "cuisine", "value": "kebab"}, "name": "Kebab Shop"},
+    "amenity/fast_food/pizza": {"icon": "maki-restaurant-pizza", "fields": ["name", "cuisine", "operator", "address", "building_area", "opening_hours", "takeaway", "delivery", "drive_through", "smoking", "outdoor_seating"], "geometry": ["point", "area"], "terms": ["dine", "dining", "dinner", "drive-in", "eat", "lunch", "table", "deep dish", "thin crust", "slice"], "tags": {"amenity": "fast_food", "cuisine": "pizza"}, "reference": {"key": "cuisine", "value": "pizza"}, "name": "Pizza Shop"},
+    "amenity/fast_food/sandwich": {"icon": "maki-restaurant", "fields": ["name", "cuisine", "operator", "address", "building_area", "opening_hours", "takeaway", "delivery", "drive_through", "smoking", "outdoor_seating"], "geometry": ["point", "area"], "terms": ["breakfast", "cafe", "café", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "fast_food", "cuisine": "sandwich"}, "reference": {"key": "cuisine", "value": "sandwich"}, "name": "Sandwich Shop"},
     "amenity/fire_station": {"icon": "maki-fire-station", "fields": ["name", "operator", "address", "building_area"], "geometry": ["point", "area"], "terms": [], "tags": {"amenity": "fire_station"}, "name": "Fire Station"},
     "amenity/food_court": {"icon": "maki-restaurant", "fields": ["name", "operator", "address", "building_area", "opening_hours", "smoking", "outdoor_seating"], "geometry": ["point", "area"], "terms": ["fast food", "restaurant", "food"], "tags": {"amenity": "food_court"}, "name": "Food Court"},
     "amenity/fountain": {"icon": "temaki-fountain", "fields": ["name"], "geometry": ["point", "area"], "tags": {"amenity": "fountain"}, "name": "Fountain"},
@@ -130,6 +136,24 @@
     "amenity/recycling_centre": {"icon": "maki-recycling", "fields": ["name", "operator", "address", "building", "opening_hours", "recycling_accepts"], "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", "capacity", "takeaway", "delivery", "smoking", "outdoor_seating"], "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", "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "capacity", "takeaway", "delivery", "smoking", "outdoor_seating"], "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", "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "capacity", "takeaway", "delivery", "smoking", "outdoor_seating"], "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", "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "capacity", "takeaway", "delivery", "smoking", "outdoor_seating"], "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"},
+    "amenity/restaurant/french": {"icon": "maki-restaurant", "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "capacity", "takeaway", "delivery", "smoking", "outdoor_seating"], "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant", "cuisine": "french"}, "reference": {"key": "cuisine", "value": "french"}, "name": "French Restaurant"},
+    "amenity/restaurant/german": {"icon": "maki-restaurant", "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "capacity", "takeaway", "delivery", "smoking", "outdoor_seating"], "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant", "cuisine": "german"}, "reference": {"key": "cuisine", "value": "german"}, "name": "German Restaurant"},
+    "amenity/restaurant/greek": {"icon": "maki-restaurant", "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "capacity", "takeaway", "delivery", "smoking", "outdoor_seating"], "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table", "gyros", "pitas", "olives"], "tags": {"amenity": "restaurant", "cuisine": "greek"}, "reference": {"key": "cuisine", "value": "greek"}, "name": "Greek Restaurant"},
+    "amenity/restaurant/indian": {"icon": "maki-restaurant", "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "capacity", "takeaway", "delivery", "smoking", "outdoor_seating"], "geometry": ["point", "area"], "terms": ["bar", "breakfast", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table", "curry"], "tags": {"amenity": "restaurant", "cuisine": "indian"}, "reference": {"key": "cuisine", "value": "indian"}, "name": "Indian Restaurant"},
+    "amenity/restaurant/italian": {"icon": "maki-restaurant", "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "capacity", "takeaway", "delivery", "smoking", "outdoor_seating"], "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table", "pasta", "pizza"], "tags": {"amenity": "restaurant", "cuisine": "italian"}, "reference": {"key": "cuisine", "value": "italian"}, "name": "Italian Restaurant"},
+    "amenity/restaurant/japanese": {"icon": "maki-restaurant-noodle", "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "capacity", "takeaway", "delivery", "smoking", "outdoor_seating"], "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant", "cuisine": "japanese"}, "reference": {"key": "cuisine", "value": "japanese"}, "name": "Japanese Restaurant"},
+    "amenity/restaurant/mexican": {"icon": "maki-restaurant", "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "capacity", "takeaway", "delivery", "smoking", "outdoor_seating"], "geometry": ["point", "area"], "terms": ["bar", "breakfast", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table", "tacos", "burritos", "enchiladas", "fajitas", "nachos", "tortillas", "salsa", "tamales", "quesadillas"], "tags": {"amenity": "restaurant", "cuisine": "mexican"}, "reference": {"key": "cuisine", "value": "mexican"}, "name": "Mexican Restaurant"},
+    "amenity/restaurant/noodle": {"icon": "maki-restaurant-noodle", "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "capacity", "takeaway", "delivery", "smoking", "outdoor_seating"], "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table", "ramen noodles", "soup", "soba noodles", "cellophane noodles", "rice noodles"], "tags": {"amenity": "restaurant", "cuisine": "noodle"}, "reference": {"key": "cuisine", "value": "noodle"}, "name": "Noodle Restaurant"},
+    "amenity/restaurant/pizza": {"icon": "maki-restaurant-pizza", "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "capacity", "takeaway", "delivery", "smoking", "outdoor_seating"], "geometry": ["point", "area"], "terms": ["bar", "dine", "dining", "dinner", "drive-in", "eat", "lunch", "table", "deep dish", "thin crust", "slice"], "tags": {"amenity": "restaurant", "cuisine": "pizza"}, "reference": {"key": "cuisine", "value": "pizza"}, "name": "Pizza Restaurant"},
+    "amenity/restaurant/seafood": {"icon": "maki-restaurant-seafood", "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "capacity", "takeaway", "delivery", "smoking", "outdoor_seating"], "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table", "fish", "shellfish", "molluscs", "crustaceans", "clams", "oysters", "lobsters", "crab", "shrimp", "squid", "octopus"], "tags": {"amenity": "restaurant", "cuisine": "seafood"}, "reference": {"key": "cuisine", "value": "seafood"}, "name": "Seafood Restaurant"},
+    "amenity/restaurant/steakhouse": {"icon": "maki-slaughterhouse", "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "capacity", "takeaway", "delivery", "smoking", "outdoor_seating"], "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table", "steak house", "chop house", "beef"], "tags": {"amenity": "restaurant", "cuisine": "steak_house"}, "reference": {"key": "cuisine", "value": "steak_house"}, "name": "Steakhouse"},
+    "amenity/restaurant/sushi": {"icon": "fas-fish", "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "capacity", "takeaway", "delivery", "smoking", "outdoor_seating"], "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant", "cuisine": "sushi"}, "reference": {"key": "cuisine", "value": "sushi"}, "name": "Sushi Restaurant"},
+    "amenity/restaurant/thai": {"icon": "maki-restaurant-noodle", "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "capacity", "takeaway", "delivery", "smoking", "outdoor_seating"], "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant", "cuisine": "thai"}, "reference": {"key": "cuisine", "value": "thai"}, "name": "Thai Restaurant"},
+    "amenity/restaurant/turkish": {"icon": "maki-restaurant", "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "capacity", "takeaway", "delivery", "smoking", "outdoor_seating"], "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant", "cuisine": "turkish"}, "reference": {"key": "cuisine", "value": "turkish"}, "name": "Turkish Restaurant"},
+    "amenity/restaurant/vietnamese": {"icon": "maki-restaurant-noodle", "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "capacity", "takeaway", "delivery", "smoking", "outdoor_seating"], "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant", "cuisine": "vietnamese"}, "reference": {"key": "cuisine", "value": "vietnamese"}, "name": "Vietnamese Restaurant"},
     "amenity/sanitary_dump_station": {"icon": "temaki-storage_tank", "fields": ["operator", "access_simple", "fee", "water_point"], "geometry": ["point", "vertex", "area"], "terms": ["Motor Home", "Camper", "Sanitary", "Dump Station", "Elsan", "CDP", "CTDP", "Chemical Toilet"], "tags": {"amenity": "sanitary_dump_station"}, "name": "RV Toilet Disposal"},
     "amenity/school": {"icon": "maki-school", "fields": ["name", "operator", "address", "religion", "denomination"], "geometry": ["point", "area"], "terms": ["academy", "elementary school", "middle school", "high school"], "tags": {"amenity": "school"}, "name": "School Grounds"},
     "amenity/shelter": {"icon": "maki-shelter", "fields": ["name", "shelter_type", "building_area", "bench", "bin"], "geometry": ["point", "vertex", "area"], "terms": ["lean-to", "gazebo", "picnic"], "tags": {"amenity": "shelter"}, "name": "Shelter"},
@@ -288,7 +312,7 @@
     "craft/caterer": {"icon": "maki-restaurant", "fields": ["name", "cuisine", "operator", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "tags": {"craft": "caterer"}, "name": "Caterer"},
     "craft/chimney_sweeper": {"icon": "temaki-chimney", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "tags": {"craft": "chimney_sweeper"}, "name": "Chimney Sweeper"},
     "craft/clockmaker": {"icon": "temaki-clock", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "tags": {"craft": "clockmaker"}, "name": "Clockmaker"},
-    "craft/confectionery": {"icon": "maki-bakery", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "terms": ["sweet", "candy"], "tags": {"craft": "confectionery"}, "name": "Candy Maker"},
+    "craft/confectionery": {"icon": "maki-confectionary", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "terms": ["sweet", "candy"], "tags": {"craft": "confectionery"}, "name": "Candy Maker"},
     "craft/distillery": {"icon": "temaki-storage_tank", "fields": ["name", "operator", "address", "building_area", "opening_hours", "product"], "geometry": ["point", "area"], "terms": ["alcohol", "beverage", "bourbon", "booze", "brandy", "gin", "hooch", "liquor", "mezcal", "moonshine", "rum", "scotch", "spirits", "still", "tequila", "vodka", "whiskey", "whisky"], "tags": {"craft": "distillery"}, "name": "Distillery"},
     "craft/dressmaker": {"icon": "maki-clothing-store", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "terms": ["seamstress"], "tags": {"craft": "dressmaker"}, "name": "Dressmaker"},
     "craft/electrician": {"icon": "temaki-power", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "terms": ["power", "wire"], "tags": {"craft": "electrician"}, "name": "Electrician"},
@@ -313,12 +337,12 @@
     "craft/sawmill": {"icon": "maki-logging", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "terms": ["lumber"], "tags": {"craft": "sawmill"}, "name": "Sawmill"},
     "craft/scaffolder": {"icon": "temaki-tools", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "tags": {"craft": "scaffolder"}, "name": "Scaffolder"},
     "craft/sculptor": {"icon": "maki-art-gallery", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "tags": {"craft": "sculptor"}, "name": "Sculptor"},
-    "craft/shoemaker": {"icon": "temaki-tools", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "terms": ["cobbler"], "tags": {"craft": "shoemaker"}, "name": "Shoemaker"},
+    "craft/shoemaker": {"icon": "maki-shoe", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "terms": ["cobbler"], "tags": {"craft": "shoemaker"}, "name": "Shoemaker"},
     "craft/stonemason": {"icon": "temaki-tools", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "terms": ["masonry"], "tags": {"craft": "stonemason"}, "name": "Stonemason"},
     "craft/tiler": {"icon": "temaki-tools", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "tags": {"craft": "tiler"}, "name": "Tiler"},
     "craft/tinsmith": {"icon": "temaki-tools", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "tags": {"craft": "tinsmith"}, "name": "Tinsmith"},
     "craft/upholsterer": {"icon": "temaki-tools", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "tags": {"craft": "upholsterer"}, "name": "Upholsterer"},
-    "craft/watchmaker": {"icon": "temaki-clock", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "tags": {"craft": "watchmaker"}, "name": "Watchmaker"},
+    "craft/watchmaker": {"icon": "maki-watch", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "tags": {"craft": "watchmaker"}, "name": "Watchmaker"},
     "craft/window_construction": {"icon": "temaki-window", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "terms": ["glass"], "tags": {"craft": "window_construction"}, "name": "Window Construction"},
     "craft/winery": {"icon": "maki-alcohol-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "tags": {"craft": "winery"}, "name": "Winery"},
     "emergency/designated": {"fields": [], "geometry": ["line"], "tags": {"emergency": "designated"}, "terms": [], "name": "Emergency Access Designated", "searchable": false, "matchScore": 0.01},
@@ -486,10 +510,10 @@
     "landuse/retail": {"icon": "maki-commercial", "geometry": ["area"], "fields": ["name"], "tags": {"landuse": "retail"}, "matchScore": 0.9, "name": "Retail Area"},
     "landuse/vineyard": {"fields": ["name", "operator", "grape_variety"], "geometry": ["area"], "tags": {"landuse": "vineyard"}, "addTags": {"landuse": "vineyard", "crop": "grape"}, "removeTags": {"landuse": "vineyard", "crop": "grape", "grape_variety": "*"}, "terms": ["grape", "wine"], "name": "Vineyard"},
     "leisure": {"icon": "maki-pitch", "fields": ["name", "leisure"], "geometry": ["point", "vertex", "area"], "tags": {"leisure": "*"}, "name": "Leisure"},
-    "leisure/adult_gaming_centre": {"icon": "temaki-dice", "fields": ["name", "operator", "address", "building_area", "opening_hours", "smoking"], "geometry": ["point", "area"], "terms": ["gambling", "slot machine"], "tags": {"leisure": "adult_gaming_centre"}, "name": "Adult Gaming Center"},
+    "leisure/adult_gaming_centre": {"icon": "maki-casino", "fields": ["name", "operator", "address", "building_area", "opening_hours", "smoking"], "geometry": ["point", "area"], "terms": ["gambling", "slot machine"], "tags": {"leisure": "adult_gaming_centre"}, "name": "Adult Gaming Center"},
     "leisure/amusement_arcade": {"icon": "maki-gaming", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "terms": ["pay-to-play games", "video games", "driving simulators", "pinball machines"], "tags": {"leisure": "amusement_arcade"}, "name": "Amusement Arcade"},
     "leisure/bandstand": {"icon": "maki-music", "fields": ["name", "building_area", "operator"], "geometry": ["point", "area"], "tags": {"leisure": "bandstand"}, "name": "Bandstand"},
-    "leisure/beach_resort": {"icon": "temaki-beach", "fields": ["name", "address", "fee"], "geometry": ["point", "area"], "tags": {"leisure": "beach_resort"}, "name": "Beach Resort"},
+    "leisure/beach_resort": {"icon": "maki-beach", "fields": ["name", "address", "fee"], "geometry": ["point", "area"], "tags": {"leisure": "beach_resort"}, "name": "Beach Resort"},
     "leisure/bird_hide": {"icon": "temaki-binoculars", "fields": ["building_area"], "geometry": ["point", "area"], "tags": {"leisure": "bird_hide"}, "terms": ["machan", "ornithology"], "name": "Bird Hide"},
     "leisure/bleachers": {"geometry": ["point", "area"], "tags": {"leisure": "bleachers"}, "terms": ["crowd", "bench", "sports", "stand", "stands", "seat", "seating"], "name": "Bleachers"},
     "leisure/bowling_alley": {"icon": "temaki-bowling", "fields": ["name", "operator", "address", "building_area", "opening_hours", "smoking"], "geometry": ["point", "area"], "terms": ["bowling center"], "tags": {"leisure": "bowling_alley"}, "name": "Bowling Alley"},
@@ -529,24 +553,24 @@
     "leisure/pitch/badminton": {"icon": "maki-tennis", "fields": ["name", "surface", "lit", "access_simple"], "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "badminton"}, "reference": {"key": "sport", "value": "badminton"}, "terms": [], "name": "Badminton Court"},
     "leisure/pitch/baseball": {"icon": "maki-baseball", "fields": ["name", "lit"], "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "baseball"}, "reference": {"key": "sport", "value": "baseball"}, "terms": [], "name": "Baseball Field"},
     "leisure/pitch/basketball": {"icon": "maki-basketball", "fields": ["name", "surface", "hoops", "lit", "access_simple"], "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "basketball"}, "reference": {"key": "sport", "value": "basketball"}, "terms": [], "name": "Basketball Court"},
-    "leisure/pitch/beachvolleyball": {"icon": "maki-basketball", "fields": ["name", "surface", "lit"], "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "beachvolleyball"}, "addTags": {"leisure": "pitch", "sport": "beachvolleyball", "surface": "sand"}, "removeTags": {"leisure": "pitch", "sport": "beachvolleyball", "surface": "sand"}, "reference": {"key": "sport", "value": "beachvolleyball"}, "terms": ["volleyball"], "name": "Beach Volleyball Court"},
+    "leisure/pitch/beachvolleyball": {"icon": "maki-volleyball", "fields": ["name", "surface", "lit"], "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "beachvolleyball"}, "addTags": {"leisure": "pitch", "sport": "beachvolleyball", "surface": "sand"}, "removeTags": {"leisure": "pitch", "sport": "beachvolleyball", "surface": "sand"}, "reference": {"key": "sport", "value": "beachvolleyball"}, "terms": ["volleyball"], "name": "Beach Volleyball Court"},
     "leisure/pitch/boules": {"icon": "maki-pitch", "fields": ["name", "boules", "surface", "lit"], "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "boules"}, "reference": {"key": "sport", "value": "boules"}, "terms": ["bocce", "lyonnaise", "pétanque"], "name": "Boules/Bocce Court"},
     "leisure/pitch/bowls": {"icon": "maki-pitch", "fields": ["name", "surface", "lit"], "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "bowls"}, "reference": {"key": "sport", "value": "bowls"}, "terms": [], "name": "Bowling Green"},
     "leisure/pitch/cricket": {"icon": "maki-cricket", "fields": ["name", "surface", "lit"], "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "cricket"}, "reference": {"key": "sport", "value": "cricket"}, "terms": [], "name": "Cricket Field"},
     "leisure/pitch/equestrian": {"icon": "maki-horse-riding", "fields": ["name", "surface", "lit", "building"], "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "equestrian"}, "reference": {"key": "sport", "value": "equestrian"}, "terms": ["dressage", "equestrian", "horse", "horseback", "riding"], "name": "Riding Arena"},
     "leisure/pitch/rugby_league": {"icon": "maki-america-football", "fields": ["name", "surface", "lit"], "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "rugby_league"}, "reference": {"key": "sport", "value": "rugby_league"}, "terms": [], "name": "Rugby League Field"},
     "leisure/pitch/rugby_union": {"icon": "maki-america-football", "fields": ["name", "surface", "lit"], "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "rugby_union"}, "reference": {"key": "sport", "value": "rugby_union"}, "terms": [], "name": "Rugby Union Field"},
-    "leisure/pitch/skateboard": {"icon": "maki-pitch", "fields": ["name", "surface", "lit"], "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "skateboard"}, "reference": {"key": "sport", "value": "skateboard"}, "terms": [], "name": "Skate Park"},
+    "leisure/pitch/skateboard": {"icon": "maki-skateboard", "fields": ["name", "surface", "lit"], "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "skateboard"}, "reference": {"key": "sport", "value": "skateboard"}, "terms": [], "name": "Skate Park"},
     "leisure/pitch/soccer": {"icon": "maki-soccer", "fields": ["name", "surface", "lit"], "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "soccer"}, "reference": {"key": "sport", "value": "soccer"}, "terms": ["football"], "name": "Soccer Field"},
     "leisure/pitch/softball": {"icon": "maki-baseball", "fields": ["name", "lit"], "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "softball"}, "reference": {"key": "sport", "value": "softball"}, "terms": ["softball", "diamond"], "name": "Softball Field"},
     "leisure/pitch/table_tennis": {"icon": "maki-tennis", "fields": ["name", "lit", "access_simple"], "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "table_tennis"}, "reference": {"key": "sport", "value": "table_tennis"}, "terms": ["table tennis", "ping pong"], "name": "Ping Pong Table"},
     "leisure/pitch/tennis": {"icon": "maki-tennis", "fields": ["name", "surface", "lit", "access_simple"], "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "tennis"}, "reference": {"key": "sport", "value": "tennis"}, "terms": [], "name": "Tennis Court"},
-    "leisure/pitch/volleyball": {"icon": "maki-basketball", "fields": ["name", "surface", "lit"], "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "volleyball"}, "reference": {"key": "sport", "value": "volleyball"}, "terms": [], "name": "Volleyball Court"},
+    "leisure/pitch/volleyball": {"icon": "maki-volleyball", "fields": ["name", "surface", "lit"], "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "volleyball"}, "reference": {"key": "sport", "value": "volleyball"}, "terms": [], "name": "Volleyball Court"},
     "leisure/playground": {"icon": "maki-playground", "fields": ["name", "operator", "surface", "playground/max_age", "playground/min_age", "access_simple"], "geometry": ["point", "area"], "terms": ["jungle gym", "play area"], "tags": {"leisure": "playground"}, "name": "Playground"},
     "leisure/resort": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "opening_hours"], "geometry": ["point", "area"], "tags": {"leisure": "resort"}, "name": "Resort"},
     "leisure/running_track": {"icon": "maki-pitch", "fields": ["surface", "sport_racing_nonmotor", "lit", "width", "lanes"], "geometry": ["point", "line", "area"], "tags": {"leisure": "track", "sport": "running"}, "terms": ["race*", "running", "sprint", "track"], "name": "Racetrack (Running)"},
     "leisure/sauna": {"icon": "fas-thermometer-three-quarters", "fields": ["name", "operator", "address", "opening_hours", "access_simple", "fee"], "geometry": ["point", "area"], "tags": {"leisure": "sauna"}, "name": "Sauna"},
-    "leisure/slipway": {"icon": "temaki-beach", "fields": ["access_simple"], "geometry": ["point", "line"], "terms": ["boat launch", "boat ramp"], "tags": {"leisure": "slipway"}, "name": "Slipway"},
+    "leisure/slipway": {"icon": "maki-slipway", "fields": ["access_simple"], "geometry": ["point", "line"], "terms": ["boat launch", "boat ramp"], "tags": {"leisure": "slipway"}, "name": "Slipway"},
     "leisure/sports_centre": {"icon": "maki-pitch", "fields": ["name", "sport", "building", "address", "opening_hours"], "geometry": ["point", "area"], "tags": {"leisure": "sports_centre"}, "terms": [], "name": "Sports Center / Complex"},
     "leisure/sports_centre/swimming": {"icon": "maki-swimming", "fields": ["name", "access_simple", "operator", "address", "building"], "geometry": ["point", "area"], "terms": ["dive", "water"], "tags": {"leisure": "sports_centre", "sport": "swimming"}, "reference": {"key": "sport", "value": "swimming"}, "name": "Swimming Pool Facility"},
     "leisure/stadium": {"icon": "maki-pitch", "fields": ["name", "sport", "address"], "geometry": ["point", "area"], "tags": {"leisure": "stadium"}, "name": "Stadium"},
@@ -558,7 +582,7 @@
     "man_made/adit": {"icon": "maki-triangle", "geometry": ["point", "area"], "fields": ["operator", "direction"], "terms": ["entrance", "underground", "mine", "cave"], "tags": {"man_made": "adit"}, "name": "Adit"},
     "man_made/antenna": {"icon": "temaki-antenna", "fields": ["height", "communication_multi"], "geometry": ["point"], "terms": ["broadcast", "cell phone", "cell", "communication", "mobile phone", "radio", "television", "transmission", "tv"], "tags": {"man_made": "antenna"}, "name": "Antenna"},
     "man_made/breakwater": {"geometry": ["line", "area"], "tags": {"man_made": "breakwater"}, "name": "Breakwater"},
-    "man_made/bridge": {"icon": "fas-archway", "fields": ["name", "bridge", "layer", "maxweight"], "geometry": ["area"], "tags": {"man_made": "bridge"}, "addTags": {"man_made": "bridge", "layer": "1"}, "removeTags": {"man_made": "bridge", "layer": "*"}, "reference": {"key": "man_made", "value": "bridge"}, "name": "Bridge"},
+    "man_made/bridge": {"icon": "maki-bridge", "fields": ["name", "bridge", "layer", "maxweight"], "geometry": ["area"], "tags": {"man_made": "bridge"}, "addTags": {"man_made": "bridge", "layer": "1"}, "removeTags": {"man_made": "bridge", "layer": "*"}, "reference": {"key": "man_made", "value": "bridge"}, "name": "Bridge"},
     "man_made/bunker_silo": {"icon": "temaki-silo", "fields": ["content"], "geometry": ["point", "area"], "terms": ["Silage", "Storage"], "tags": {"man_made": "bunker_silo"}, "name": "Bunker Silo"},
     "man_made/chimney": {"icon": "temaki-chimney", "geometry": ["point", "area"], "tags": {"man_made": "chimney"}, "name": "Chimney"},
     "man_made/clearcut": {"icon": "maki-logging", "geometry": ["area"], "tags": {"man_made": "clearcut"}, "terms": ["cut", "forest", "lumber", "tree", "wood"], "name": "Clearcut Forest"},
@@ -569,7 +593,7 @@
     "man_made/gasometer": {"icon": "temaki-storage_tank", "fields": ["content", "building_area"], "geometry": ["point", "area"], "terms": ["gas holder"], "tags": {"man_made": "gasometer"}, "name": "Gasometer"},
     "man_made/groyne": {"geometry": ["line", "area"], "tags": {"man_made": "groyne"}, "name": "Groyne"},
     "man_made/lighthouse": {"icon": "maki-lighthouse", "fields": ["building_area"], "geometry": ["point", "area"], "tags": {"man_made": "lighthouse"}, "name": "Lighthouse"},
-    "man_made/mast": {"icon": "temaki-antenna", "fields": ["tower/type", "tower/construction", "height", "communication_multi"], "geometry": ["point"], "terms": ["antenna", "broadcast tower", "cell phone tower", "cell tower", "communication mast", "communication tower", "guyed tower", "mobile phone tower", "radio mast", "radio tower", "television tower", "transmission mast", "transmission tower", "tv tower"], "tags": {"man_made": "mast"}, "name": "Mast"},
+    "man_made/mast": {"icon": "maki-communications-tower", "fields": ["tower/type", "tower/construction", "height", "communication_multi"], "geometry": ["point"], "terms": ["antenna", "broadcast tower", "cell phone tower", "cell tower", "communication mast", "communication tower", "guyed tower", "mobile phone tower", "radio mast", "radio tower", "television tower", "transmission mast", "transmission tower", "tv tower"], "tags": {"man_made": "mast"}, "name": "Mast"},
     "man_made/monitoring_station": {"icon": "temaki-antenna", "geometry": ["point", "area"], "fields": ["monitoring_multi", "operator"], "terms": ["weather", "earthquake", "seismology", "air", "gps"], "tags": {"man_made": "monitoring_station"}, "name": "Monitoring Station"},
     "man_made/observation": {"icon": "temaki-tower", "geometry": ["point", "area"], "terms": ["lookout tower", "fire tower"], "tags": {"man_made": "tower", "tower:type": "observation"}, "name": "Observation Tower"},
     "man_made/observatory": {"geometry": ["point", "area"], "terms": ["astronomical", "meteorological"], "tags": {"man_made": "observatory"}, "name": "Observatory"},
@@ -587,8 +611,8 @@
     "man_made/water_tower": {"icon": "maki-water", "fields": ["operator"], "geometry": ["point", "area"], "tags": {"man_made": "water_tower"}, "name": "Water Tower"},
     "man_made/water_well": {"icon": "maki-water", "fields": ["operator"], "geometry": ["point", "area"], "tags": {"man_made": "water_well"}, "name": "Water Well"},
     "man_made/water_works": {"icon": "maki-water", "fields": ["name", "operator", "address"], "geometry": ["point", "area"], "tags": {"man_made": "water_works"}, "name": "Water Works"},
-    "man_made/watermill": {"icon": "maki-religious-buddhist", "fields": ["building_area"], "geometry": ["point", "area"], "terms": ["water", "wheel", "mill"], "tags": {"man_made": "watermill"}, "name": "Watermill"},
-    "man_made/windmill": {"icon": "temaki-windmill", "fields": ["building_area"], "geometry": ["point", "area"], "terms": ["wind", "wheel", "mill"], "tags": {"man_made": "windmill"}, "name": "Windmill"},
+    "man_made/watermill": {"icon": "maki-watermill", "fields": ["building_area"], "geometry": ["point", "area"], "terms": ["water", "wheel", "mill"], "tags": {"man_made": "watermill"}, "name": "Watermill"},
+    "man_made/windmill": {"icon": "maki-windmill", "fields": ["building_area"], "geometry": ["point", "area"], "terms": ["wind", "wheel", "mill"], "tags": {"man_made": "windmill"}, "name": "Windmill"},
     "man_made/works": {"icon": "maki-industry", "fields": ["name", "operator", "address", "building_area", "product"], "geometry": ["point", "area"], "terms": ["assembly", "build", "brewery", "car", "plant", "plastic", "processing", "manufacture", "refinery"], "tags": {"man_made": "works"}, "name": "Factory"},
     "manhole": {"icon": "maki-circle-stroked", "fields": ["manhole", "operator", "label", "ref"], "geometry": ["point", "vertex"], "tags": {"manhole": "*"}, "terms": ["cover", "hole", "sewer", "sewage", "telecom"], "name": "Manhole"},
     "manhole/drain": {"icon": "maki-water", "fields": ["operator", "ref"], "geometry": ["point", "vertex"], "tags": {"manhole": "drain"}, "terms": ["cover", "drain", "hole", "rain", "sewer", "sewage", "storm"], "name": "Storm Drain"},
@@ -815,7 +839,7 @@
     "shop/butcher": {"icon": "maki-slaughterhouse", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["meat"], "tags": {"shop": "butcher"}, "name": "Butcher"},
     "shop/candles": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "candles"}, "name": "Candle Shop"},
     "shop/car_parts": {"icon": "maki-car", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["auto"], "tags": {"shop": "car_parts"}, "name": "Car Parts Store"},
-    "shop/car_repair": {"icon": "maki-car", "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["auto", "garage", "service"], "tags": {"shop": "car_repair"}, "name": "Car Repair Shop"},
+    "shop/car_repair": {"icon": "maki-car-repair", "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["auto", "garage", "service"], "tags": {"shop": "car_repair"}, "name": "Car Repair Shop"},
     "shop/car": {"icon": "maki-car", "fields": ["name", "operator", "address", "building_area", "brand", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["auto"], "tags": {"shop": "car"}, "name": "Car Dealership"},
     "shop/carpet": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["rug"], "tags": {"shop": "carpet"}, "name": "Carpet Store"},
     "shop/charity": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "second_hand", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["thrift", "op shop", "nonprofit"], "tags": {"shop": "charity"}, "name": "Charity Store"},
@@ -825,7 +849,7 @@
     "shop/clothes": {"icon": "maki-clothing-store", "fields": ["name", "clothes", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "clothes"}, "name": "Clothing Store"},
     "shop/coffee": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "coffee"}, "name": "Coffee Store"},
     "shop/computer": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "computer"}, "name": "Computer Store"},
-    "shop/confectionery": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["sweet"], "tags": {"shop": "confectionery"}, "name": "Candy Store"},
+    "shop/confectionery": {"icon": "maki-confectionary", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["sweet"], "tags": {"shop": "confectionery"}, "name": "Candy Store"},
     "shop/convenience": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "convenience"}, "name": "Convenience Store"},
     "shop/copyshop": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "copyshop"}, "name": "Copy Store"},
     "shop/cosmetics": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "cosmetics"}, "name": "Cosmetics Store"},
@@ -858,7 +882,7 @@
     "shop/hifi": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["stereo", "video"], "tags": {"shop": "hifi"}, "name": "Hifi Store"},
     "shop/houseware": {"icon": "fas-blender", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["home", "household"], "tags": {"shop": "houseware"}, "name": "Houseware Store"},
     "shop/interior_decoration": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "interior_decoration"}, "name": "Interior Decoration Store"},
-    "shop/jewelry": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["diamond", "gem", "ring"], "tags": {"shop": "jewelry"}, "name": "Jeweler"},
+    "shop/jewelry": {"icon": "maki-jewelry-store", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["diamond", "gem", "ring"], "tags": {"shop": "jewelry"}, "name": "Jeweler"},
     "shop/kiosk": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi", "levels"], "geometry": ["point", "area"], "tags": {"shop": "kiosk"}, "name": "Kiosk"},
     "shop/kitchen": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "kitchen"}, "name": "Kitchen Design Store"},
     "shop/laundry": {"icon": "maki-laundry", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "laundry"}, "name": "Laundry"},
@@ -876,7 +900,7 @@
     "shop/musical_instrument": {"icon": "maki-music", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["guitar"], "tags": {"shop": "musical_instrument"}, "name": "Musical Instrument Store"},
     "shop/newsagent": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "newsagent"}, "name": "Newspaper/Magazine Shop"},
     "shop/nutrition_supplements": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "nutrition_supplements"}, "name": "Nutrition Supplements Store"},
-    "shop/optician": {"icon": "fas-glasses", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["eye", "glasses"], "tags": {"shop": "optician"}, "name": "Optician"},
+    "shop/optician": {"icon": "maki-optician", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["eye", "glasses"], "tags": {"shop": "optician"}, "name": "Optician"},
     "shop/organic": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "supermarket", "organic": "only"}, "name": "Organic Goods Store"},
     "shop/outdoor": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["camping", "climbing", "hiking"], "tags": {"shop": "outdoor"}, "name": "Outdoors Store"},
     "shop/paint": {"icon": "fas-paint-roller", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "paint"}, "name": "Paint Store"},
@@ -893,7 +917,7 @@
     "shop/seafood": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["fishmonger"], "tags": {"shop": "seafood"}, "name": "Seafood Shop"},
     "shop/second_hand": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "second_hand", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["secondhand", "second hand", "resale", "thrift", "used"], "tags": {"shop": "second_hand"}, "name": "Consignment/Thrift Store"},
     "shop/sewing": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["haberdashery"], "tags": {"shop": "sewing"}, "name": "Sewing Supply Shop"},
-    "shop/shoes": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "shoes"}, "name": "Shoe Store"},
+    "shop/shoes": {"icon": "maki-shoe", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "shoes"}, "name": "Shoe Store"},
     "shop/sports": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "sports"}, "name": "Sporting Goods Store"},
     "shop/stationery": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["card", "paper"], "tags": {"shop": "stationery"}, "name": "Stationery Store"},
     "shop/storage_rental": {"icon": "fas-warehouse", "fields": ["name", "operator", "address", "building", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "storage_rental"}, "name": "Storage Rental"},
@@ -912,7 +936,7 @@
     "shop/variety_store": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "variety_store"}, "name": "Variety Store"},
     "shop/video_games": {"icon": "maki-gaming", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "video_games"}, "name": "Video Game Store"},
     "shop/video": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["DVD"], "tags": {"shop": "video"}, "name": "Video Store"},
-    "shop/watches": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "watches"}, "name": "Watches Shop"},
+    "shop/watches": {"icon": "maki-watch", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "watches"}, "name": "Watches Shop"},
     "shop/water_sports": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "water_sports"}, "name": "Watersport/Swim Shop"},
     "shop/weapons": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["ammo", "gun", "knife", "knives"], "tags": {"shop": "weapons"}, "name": "Weapon Shop"},
     "shop/wholesale": {"icon": "maki-warehouse", "fields": ["name", "operator", "wholesale", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["warehouse club", "cash and carry"], "tags": {"shop": "wholesale"}, "name": "Wholesale Store"},
@@ -1009,7 +1033,7 @@
     "waterway/stream_intermittent": {"icon": "iD-waterway-stream", "fields": ["name", "structure_waterway", "width", "intermittent"], "geometry": ["line"], "terms": ["arroyo", "beck", "branch", "brook", "burn", "course", "creek", "drift", "flood", "flow", "gully", "run", "runnel", "rush", "spate", "spritz", "tributary", "wadi", "wash", "watercourse"], "tags": {"waterway": "stream", "intermittent": "yes"}, "reference": {"key": "waterway", "value": "stream"}, "name": "Intermittent Stream"},
     "waterway/stream": {"icon": "iD-waterway-stream", "fields": ["name", "structure_waterway", "width", "intermittent"], "geometry": ["line"], "terms": ["beck", "branch", "brook", "burn", "course", "creek", "current", "drift", "flood", "flow", "freshet", "race", "rill", "rindle", "rivulet", "run", "runnel", "rush", "spate", "spritz", "surge", "tide", "torrent", "tributary", "watercourse"], "tags": {"waterway": "stream"}, "name": "Stream"},
     "waterway/water_point": {"icon": "maki-drinking-water", "geometry": ["area", "vertex", "point"], "tags": {"waterway": "water_point"}, "name": "Marine Drinking Water"},
-    "waterway/waterfall": {"icon": "maki-water", "fields": ["name", "height", "width", "intermittent"], "geometry": ["vertex"], "terms": ["fall"], "tags": {"waterway": "waterfall"}, "name": "Waterfall"},
+    "waterway/waterfall": {"icon": "maki-waterfall", "fields": ["name", "height", "width", "intermittent"], "geometry": ["vertex"], "terms": ["fall"], "tags": {"waterway": "waterfall"}, "name": "Waterfall"},
     "waterway/weir": {"icon": "maki-dam", "geometry": ["vertex", "line"], "tags": {"waterway": "weir"}, "name": "Weir"},
     "amenity/arts_centre/Świetlica wiejska": {"tags": {"name": "Świetlica wiejska", "amenity": "arts_centre"}, "name": "Świetlica wiejska", "icon": "maki-theatre", "geometry": ["point", "area"], "fields": ["name", "address", "building_area", "opening_hours"], "suggestion": true},
     "amenity/arts_centre/Дом культуры": {"tags": {"name": "Дом культуры", "amenity": "arts_centre"}, "name": "Дом культуры", "icon": "maki-theatre", "geometry": ["point", "area"], "fields": ["name", "address", "building_area", "opening_hours"], "suggestion": true},
@@ -1593,21 +1617,21 @@
     "amenity/cafe/ドトールコーヒーショップ": {"tags": {"name": "ドトールコーヒーショップ", "name:en": "Doutor", "amenity": "cafe"}, "name": "ドトールコーヒーショップ", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
     "amenity/cafe/星巴克": {"tags": {"name": "星巴克", "amenity": "cafe"}, "name": "星巴克", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
     "amenity/cafe/스타벅스": {"tags": {"name": "스타벅스", "amenity": "cafe"}, "name": "스타벅스", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
-    "amenity/car_rental/Alamo": {"tags": {"name": "Alamo", "amenity": "car_rental"}, "name": "Alamo", "icon": "maki-car", "geometry": ["point", "area"], "fields": ["name", "operator", "payment_multi"], "suggestion": true},
-    "amenity/car_rental/Avis": {"tags": {"name": "Avis", "amenity": "car_rental"}, "name": "Avis", "icon": "maki-car", "geometry": ["point", "area"], "fields": ["name", "operator", "payment_multi"], "suggestion": true},
-    "amenity/car_rental/Budget": {"tags": {"name": "Budget", "amenity": "car_rental"}, "name": "Budget", "icon": "maki-car", "geometry": ["point", "area"], "fields": ["name", "operator", "payment_multi"], "suggestion": true},
-    "amenity/car_rental/Enterprise": {"tags": {"name": "Enterprise", "amenity": "car_rental"}, "name": "Enterprise", "icon": "maki-car", "geometry": ["point", "area"], "fields": ["name", "operator", "payment_multi"], "suggestion": true},
-    "amenity/car_rental/Enterprise Rent-a-Car": {"tags": {"name": "Enterprise Rent-a-Car", "amenity": "car_rental"}, "name": "Enterprise Rent-a-Car", "icon": "maki-car", "geometry": ["point", "area"], "fields": ["name", "operator", "payment_multi"], "suggestion": true},
-    "amenity/car_rental/Europcar": {"tags": {"name": "Europcar", "amenity": "car_rental"}, "name": "Europcar", "icon": "maki-car", "geometry": ["point", "area"], "fields": ["name", "operator", "payment_multi"], "suggestion": true},
-    "amenity/car_rental/Hertz": {"tags": {"name": "Hertz", "amenity": "car_rental"}, "name": "Hertz", "icon": "maki-car", "geometry": ["point", "area"], "fields": ["name", "operator", "payment_multi"], "suggestion": true},
-    "amenity/car_rental/Localiza": {"tags": {"name": "Localiza", "amenity": "car_rental"}, "name": "Localiza", "icon": "maki-car", "geometry": ["point", "area"], "fields": ["name", "operator", "payment_multi"], "suggestion": true},
-    "amenity/car_rental/Sixt": {"tags": {"name": "Sixt", "amenity": "car_rental"}, "name": "Sixt", "icon": "maki-car", "geometry": ["point", "area"], "fields": ["name", "operator", "payment_multi"], "suggestion": true},
-    "amenity/car_rental/Thrifty": {"tags": {"name": "Thrifty", "amenity": "car_rental"}, "name": "Thrifty", "icon": "maki-car", "geometry": ["point", "area"], "fields": ["name", "operator", "payment_multi"], "suggestion": true},
-    "amenity/car_rental/U-Haul": {"tags": {"name": "U-Haul", "amenity": "car_rental"}, "name": "U-Haul", "icon": "maki-car", "geometry": ["point", "area"], "fields": ["name", "operator", "payment_multi"], "suggestion": true},
-    "amenity/car_rental/オリックスレンタカー": {"tags": {"name": "オリックスレンタカー", "amenity": "car_rental"}, "name": "オリックスレンタカー", "icon": "maki-car", "geometry": ["point", "area"], "fields": ["name", "operator", "payment_multi"], "suggestion": true},
-    "amenity/car_rental/トヨタレンタカー": {"tags": {"name": "トヨタレンタカー", "amenity": "car_rental"}, "name": "トヨタレンタカー", "icon": "maki-car", "geometry": ["point", "area"], "fields": ["name", "operator", "payment_multi"], "suggestion": true},
-    "amenity/car_rental/トヨタレンタリース": {"tags": {"name": "トヨタレンタリース", "amenity": "car_rental"}, "name": "トヨタレンタリース", "icon": "maki-car", "geometry": ["point", "area"], "fields": ["name", "operator", "payment_multi"], "suggestion": true},
-    "amenity/car_rental/ニッポンレンタカー": {"tags": {"name": "ニッポンレンタカー", "amenity": "car_rental"}, "name": "ニッポンレンタカー", "icon": "maki-car", "geometry": ["point", "area"], "fields": ["name", "operator", "payment_multi"], "suggestion": true},
+    "amenity/car_rental/Alamo": {"tags": {"name": "Alamo", "amenity": "car_rental"}, "name": "Alamo", "icon": "maki-car-rental", "geometry": ["point", "area"], "fields": ["name", "operator", "payment_multi"], "suggestion": true},
+    "amenity/car_rental/Avis": {"tags": {"name": "Avis", "amenity": "car_rental"}, "name": "Avis", "icon": "maki-car-rental", "geometry": ["point", "area"], "fields": ["name", "operator", "payment_multi"], "suggestion": true},
+    "amenity/car_rental/Budget": {"tags": {"name": "Budget", "amenity": "car_rental"}, "name": "Budget", "icon": "maki-car-rental", "geometry": ["point", "area"], "fields": ["name", "operator", "payment_multi"], "suggestion": true},
+    "amenity/car_rental/Enterprise": {"tags": {"name": "Enterprise", "amenity": "car_rental"}, "name": "Enterprise", "icon": "maki-car-rental", "geometry": ["point", "area"], "fields": ["name", "operator", "payment_multi"], "suggestion": true},
+    "amenity/car_rental/Enterprise Rent-a-Car": {"tags": {"name": "Enterprise Rent-a-Car", "amenity": "car_rental"}, "name": "Enterprise Rent-a-Car", "icon": "maki-car-rental", "geometry": ["point", "area"], "fields": ["name", "operator", "payment_multi"], "suggestion": true},
+    "amenity/car_rental/Europcar": {"tags": {"name": "Europcar", "amenity": "car_rental"}, "name": "Europcar", "icon": "maki-car-rental", "geometry": ["point", "area"], "fields": ["name", "operator", "payment_multi"], "suggestion": true},
+    "amenity/car_rental/Hertz": {"tags": {"name": "Hertz", "amenity": "car_rental"}, "name": "Hertz", "icon": "maki-car-rental", "geometry": ["point", "area"], "fields": ["name", "operator", "payment_multi"], "suggestion": true},
+    "amenity/car_rental/Localiza": {"tags": {"name": "Localiza", "amenity": "car_rental"}, "name": "Localiza", "icon": "maki-car-rental", "geometry": ["point", "area"], "fields": ["name", "operator", "payment_multi"], "suggestion": true},
+    "amenity/car_rental/Sixt": {"tags": {"name": "Sixt", "amenity": "car_rental"}, "name": "Sixt", "icon": "maki-car-rental", "geometry": ["point", "area"], "fields": ["name", "operator", "payment_multi"], "suggestion": true},
+    "amenity/car_rental/Thrifty": {"tags": {"name": "Thrifty", "amenity": "car_rental"}, "name": "Thrifty", "icon": "maki-car-rental", "geometry": ["point", "area"], "fields": ["name", "operator", "payment_multi"], "suggestion": true},
+    "amenity/car_rental/U-Haul": {"tags": {"name": "U-Haul", "amenity": "car_rental"}, "name": "U-Haul", "icon": "maki-car-rental", "geometry": ["point", "area"], "fields": ["name", "operator", "payment_multi"], "suggestion": true},
+    "amenity/car_rental/オリックスレンタカー": {"tags": {"name": "オリックスレンタカー", "amenity": "car_rental"}, "name": "オリックスレンタカー", "icon": "maki-car-rental", "geometry": ["point", "area"], "fields": ["name", "operator", "payment_multi"], "suggestion": true},
+    "amenity/car_rental/トヨタレンタカー": {"tags": {"name": "トヨタレンタカー", "amenity": "car_rental"}, "name": "トヨタレンタカー", "icon": "maki-car-rental", "geometry": ["point", "area"], "fields": ["name", "operator", "payment_multi"], "suggestion": true},
+    "amenity/car_rental/トヨタレンタリース": {"tags": {"name": "トヨタレンタリース", "amenity": "car_rental"}, "name": "トヨタレンタリース", "icon": "maki-car-rental", "geometry": ["point", "area"], "fields": ["name", "operator", "payment_multi"], "suggestion": true},
+    "amenity/car_rental/ニッポンレンタカー": {"tags": {"name": "ニッポンレンタカー", "amenity": "car_rental"}, "name": "ニッポンレンタカー", "icon": "maki-car-rental", "geometry": ["point", "area"], "fields": ["name", "operator", "payment_multi"], "suggestion": true},
     "amenity/car_wash/Autolavaggio": {"tags": {"name": "Autolavaggio", "amenity": "car_wash"}, "name": "Autolavaggio", "icon": "maki-car", "geometry": ["point", "area"], "fields": ["address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
     "amenity/car_wash/H-E-B Car Wash": {"tags": {"name": "H-E-B Car Wash", "amenity": "car_wash"}, "name": "H-E-B Car Wash", "icon": "maki-car", "geometry": ["point", "area"], "fields": ["address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
     "amenity/car_wash/Lavage Auto": {"tags": {"name": "Lavage Auto", "amenity": "car_wash"}, "name": "Lavage Auto", "icon": "maki-car", "geometry": ["point", "area"], "fields": ["address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
@@ -2846,7 +2870,7 @@
     "leisure/swimming_pool/Yüzme Havuzu": {"tags": {"name": "Yüzme Havuzu", "leisure": "swimming_pool"}, "name": "Yüzme Havuzu", "icon": "maki-swimming", "geometry": ["point", "area"], "fields": ["name", "access_simple", "operator", "address", "lit", "location_pool", "length", "swimming_pool"], "suggestion": true},
     "leisure/swimming_pool/プール": {"tags": {"name": "プール", "leisure": "swimming_pool"}, "name": "プール", "icon": "maki-swimming", "geometry": ["point", "area"], "fields": ["name", "access_simple", "operator", "address", "lit", "location_pool", "length", "swimming_pool"], "suggestion": true},
     "leisure/swimming_pool/游泳池": {"tags": {"name": "游泳池", "leisure": "swimming_pool"}, "name": "游泳池", "icon": "maki-swimming", "geometry": ["point", "area"], "fields": ["name", "access_simple", "operator", "address", "lit", "location_pool", "length", "swimming_pool"], "suggestion": true},
-    "man_made/windmill/De Hoop": {"tags": {"name": "De Hoop", "man_made": "windmill"}, "name": "De Hoop", "icon": "temaki-windmill", "geometry": ["point", "area"], "fields": ["building_area"], "suggestion": true},
+    "man_made/windmill/De Hoop": {"tags": {"name": "De Hoop", "man_made": "windmill"}, "name": "De Hoop", "icon": "maki-windmill", "geometry": ["point", "area"], "fields": ["building_area"], "suggestion": true},
     "shop/alcohol/Alko": {"tags": {"name": "Alko", "shop": "alcohol"}, "name": "Alko", "icon": "maki-alcohol-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi", "drive_through"], "suggestion": true},
     "shop/alcohol/BC Liquor Store": {"tags": {"name": "BC Liquor Store", "shop": "alcohol"}, "name": "BC Liquor Store", "icon": "maki-alcohol-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi", "drive_through"], "suggestion": true},
     "shop/alcohol/BWS": {"tags": {"name": "BWS", "shop": "alcohol"}, "name": "BWS", "icon": "maki-alcohol-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi", "drive_through"], "suggestion": true},
@@ -3024,46 +3048,46 @@
     "shop/car_parts/イエローハット": {"tags": {"name": "イエローハット", "shop": "car_parts"}, "name": "イエローハット", "icon": "maki-car", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
     "shop/car_parts/オートバックス": {"tags": {"name": "オートバックス", "shop": "car_parts"}, "name": "オートバックス", "icon": "maki-car", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
     "shop/car_parts/タイヤ館": {"tags": {"name": "タイヤ館", "shop": "car_parts"}, "name": "タイヤ館", "icon": "maki-car", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/car_repair/A.T.U": {"tags": {"name": "A.T.U", "shop": "car_repair"}, "name": "A.T.U", "icon": "maki-car", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/car_repair/Bosch Car Service": {"tags": {"name": "Bosch Car Service", "shop": "car_repair"}, "name": "Bosch Car Service", "icon": "maki-car", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/car_repair/Carglass": {"tags": {"name": "Carglass", "shop": "car_repair"}, "name": "Carglass", "icon": "maki-car", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/car_repair/Euromaster": {"tags": {"name": "Euromaster", "shop": "car_repair"}, "name": "Euromaster", "icon": "maki-car", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/car_repair/Feu Vert": {"tags": {"name": "Feu Vert", "shop": "car_repair"}, "name": "Feu Vert", "icon": "maki-car", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/car_repair/Firestone": {"tags": {"name": "Firestone", "shop": "car_repair"}, "name": "Firestone", "icon": "maki-car", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/car_repair/Firestone Complete Auto Care": {"tags": {"name": "Firestone Complete Auto Care", "shop": "car_repair"}, "name": "Firestone Complete Auto Care", "icon": "maki-car", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/car_repair/Garage Renault": {"tags": {"name": "Garage Renault", "shop": "car_repair"}, "name": "Garage Renault", "icon": "maki-car", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/car_repair/Gomeria": {"tags": {"name": "Gomeria", "shop": "car_repair"}, "name": "Gomeria", "icon": "maki-car", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/car_repair/Gomería": {"tags": {"name": "Gomería", "shop": "car_repair"}, "name": "Gomería", "icon": "maki-car", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/car_repair/Goodyear": {"tags": {"name": "Goodyear", "shop": "car_repair"}, "name": "Goodyear", "icon": "maki-car", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/car_repair/Grease Monkey": {"tags": {"name": "Grease Monkey", "shop": "car_repair"}, "name": "Grease Monkey", "icon": "maki-car", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/car_repair/Jiffy Lube": {"tags": {"name": "Jiffy Lube", "shop": "car_repair"}, "name": "Jiffy Lube", "icon": "maki-car", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/car_repair/Kwik Fit": {"tags": {"name": "Kwik Fit", "shop": "car_repair"}, "name": "Kwik Fit", "icon": "maki-car", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/car_repair/Lubricentro": {"tags": {"name": "Lubricentro", "shop": "car_repair"}, "name": "Lubricentro", "icon": "maki-car", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/car_repair/Meineke": {"tags": {"name": "Meineke", "shop": "car_repair"}, "name": "Meineke", "icon": "maki-car", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/car_repair/Mekonomen": {"tags": {"name": "Mekonomen", "shop": "car_repair"}, "name": "Mekonomen", "icon": "maki-car", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/car_repair/Midas": {"tags": {"name": "Midas", "shop": "car_repair"}, "name": "Midas", "icon": "maki-car", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/car_repair/Mr. Lube": {"tags": {"name": "Mr. Lube", "shop": "car_repair"}, "name": "Mr. Lube", "icon": "maki-car", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/car_repair/Norauto": {"tags": {"name": "Norauto", "shop": "car_repair"}, "name": "Norauto", "icon": "maki-car", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/car_repair/Pep Boys": {"tags": {"name": "Pep Boys", "shop": "car_repair"}, "name": "Pep Boys", "icon": "maki-car", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/car_repair/Pit Stop": {"tags": {"name": "Pit Stop", "shop": "car_repair"}, "name": "Pit Stop", "icon": "maki-car", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/car_repair/Point S": {"tags": {"name": "Point S", "shop": "car_repair"}, "name": "Point S", "icon": "maki-car", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/car_repair/Roady": {"tags": {"name": "Roady", "shop": "car_repair"}, "name": "Roady", "icon": "maki-car", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/car_repair/Sears Auto Center": {"tags": {"name": "Sears Auto Center", "shop": "car_repair"}, "name": "Sears Auto Center", "icon": "maki-car", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/car_repair/Speedy": {"tags": {"name": "Speedy", "shop": "car_repair"}, "name": "Speedy", "icon": "maki-car", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/car_repair/Stacja Kontroli Pojazdów": {"tags": {"name": "Stacja Kontroli Pojazdów", "shop": "car_repair"}, "name": "Stacja Kontroli Pojazdów", "icon": "maki-car", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/car_repair/Taller": {"tags": {"name": "Taller", "shop": "car_repair"}, "name": "Taller", "icon": "maki-car", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/car_repair/Valvoline": {"tags": {"name": "Valvoline", "shop": "car_repair"}, "name": "Valvoline", "icon": "maki-car", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/car_repair/Valvoline Instant Oil Change": {"tags": {"name": "Valvoline Instant Oil Change", "shop": "car_repair"}, "name": "Valvoline Instant Oil Change", "icon": "maki-car", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/car_repair/Wulkanizacja": {"tags": {"name": "Wulkanizacja", "shop": "car_repair"}, "name": "Wulkanizacja", "icon": "maki-car", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/car_repair/ÖAMTC": {"tags": {"name": "ÖAMTC", "shop": "car_repair"}, "name": "ÖAMTC", "icon": "maki-car", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/car_repair/Автомастерская": {"tags": {"name": "Автомастерская", "shop": "car_repair"}, "name": "Автомастерская", "icon": "maki-car", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/car_repair/Авторемонт": {"tags": {"name": "Авторемонт", "shop": "car_repair"}, "name": "Авторемонт", "icon": "maki-car", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/car_repair/Автосервис": {"tags": {"name": "Автосервис", "shop": "car_repair"}, "name": "Автосервис", "icon": "maki-car", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/car_repair/Автосервис+шиномонтаж": {"tags": {"name": "Автосервис+шиномонтаж", "shop": "car_repair"}, "name": "Автосервис+шиномонтаж", "icon": "maki-car", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/car_repair/Замена масла": {"tags": {"name": "Замена масла", "shop": "car_repair"}, "name": "Замена масла", "icon": "maki-car", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/car_repair/СТО": {"tags": {"name": "СТО", "shop": "car_repair"}, "name": "СТО", "icon": "maki-car", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/car_repair/Шиномонтаж": {"tags": {"name": "Шиномонтаж", "shop": "car_repair"}, "name": "Шиномонтаж", "icon": "maki-car", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/car_repair/шиномонтаж": {"tags": {"name": "шиномонтаж", "shop": "car_repair"}, "name": "шиномонтаж", "icon": "maki-car", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/car_repair/A.T.U": {"tags": {"name": "A.T.U", "shop": "car_repair"}, "name": "A.T.U", "icon": "maki-car-repair", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/car_repair/Bosch Car Service": {"tags": {"name": "Bosch Car Service", "shop": "car_repair"}, "name": "Bosch Car Service", "icon": "maki-car-repair", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/car_repair/Carglass": {"tags": {"name": "Carglass", "shop": "car_repair"}, "name": "Carglass", "icon": "maki-car-repair", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/car_repair/Euromaster": {"tags": {"name": "Euromaster", "shop": "car_repair"}, "name": "Euromaster", "icon": "maki-car-repair", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/car_repair/Feu Vert": {"tags": {"name": "Feu Vert", "shop": "car_repair"}, "name": "Feu Vert", "icon": "maki-car-repair", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/car_repair/Firestone": {"tags": {"name": "Firestone", "shop": "car_repair"}, "name": "Firestone", "icon": "maki-car-repair", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/car_repair/Firestone Complete Auto Care": {"tags": {"name": "Firestone Complete Auto Care", "shop": "car_repair"}, "name": "Firestone Complete Auto Care", "icon": "maki-car-repair", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/car_repair/Garage Renault": {"tags": {"name": "Garage Renault", "shop": "car_repair"}, "name": "Garage Renault", "icon": "maki-car-repair", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/car_repair/Gomeria": {"tags": {"name": "Gomeria", "shop": "car_repair"}, "name": "Gomeria", "icon": "maki-car-repair", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/car_repair/Gomería": {"tags": {"name": "Gomería", "shop": "car_repair"}, "name": "Gomería", "icon": "maki-car-repair", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/car_repair/Goodyear": {"tags": {"name": "Goodyear", "shop": "car_repair"}, "name": "Goodyear", "icon": "maki-car-repair", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/car_repair/Grease Monkey": {"tags": {"name": "Grease Monkey", "shop": "car_repair"}, "name": "Grease Monkey", "icon": "maki-car-repair", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/car_repair/Jiffy Lube": {"tags": {"name": "Jiffy Lube", "shop": "car_repair"}, "name": "Jiffy Lube", "icon": "maki-car-repair", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/car_repair/Kwik Fit": {"tags": {"name": "Kwik Fit", "shop": "car_repair"}, "name": "Kwik Fit", "icon": "maki-car-repair", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/car_repair/Lubricentro": {"tags": {"name": "Lubricentro", "shop": "car_repair"}, "name": "Lubricentro", "icon": "maki-car-repair", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/car_repair/Meineke": {"tags": {"name": "Meineke", "shop": "car_repair"}, "name": "Meineke", "icon": "maki-car-repair", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/car_repair/Mekonomen": {"tags": {"name": "Mekonomen", "shop": "car_repair"}, "name": "Mekonomen", "icon": "maki-car-repair", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/car_repair/Midas": {"tags": {"name": "Midas", "shop": "car_repair"}, "name": "Midas", "icon": "maki-car-repair", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/car_repair/Mr. Lube": {"tags": {"name": "Mr. Lube", "shop": "car_repair"}, "name": "Mr. Lube", "icon": "maki-car-repair", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/car_repair/Norauto": {"tags": {"name": "Norauto", "shop": "car_repair"}, "name": "Norauto", "icon": "maki-car-repair", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/car_repair/Pep Boys": {"tags": {"name": "Pep Boys", "shop": "car_repair"}, "name": "Pep Boys", "icon": "maki-car-repair", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/car_repair/Pit Stop": {"tags": {"name": "Pit Stop", "shop": "car_repair"}, "name": "Pit Stop", "icon": "maki-car-repair", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/car_repair/Point S": {"tags": {"name": "Point S", "shop": "car_repair"}, "name": "Point S", "icon": "maki-car-repair", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/car_repair/Roady": {"tags": {"name": "Roady", "shop": "car_repair"}, "name": "Roady", "icon": "maki-car-repair", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/car_repair/Sears Auto Center": {"tags": {"name": "Sears Auto Center", "shop": "car_repair"}, "name": "Sears Auto Center", "icon": "maki-car-repair", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/car_repair/Speedy": {"tags": {"name": "Speedy", "shop": "car_repair"}, "name": "Speedy", "icon": "maki-car-repair", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/car_repair/Stacja Kontroli Pojazdów": {"tags": {"name": "Stacja Kontroli Pojazdów", "shop": "car_repair"}, "name": "Stacja Kontroli Pojazdów", "icon": "maki-car-repair", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/car_repair/Taller": {"tags": {"name": "Taller", "shop": "car_repair"}, "name": "Taller", "icon": "maki-car-repair", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/car_repair/Valvoline": {"tags": {"name": "Valvoline", "shop": "car_repair"}, "name": "Valvoline", "icon": "maki-car-repair", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/car_repair/Valvoline Instant Oil Change": {"tags": {"name": "Valvoline Instant Oil Change", "shop": "car_repair"}, "name": "Valvoline Instant Oil Change", "icon": "maki-car-repair", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/car_repair/Wulkanizacja": {"tags": {"name": "Wulkanizacja", "shop": "car_repair"}, "name": "Wulkanizacja", "icon": "maki-car-repair", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/car_repair/ÖAMTC": {"tags": {"name": "ÖAMTC", "shop": "car_repair"}, "name": "ÖAMTC", "icon": "maki-car-repair", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/car_repair/Автомастерская": {"tags": {"name": "Автомастерская", "shop": "car_repair"}, "name": "Автомастерская", "icon": "maki-car-repair", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/car_repair/Авторемонт": {"tags": {"name": "Авторемонт", "shop": "car_repair"}, "name": "Авторемонт", "icon": "maki-car-repair", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/car_repair/Автосервис": {"tags": {"name": "Автосервис", "shop": "car_repair"}, "name": "Автосервис", "icon": "maki-car-repair", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/car_repair/Автосервис+шиномонтаж": {"tags": {"name": "Автосервис+шиномонтаж", "shop": "car_repair"}, "name": "Автосервис+шиномонтаж", "icon": "maki-car-repair", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/car_repair/Замена масла": {"tags": {"name": "Замена масла", "shop": "car_repair"}, "name": "Замена масла", "icon": "maki-car-repair", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/car_repair/СТО": {"tags": {"name": "СТО", "shop": "car_repair"}, "name": "СТО", "icon": "maki-car-repair", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/car_repair/Шиномонтаж": {"tags": {"name": "Шиномонтаж", "shop": "car_repair"}, "name": "Шиномонтаж", "icon": "maki-car-repair", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/car_repair/шиномонтаж": {"tags": {"name": "шиномонтаж", "shop": "car_repair"}, "name": "шиномонтаж", "icon": "maki-car-repair", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "suggestion": true},
     "shop/carpet/Carpet Right": {"tags": {"name": "Carpet Right", "shop": "carpet"}, "name": "Carpet Right", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
     "shop/carpet/Carpetright": {"tags": {"name": "Carpetright", "shop": "carpet"}, "name": "Carpetright", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
     "shop/charity/Age UK": {"tags": {"name": "Age UK", "shop": "charity"}, "name": "Age UK", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "second_hand", "opening_hours", "payment_multi"], "suggestion": true},
@@ -3280,11 +3304,11 @@
     "shop/computer/DNS": {"tags": {"name": "DNS", "shop": "computer"}, "name": "DNS", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
     "shop/computer/PC World": {"tags": {"name": "PC World", "shop": "computer"}, "name": "PC World", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
     "shop/computer/ДНС": {"tags": {"name": "ДНС", "shop": "computer"}, "name": "ДНС", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/confectionery/Fagyizó": {"tags": {"name": "Fagyizó", "shop": "confectionery"}, "name": "Fagyizó", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/confectionery/Hussel": {"tags": {"name": "Hussel", "shop": "confectionery"}, "name": "Hussel", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/confectionery/Leonidas": {"tags": {"name": "Leonidas", "shop": "confectionery"}, "name": "Leonidas", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/confectionery/T. SN": {"tags": {"name": "T. SN", "shop": "confectionery"}, "name": "T. SN", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/confectionery/Thorntons": {"tags": {"name": "Thorntons", "shop": "confectionery"}, "name": "Thorntons", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/confectionery/Fagyizó": {"tags": {"name": "Fagyizó", "shop": "confectionery"}, "name": "Fagyizó", "icon": "maki-confectionary", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/confectionery/Hussel": {"tags": {"name": "Hussel", "shop": "confectionery"}, "name": "Hussel", "icon": "maki-confectionary", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/confectionery/Leonidas": {"tags": {"name": "Leonidas", "shop": "confectionery"}, "name": "Leonidas", "icon": "maki-confectionary", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/confectionery/T. SN": {"tags": {"name": "T. SN", "shop": "confectionery"}, "name": "T. SN", "icon": "maki-confectionary", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/confectionery/Thorntons": {"tags": {"name": "Thorntons", "shop": "confectionery"}, "name": "Thorntons", "icon": "maki-confectionary", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
     "shop/convenience/711": {"tags": {"name": "711", "shop": "convenience"}, "name": "711", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
     "shop/convenience/777": {"tags": {"name": "777", "shop": "convenience"}, "name": "777", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
     "shop/convenience/24 часа": {"tags": {"name": "24 часа", "shop": "convenience"}, "name": "24 часа", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
@@ -3731,20 +3755,20 @@
     "shop/houseware/Xenos": {"tags": {"name": "Xenos", "shop": "houseware"}, "name": "Xenos", "icon": "fas-blender", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
     "shop/interior_decoration/Casa": {"tags": {"name": "Casa", "shop": "interior_decoration"}, "name": "Casa", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
     "shop/interior_decoration/Depot": {"tags": {"name": "Depot", "shop": "interior_decoration"}, "name": "Depot", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/jewelry/585": {"tags": {"name": "585", "shop": "jewelry"}, "name": "585", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/jewelry/Apart": {"tags": {"name": "Apart", "shop": "jewelry"}, "name": "Apart", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/jewelry/Bijou Brigitte": {"tags": {"name": "Bijou Brigitte", "shop": "jewelry"}, "name": "Bijou Brigitte", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/jewelry/Christ": {"tags": {"name": "Christ", "shop": "jewelry"}, "name": "Christ", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/jewelry/Claire's": {"tags": {"name": "Claire's", "shop": "jewelry"}, "name": "Claire's", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/jewelry/Ernest Jones": {"tags": {"name": "Ernest Jones", "shop": "jewelry"}, "name": "Ernest Jones", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/jewelry/H Samuel": {"tags": {"name": "H Samuel", "shop": "jewelry"}, "name": "H Samuel", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/jewelry/James Avery Jewelry": {"tags": {"name": "James Avery Jewelry", "shop": "jewelry"}, "name": "James Avery Jewelry", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/jewelry/Julien d'Orcel": {"tags": {"name": "Julien d'Orcel", "shop": "jewelry"}, "name": "Julien d'Orcel", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/jewelry/Kay Jewelers": {"tags": {"name": "Kay Jewelers", "shop": "jewelry"}, "name": "Kay Jewelers", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/jewelry/Pandora": {"tags": {"name": "Pandora", "shop": "jewelry"}, "name": "Pandora", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/jewelry/Swarovski": {"tags": {"name": "Swarovski", "shop": "jewelry"}, "name": "Swarovski", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/jewelry/Адамас": {"tags": {"name": "Адамас", "shop": "jewelry"}, "name": "Адамас", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/jewelry/Золото": {"tags": {"name": "Золото", "shop": "jewelry"}, "name": "Золото", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/jewelry/585": {"tags": {"name": "585", "shop": "jewelry"}, "name": "585", "icon": "maki-jewelry-store", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/jewelry/Apart": {"tags": {"name": "Apart", "shop": "jewelry"}, "name": "Apart", "icon": "maki-jewelry-store", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/jewelry/Bijou Brigitte": {"tags": {"name": "Bijou Brigitte", "shop": "jewelry"}, "name": "Bijou Brigitte", "icon": "maki-jewelry-store", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/jewelry/Christ": {"tags": {"name": "Christ", "shop": "jewelry"}, "name": "Christ", "icon": "maki-jewelry-store", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/jewelry/Claire's": {"tags": {"name": "Claire's", "shop": "jewelry"}, "name": "Claire's", "icon": "maki-jewelry-store", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/jewelry/Ernest Jones": {"tags": {"name": "Ernest Jones", "shop": "jewelry"}, "name": "Ernest Jones", "icon": "maki-jewelry-store", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/jewelry/H Samuel": {"tags": {"name": "H Samuel", "shop": "jewelry"}, "name": "H Samuel", "icon": "maki-jewelry-store", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/jewelry/James Avery Jewelry": {"tags": {"name": "James Avery Jewelry", "shop": "jewelry"}, "name": "James Avery Jewelry", "icon": "maki-jewelry-store", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/jewelry/Julien d'Orcel": {"tags": {"name": "Julien d'Orcel", "shop": "jewelry"}, "name": "Julien d'Orcel", "icon": "maki-jewelry-store", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/jewelry/Kay Jewelers": {"tags": {"name": "Kay Jewelers", "shop": "jewelry"}, "name": "Kay Jewelers", "icon": "maki-jewelry-store", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/jewelry/Pandora": {"tags": {"name": "Pandora", "shop": "jewelry"}, "name": "Pandora", "icon": "maki-jewelry-store", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/jewelry/Swarovski": {"tags": {"name": "Swarovski", "shop": "jewelry"}, "name": "Swarovski", "icon": "maki-jewelry-store", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/jewelry/Адамас": {"tags": {"name": "Адамас", "shop": "jewelry"}, "name": "Адамас", "icon": "maki-jewelry-store", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/jewelry/Золото": {"tags": {"name": "Золото", "shop": "jewelry"}, "name": "Золото", "icon": "maki-jewelry-store", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
     "shop/kiosk/KIOS": {"tags": {"name": "KIOS", "shop": "kiosk"}, "name": "KIOS", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi", "levels"], "suggestion": true},
     "shop/kiosk/Kiosko": {"tags": {"name": "Kiosko", "shop": "kiosk"}, "name": "Kiosko", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi", "levels"], "suggestion": true},
     "shop/kiosk/Kiosque": {"tags": {"name": "Kiosque", "shop": "kiosk"}, "name": "Kiosque", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi", "levels"], "suggestion": true},
@@ -3842,29 +3866,29 @@
     "shop/newsagent/Печать": {"tags": {"name": "Печать", "shop": "newsagent"}, "name": "Печать", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
     "shop/newsagent/Роспечать": {"tags": {"name": "Роспечать", "shop": "newsagent"}, "name": "Роспечать", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
     "shop/newsagent/Союзпечать": {"tags": {"name": "Союзпечать", "shop": "newsagent"}, "name": "Союзпечать", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/optician/Alain Afflelou": {"tags": {"name": "Alain Afflelou", "shop": "optician"}, "name": "Alain Afflelou", "icon": "fas-glasses", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/optician/Apollo": {"tags": {"name": "Apollo", "shop": "optician"}, "name": "Apollo", "icon": "fas-glasses", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/optician/Atol": {"tags": {"name": "Atol", "shop": "optician"}, "name": "Atol", "icon": "fas-glasses", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/optician/Boots Opticians": {"tags": {"name": "Boots Opticians", "shop": "optician"}, "name": "Boots Opticians", "icon": "fas-glasses", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/optician/Fielmann": {"tags": {"name": "Fielmann", "shop": "optician"}, "name": "Fielmann", "icon": "fas-glasses", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/optician/General Óptica": {"tags": {"name": "General Óptica", "shop": "optician"}, "name": "General Óptica", "icon": "fas-glasses", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/optician/Grand Optical": {"tags": {"name": "Grand Optical", "shop": "optician"}, "name": "Grand Optical", "icon": "fas-glasses", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/optician/Générale d'Optique": {"tags": {"name": "Générale d'Optique", "shop": "optician"}, "name": "Générale d'Optique", "icon": "fas-glasses", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/optician/Hakim Optical": {"tags": {"name": "Hakim Optical", "shop": "optician"}, "name": "Hakim Optical", "icon": "fas-glasses", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/optician/Hans Anders": {"tags": {"name": "Hans Anders", "shop": "optician"}, "name": "Hans Anders", "icon": "fas-glasses", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/optician/Krys": {"tags": {"name": "Krys", "shop": "optician"}, "name": "Krys", "icon": "fas-glasses", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/optician/Les Opticiens Mutualistes": {"tags": {"name": "Les Opticiens Mutualistes", "shop": "optician"}, "name": "Les Opticiens Mutualistes", "icon": "fas-glasses", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/optician/Optic 2000": {"tags": {"name": "Optic 2000", "shop": "optician"}, "name": "Optic 2000", "icon": "fas-glasses", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/optician/Optical Center": {"tags": {"name": "Optical Center", "shop": "optician"}, "name": "Optical Center", "icon": "fas-glasses", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/optician/Pearle": {"tags": {"name": "Pearle", "shop": "optician"}, "name": "Pearle", "icon": "fas-glasses", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/optician/Pearle Vision": {"tags": {"name": "Pearle Vision", "shop": "optician"}, "name": "Pearle Vision", "icon": "fas-glasses", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/optician/Specsavers": {"tags": {"name": "Specsavers", "shop": "optician"}, "name": "Specsavers", "icon": "fas-glasses", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/optician/Sunglass Hut": {"tags": {"name": "Sunglass Hut", "shop": "optician"}, "name": "Sunglass Hut", "icon": "fas-glasses", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/optician/Synoptik": {"tags": {"name": "Synoptik", "shop": "optician"}, "name": "Synoptik", "icon": "fas-glasses", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/optician/Vision Express": {"tags": {"name": "Vision Express", "shop": "optician"}, "name": "Vision Express", "icon": "fas-glasses", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/optician/แว่นท็อปเจริญ": {"tags": {"name": "แว่นท็อปเจริญ", "shop": "optician"}, "name": "แว่นท็อปเจริญ", "icon": "fas-glasses", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/optician/メガネスーパー": {"tags": {"name": "メガネスーパー", "shop": "optician"}, "name": "メガネスーパー", "icon": "fas-glasses", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/optician/眼鏡市場": {"tags": {"name": "眼鏡市場", "shop": "optician"}, "name": "眼鏡市場", "icon": "fas-glasses", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/optician/Alain Afflelou": {"tags": {"name": "Alain Afflelou", "shop": "optician"}, "name": "Alain Afflelou", "icon": "maki-optician", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/optician/Apollo": {"tags": {"name": "Apollo", "shop": "optician"}, "name": "Apollo", "icon": "maki-optician", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/optician/Atol": {"tags": {"name": "Atol", "shop": "optician"}, "name": "Atol", "icon": "maki-optician", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/optician/Boots Opticians": {"tags": {"name": "Boots Opticians", "shop": "optician"}, "name": "Boots Opticians", "icon": "maki-optician", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/optician/Fielmann": {"tags": {"name": "Fielmann", "shop": "optician"}, "name": "Fielmann", "icon": "maki-optician", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/optician/General Óptica": {"tags": {"name": "General Óptica", "shop": "optician"}, "name": "General Óptica", "icon": "maki-optician", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/optician/Grand Optical": {"tags": {"name": "Grand Optical", "shop": "optician"}, "name": "Grand Optical", "icon": "maki-optician", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/optician/Générale d'Optique": {"tags": {"name": "Générale d'Optique", "shop": "optician"}, "name": "Générale d'Optique", "icon": "maki-optician", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/optician/Hakim Optical": {"tags": {"name": "Hakim Optical", "shop": "optician"}, "name": "Hakim Optical", "icon": "maki-optician", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/optician/Hans Anders": {"tags": {"name": "Hans Anders", "shop": "optician"}, "name": "Hans Anders", "icon": "maki-optician", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/optician/Krys": {"tags": {"name": "Krys", "shop": "optician"}, "name": "Krys", "icon": "maki-optician", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/optician/Les Opticiens Mutualistes": {"tags": {"name": "Les Opticiens Mutualistes", "shop": "optician"}, "name": "Les Opticiens Mutualistes", "icon": "maki-optician", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/optician/Optic 2000": {"tags": {"name": "Optic 2000", "shop": "optician"}, "name": "Optic 2000", "icon": "maki-optician", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/optician/Optical Center": {"tags": {"name": "Optical Center", "shop": "optician"}, "name": "Optical Center", "icon": "maki-optician", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/optician/Pearle": {"tags": {"name": "Pearle", "shop": "optician"}, "name": "Pearle", "icon": "maki-optician", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/optician/Pearle Vision": {"tags": {"name": "Pearle Vision", "shop": "optician"}, "name": "Pearle Vision", "icon": "maki-optician", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/optician/Specsavers": {"tags": {"name": "Specsavers", "shop": "optician"}, "name": "Specsavers", "icon": "maki-optician", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/optician/Sunglass Hut": {"tags": {"name": "Sunglass Hut", "shop": "optician"}, "name": "Sunglass Hut", "icon": "maki-optician", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/optician/Synoptik": {"tags": {"name": "Synoptik", "shop": "optician"}, "name": "Synoptik", "icon": "maki-optician", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/optician/Vision Express": {"tags": {"name": "Vision Express", "shop": "optician"}, "name": "Vision Express", "icon": "maki-optician", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/optician/แว่นท็อปเจริญ": {"tags": {"name": "แว่นท็อปเจริญ", "shop": "optician"}, "name": "แว่นท็อปเจริญ", "icon": "maki-optician", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/optician/メガネスーパー": {"tags": {"name": "メガネスーパー", "shop": "optician"}, "name": "メガネスーパー", "icon": "maki-optician", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/optician/眼鏡市場": {"tags": {"name": "眼鏡市場", "shop": "optician"}, "name": "眼鏡市場", "icon": "maki-optician", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
     "shop/outdoor/Mountain Warehouse": {"tags": {"name": "Mountain Warehouse", "shop": "outdoor"}, "name": "Mountain Warehouse", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
     "shop/outdoor/REI": {"tags": {"name": "REI", "shop": "outdoor"}, "name": "REI", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
     "shop/outdoor/Рыболов": {"tags": {"name": "Рыболов", "shop": "outdoor"}, "name": "Рыболов", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
@@ -3890,49 +3914,49 @@
     "shop/pet/Четыре лапы": {"tags": {"name": "Четыре лапы", "shop": "pet"}, "name": "Четыре лапы", "icon": "maki-dog-park", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
     "shop/second_hand/Goodwill": {"tags": {"name": "Goodwill", "shop": "second_hand"}, "name": "Goodwill", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "second_hand", "opening_hours", "payment_multi"], "suggestion": true},
     "shop/second_hand/Value Village": {"tags": {"name": "Value Village", "shop": "second_hand"}, "name": "Value Village", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "second_hand", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/shoes/Aldo": {"tags": {"name": "Aldo", "shop": "shoes"}, "name": "Aldo", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/shoes/Bata": {"tags": {"name": "Bata", "shop": "shoes"}, "name": "Bata", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/shoes/Besson Chaussures": {"tags": {"name": "Besson Chaussures", "shop": "shoes"}, "name": "Besson Chaussures", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/shoes/Brantano": {"tags": {"name": "Brantano", "shop": "shoes"}, "name": "Brantano", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/shoes/CCC": {"tags": {"name": "CCC", "shop": "shoes"}, "name": "CCC", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/shoes/Camper": {"tags": {"name": "Camper", "shop": "shoes"}, "name": "Camper", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/shoes/Chaussea": {"tags": {"name": "Chaussea", "shop": "shoes"}, "name": "Chaussea", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/shoes/Clarks": {"tags": {"name": "Clarks", "shop": "shoes"}, "name": "Clarks", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/shoes/Converse": {"tags": {"name": "Converse", "shop": "shoes"}, "name": "Converse", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/shoes/Crocs": {"tags": {"name": "Crocs", "shop": "shoes"}, "name": "Crocs", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/shoes/DSW": {"tags": {"name": "DSW", "shop": "shoes"}, "name": "DSW", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/shoes/Deichmann": {"tags": {"name": "Deichmann", "shop": "shoes"}, "name": "Deichmann", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/shoes/Dosenbach": {"tags": {"name": "Dosenbach", "shop": "shoes"}, "name": "Dosenbach", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/shoes/Ecco": {"tags": {"name": "Ecco", "shop": "shoes"}, "name": "Ecco", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/shoes/Famous Footwear": {"tags": {"name": "Famous Footwear", "shop": "shoes"}, "name": "Famous Footwear", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/shoes/Foot Locker": {"tags": {"name": "Foot Locker", "shop": "shoes"}, "name": "Foot Locker", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/shoes/Geox": {"tags": {"name": "Geox", "shop": "shoes"}, "name": "Geox", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/shoes/Kari": {"tags": {"name": "Kari", "shop": "shoes"}, "name": "Kari", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/shoes/La Halle aux Chaussures": {"tags": {"name": "La Halle aux Chaussures", "shop": "shoes"}, "name": "La Halle aux Chaussures", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/shoes/Mephisto": {"tags": {"name": "Mephisto", "shop": "shoes"}, "name": "Mephisto", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/shoes/Minelli": {"tags": {"name": "Minelli", "shop": "shoes"}, "name": "Minelli", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/shoes/New Balance": {"tags": {"name": "New Balance", "shop": "shoes"}, "name": "New Balance", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/shoes/Payless": {"tags": {"name": "Payless", "shop": "shoes"}, "name": "Payless", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/shoes/Payless Shoe Source": {"tags": {"name": "Payless Shoe Source", "shop": "shoes"}, "name": "Payless Shoe Source", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/shoes/Payless ShoeSource": {"tags": {"name": "Payless ShoeSource", "shop": "shoes"}, "name": "Payless ShoeSource", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/shoes/Quick Schuh": {"tags": {"name": "Quick Schuh", "shop": "shoes"}, "name": "Quick Schuh", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/shoes/Rack Room Shoes": {"tags": {"name": "Rack Room Shoes", "shop": "shoes"}, "name": "Rack Room Shoes", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/shoes/Reno": {"tags": {"name": "Reno", "shop": "shoes"}, "name": "Reno", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/shoes/Rieker": {"tags": {"name": "Rieker", "shop": "shoes"}, "name": "Rieker", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/shoes/Salamander": {"tags": {"name": "Salamander", "shop": "shoes"}, "name": "Salamander", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/shoes/San Marina": {"tags": {"name": "San Marina", "shop": "shoes"}, "name": "San Marina", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/shoes/Scapino": {"tags": {"name": "Scapino", "shop": "shoes"}, "name": "Scapino", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/shoes/Shoe Carnival": {"tags": {"name": "Shoe Carnival", "shop": "shoes"}, "name": "Shoe Carnival", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/shoes/Shoe Zone": {"tags": {"name": "Shoe Zone", "shop": "shoes"}, "name": "Shoe Zone", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/shoes/Siemes Schuhcenter": {"tags": {"name": "Siemes Schuhcenter", "shop": "shoes"}, "name": "Siemes Schuhcenter", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/shoes/Skechers": {"tags": {"name": "Skechers", "shop": "shoes"}, "name": "Skechers", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/shoes/Tamaris": {"tags": {"name": "Tamaris", "shop": "shoes"}, "name": "Tamaris", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/shoes/vanHaren": {"tags": {"name": "vanHaren", "shop": "shoes"}, "name": "vanHaren", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/shoes/Éram": {"tags": {"name": "Éram", "shop": "shoes"}, "name": "Éram", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/shoes/Ремонт обуви": {"tags": {"name": "Ремонт обуви", "shop": "shoes"}, "name": "Ремонт обуви", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/shoes/ЦентрОбувь": {"tags": {"name": "ЦентрОбувь", "shop": "shoes"}, "name": "ЦентрОбувь", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/shoes/Юничел": {"tags": {"name": "Юничел", "shop": "shoes"}, "name": "Юничел", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
-    "shop/shoes/東京靴流通センター": {"tags": {"name": "東京靴流通センター", "shop": "shoes"}, "name": "東京靴流通センター", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/shoes/Aldo": {"tags": {"name": "Aldo", "shop": "shoes"}, "name": "Aldo", "icon": "maki-shoe", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/shoes/Bata": {"tags": {"name": "Bata", "shop": "shoes"}, "name": "Bata", "icon": "maki-shoe", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/shoes/Besson Chaussures": {"tags": {"name": "Besson Chaussures", "shop": "shoes"}, "name": "Besson Chaussures", "icon": "maki-shoe", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/shoes/Brantano": {"tags": {"name": "Brantano", "shop": "shoes"}, "name": "Brantano", "icon": "maki-shoe", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/shoes/CCC": {"tags": {"name": "CCC", "shop": "shoes"}, "name": "CCC", "icon": "maki-shoe", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/shoes/Camper": {"tags": {"name": "Camper", "shop": "shoes"}, "name": "Camper", "icon": "maki-shoe", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/shoes/Chaussea": {"tags": {"name": "Chaussea", "shop": "shoes"}, "name": "Chaussea", "icon": "maki-shoe", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/shoes/Clarks": {"tags": {"name": "Clarks", "shop": "shoes"}, "name": "Clarks", "icon": "maki-shoe", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/shoes/Converse": {"tags": {"name": "Converse", "shop": "shoes"}, "name": "Converse", "icon": "maki-shoe", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/shoes/Crocs": {"tags": {"name": "Crocs", "shop": "shoes"}, "name": "Crocs", "icon": "maki-shoe", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/shoes/DSW": {"tags": {"name": "DSW", "shop": "shoes"}, "name": "DSW", "icon": "maki-shoe", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/shoes/Deichmann": {"tags": {"name": "Deichmann", "shop": "shoes"}, "name": "Deichmann", "icon": "maki-shoe", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/shoes/Dosenbach": {"tags": {"name": "Dosenbach", "shop": "shoes"}, "name": "Dosenbach", "icon": "maki-shoe", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/shoes/Ecco": {"tags": {"name": "Ecco", "shop": "shoes"}, "name": "Ecco", "icon": "maki-shoe", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/shoes/Famous Footwear": {"tags": {"name": "Famous Footwear", "shop": "shoes"}, "name": "Famous Footwear", "icon": "maki-shoe", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/shoes/Foot Locker": {"tags": {"name": "Foot Locker", "shop": "shoes"}, "name": "Foot Locker", "icon": "maki-shoe", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/shoes/Geox": {"tags": {"name": "Geox", "shop": "shoes"}, "name": "Geox", "icon": "maki-shoe", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/shoes/Kari": {"tags": {"name": "Kari", "shop": "shoes"}, "name": "Kari", "icon": "maki-shoe", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/shoes/La Halle aux Chaussures": {"tags": {"name": "La Halle aux Chaussures", "shop": "shoes"}, "name": "La Halle aux Chaussures", "icon": "maki-shoe", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/shoes/Mephisto": {"tags": {"name": "Mephisto", "shop": "shoes"}, "name": "Mephisto", "icon": "maki-shoe", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/shoes/Minelli": {"tags": {"name": "Minelli", "shop": "shoes"}, "name": "Minelli", "icon": "maki-shoe", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/shoes/New Balance": {"tags": {"name": "New Balance", "shop": "shoes"}, "name": "New Balance", "icon": "maki-shoe", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/shoes/Payless": {"tags": {"name": "Payless", "shop": "shoes"}, "name": "Payless", "icon": "maki-shoe", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/shoes/Payless Shoe Source": {"tags": {"name": "Payless Shoe Source", "shop": "shoes"}, "name": "Payless Shoe Source", "icon": "maki-shoe", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/shoes/Payless ShoeSource": {"tags": {"name": "Payless ShoeSource", "shop": "shoes"}, "name": "Payless ShoeSource", "icon": "maki-shoe", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/shoes/Quick Schuh": {"tags": {"name": "Quick Schuh", "shop": "shoes"}, "name": "Quick Schuh", "icon": "maki-shoe", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/shoes/Rack Room Shoes": {"tags": {"name": "Rack Room Shoes", "shop": "shoes"}, "name": "Rack Room Shoes", "icon": "maki-shoe", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/shoes/Reno": {"tags": {"name": "Reno", "shop": "shoes"}, "name": "Reno", "icon": "maki-shoe", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/shoes/Rieker": {"tags": {"name": "Rieker", "shop": "shoes"}, "name": "Rieker", "icon": "maki-shoe", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/shoes/Salamander": {"tags": {"name": "Salamander", "shop": "shoes"}, "name": "Salamander", "icon": "maki-shoe", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/shoes/San Marina": {"tags": {"name": "San Marina", "shop": "shoes"}, "name": "San Marina", "icon": "maki-shoe", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/shoes/Scapino": {"tags": {"name": "Scapino", "shop": "shoes"}, "name": "Scapino", "icon": "maki-shoe", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/shoes/Shoe Carnival": {"tags": {"name": "Shoe Carnival", "shop": "shoes"}, "name": "Shoe Carnival", "icon": "maki-shoe", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/shoes/Shoe Zone": {"tags": {"name": "Shoe Zone", "shop": "shoes"}, "name": "Shoe Zone", "icon": "maki-shoe", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/shoes/Siemes Schuhcenter": {"tags": {"name": "Siemes Schuhcenter", "shop": "shoes"}, "name": "Siemes Schuhcenter", "icon": "maki-shoe", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/shoes/Skechers": {"tags": {"name": "Skechers", "shop": "shoes"}, "name": "Skechers", "icon": "maki-shoe", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/shoes/Tamaris": {"tags": {"name": "Tamaris", "shop": "shoes"}, "name": "Tamaris", "icon": "maki-shoe", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/shoes/vanHaren": {"tags": {"name": "vanHaren", "shop": "shoes"}, "name": "vanHaren", "icon": "maki-shoe", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/shoes/Éram": {"tags": {"name": "Éram", "shop": "shoes"}, "name": "Éram", "icon": "maki-shoe", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/shoes/Ремонт обуви": {"tags": {"name": "Ремонт обуви", "shop": "shoes"}, "name": "Ремонт обуви", "icon": "maki-shoe", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/shoes/ЦентрОбувь": {"tags": {"name": "ЦентрОбувь", "shop": "shoes"}, "name": "ЦентрОбувь", "icon": "maki-shoe", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/shoes/Юничел": {"tags": {"name": "Юничел", "shop": "shoes"}, "name": "Юничел", "icon": "maki-shoe", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
+    "shop/shoes/東京靴流通センター": {"tags": {"name": "東京靴流通センター", "shop": "shoes"}, "name": "東京靴流通センター", "icon": "maki-shoe", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
     "shop/sports/Aktiesport": {"tags": {"name": "Aktiesport", "shop": "sports"}, "name": "Aktiesport", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
     "shop/sports/Big 5 Sporting Goods": {"tags": {"name": "Big 5 Sporting Goods", "shop": "sports"}, "name": "Big 5 Sporting Goods", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},
     "shop/sports/Decathlon": {"tags": {"name": "Decathlon", "shop": "sports"}, "name": "Decathlon", "icon": "maki-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "suggestion": true},

data/presets/presets/amenity/car_rental.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-car",
+    "icon": "maki-car-rental",
     "fields": [
         "name",
         "operator",

data/presets/presets/amenity/casino.json

@@ -1,5 +1,5 @@
 {
-    "icon": "temaki-dice",
+    "icon": "maki-casino",
     "fields": [
         "name",
         "operator",

data/presets/presets/amenity/fast_food/burger.json

@@ -0,0 +1,40 @@
+{
+    "icon": "maki-fast-food",
+    "fields": [
+        "name",
+        "cuisine",
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours",
+        "takeaway",
+        "delivery",
+        "drive_through",
+        "smoking",
+        "outdoor_seating"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "breakfast",
+        "dine",
+        "dining",
+        "dinner",
+        "drive-in",
+        "eat",
+        "grill",
+        "lunch",
+        "table"
+    ],
+    "tags": {
+        "amenity": "fast_food",
+        "cuisine": "burger"
+    },
+    "reference": {
+        "key": "cuisine",
+        "value": "burger"
+    },
+    "name": "Burger Shop"
+}

data/presets/presets/amenity/fast_food/chicken.json

@@ -0,0 +1,41 @@
+{
+    "icon": "fas-drumstick-bite",
+    "fields": [
+        "name",
+        "cuisine",
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours",
+        "takeaway",
+        "delivery",
+        "drive_through",
+        "smoking",
+        "outdoor_seating"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "breakfast",
+        "canteen",
+        "dine",
+        "dining",
+        "dinner",
+        "drive-in",
+        "eat",
+        "grill",
+        "lunch",
+        "table"
+    ],
+    "tags": {
+        "amenity": "fast_food",
+        "cuisine": "chicken"
+    },
+    "reference": {
+        "key": "cuisine",
+        "value": "chicken"
+    },
+    "name": "Chicken Shop"
+}

data/presets/presets/amenity/fast_food/fish_and_chips.json

@@ -0,0 +1,43 @@
+{
+    "icon": "fas-fish",
+    "fields": [
+        "name",
+        "cuisine",
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours",
+        "takeaway",
+        "delivery",
+        "drive_through",
+        "smoking",
+        "outdoor_seating"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "breakfast",
+        "cafe",
+        "café",
+        "dine",
+        "dining",
+        "dinner",
+        "drive-in",
+        "eat",
+        "grill",
+        "lunch",
+        "table",
+        "french fries"
+    ],
+    "tags": {
+        "amenity": "fast_food",
+        "cuisine": "fish_and_chips"
+    },
+    "reference": {
+        "key": "cuisine",
+        "value": "fish_and_chips"
+    },
+    "name": "Fish & Chips Shop"
+}

data/presets/presets/amenity/fast_food/kebab.json

@@ -0,0 +1,44 @@
+{
+    "icon": "maki-restaurant",
+    "fields": [
+        "name",
+        "cuisine",
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours",
+        "takeaway",
+        "delivery",
+        "drive_through",
+        "smoking",
+        "outdoor_seating"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "bar",
+        "breakfast",
+        "cafe",
+        "café",
+        "canteen",
+        "dine",
+        "dining",
+        "dinner",
+        "drive-in",
+        "eat",
+        "grill",
+        "lunch",
+        "table"
+    ],
+    "tags": {
+        "amenity": "fast_food",
+        "cuisine": "kebab"
+    },
+    "reference": {
+        "key": "cuisine",
+        "value": "kebab"
+    },
+    "name": "Kebab Shop"
+}

data/presets/presets/amenity/fast_food/pizza.json

@@ -0,0 +1,41 @@
+{
+    "icon": "maki-restaurant-pizza",
+    "fields": [
+        "name",
+        "cuisine",
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours",
+        "takeaway",
+        "delivery",
+        "drive_through",
+        "smoking",
+        "outdoor_seating"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "dine",
+        "dining",
+        "dinner",
+        "drive-in",
+        "eat",
+        "lunch",
+        "table",
+        "deep dish",
+        "thin crust",
+        "slice"
+    ],
+    "tags": {
+        "amenity": "fast_food",
+        "cuisine": "pizza"
+    },
+    "reference": {
+        "key": "cuisine",
+        "value": "pizza"
+    },
+    "name": "Pizza Shop"
+}

data/presets/presets/amenity/fast_food/sandwich.json

@@ -0,0 +1,42 @@
+{
+    "icon": "maki-restaurant",
+    "fields": [
+        "name",
+        "cuisine",
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours",
+        "takeaway",
+        "delivery",
+        "drive_through",
+        "smoking",
+        "outdoor_seating"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "breakfast",
+        "cafe",
+        "café",
+        "dine",
+        "dining",
+        "dinner",
+        "drive-in",
+        "eat",
+        "grill",
+        "lunch",
+        "table"
+    ],
+    "tags": {
+        "amenity": "fast_food",
+        "cuisine": "sandwich"
+    },
+    "reference": {
+        "key": "cuisine",
+        "value": "sandwich"
+    },
+    "name": "Sandwich Shop"
+}

data/presets/presets/amenity/restaurant/american.json

@@ -0,0 +1,44 @@
+{
+    "icon": "maki-restaurant",
+    "fields": [
+        "name",
+        "cuisine",
+        "address",
+        "building_area",
+        "opening_hours",
+        "capacity",
+        "takeaway",
+        "delivery",
+        "smoking",
+        "outdoor_seating"
+    ],
+    "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"
+}

data/presets/presets/amenity/restaurant/asian.json

@@ -0,0 +1,43 @@
+{
+    "icon": "maki-restaurant-noodle",
+    "fields": [
+        "name",
+        "cuisine",
+        "address",
+        "building_area",
+        "opening_hours",
+        "capacity",
+        "takeaway",
+        "delivery",
+        "smoking",
+        "outdoor_seating"
+    ],
+    "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"
+}

data/presets/presets/amenity/restaurant/chinese.json

@@ -0,0 +1,43 @@
+{
+    "icon": "maki-restaurant-noodle",
+    "fields": [
+        "name",
+        "cuisine",
+        "address",
+        "building_area",
+        "opening_hours",
+        "capacity",
+        "takeaway",
+        "delivery",
+        "smoking",
+        "outdoor_seating"
+    ],
+    "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"
+}

data/presets/presets/amenity/restaurant/french.json

@@ -0,0 +1,43 @@
+{
+    "icon": "maki-restaurant",
+    "fields": [
+        "name",
+        "cuisine",
+        "address",
+        "building_area",
+        "opening_hours",
+        "capacity",
+        "takeaway",
+        "delivery",
+        "smoking",
+        "outdoor_seating"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "bar",
+        "breakfast",
+        "cafe",
+        "café",
+        "canteen",
+        "dine",
+        "dining",
+        "dinner",
+        "drive-in",
+        "eat",
+        "grill",
+        "lunch",
+        "table"
+    ],
+    "tags": {
+        "amenity": "restaurant",
+        "cuisine": "french"
+    },
+    "reference": {
+        "key": "cuisine",
+        "value": "french"
+    },
+    "name": "French Restaurant"
+}

data/presets/presets/amenity/restaurant/german.json

@@ -0,0 +1,43 @@
+{
+    "icon": "maki-restaurant",
+    "fields": [
+        "name",
+        "cuisine",
+        "address",
+        "building_area",
+        "opening_hours",
+        "capacity",
+        "takeaway",
+        "delivery",
+        "smoking",
+        "outdoor_seating"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "bar",
+        "breakfast",
+        "cafe",
+        "café",
+        "canteen",
+        "dine",
+        "dining",
+        "dinner",
+        "drive-in",
+        "eat",
+        "grill",
+        "lunch",
+        "table"
+    ],
+    "tags": {
+        "amenity": "restaurant",
+        "cuisine": "german"
+    },
+    "reference": {
+        "key": "cuisine",
+        "value": "german"
+    },
+    "name": "German Restaurant"
+}

data/presets/presets/amenity/restaurant/greek.json

@@ -0,0 +1,46 @@
+{
+    "icon": "maki-restaurant",
+    "fields": [
+        "name",
+        "cuisine",
+        "address",
+        "building_area",
+        "opening_hours",
+        "capacity",
+        "takeaway",
+        "delivery",
+        "smoking",
+        "outdoor_seating"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "bar",
+        "breakfast",
+        "cafe",
+        "café",
+        "canteen",
+        "dine",
+        "dining",
+        "dinner",
+        "drive-in",
+        "eat",
+        "grill",
+        "lunch",
+        "table",
+        "gyros",
+        "pitas",
+        "olives"
+    ],
+    "tags": {
+        "amenity": "restaurant",
+        "cuisine": "greek"
+    },
+    "reference": {
+        "key": "cuisine",
+        "value": "greek"
+    },
+    "name": "Greek Restaurant"
+}

data/presets/presets/amenity/restaurant/indian.json

@@ -0,0 +1,41 @@
+{
+    "icon": "maki-restaurant",
+    "fields": [
+        "name",
+        "cuisine",
+        "address",
+        "building_area",
+        "opening_hours",
+        "capacity",
+        "takeaway",
+        "delivery",
+        "smoking",
+        "outdoor_seating"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "bar",
+        "breakfast",
+        "dine",
+        "dining",
+        "dinner",
+        "drive-in",
+        "eat",
+        "grill",
+        "lunch",
+        "table",
+        "curry"
+    ],
+    "tags": {
+        "amenity": "restaurant",
+        "cuisine": "indian"
+    },
+    "reference": {
+        "key": "cuisine",
+        "value": "indian"
+    },
+    "name": "Indian Restaurant"
+}

data/presets/presets/amenity/restaurant/italian.json

@@ -0,0 +1,45 @@
+{
+    "icon": "maki-restaurant",
+    "fields": [
+        "name",
+        "cuisine",
+        "address",
+        "building_area",
+        "opening_hours",
+        "capacity",
+        "takeaway",
+        "delivery",
+        "smoking",
+        "outdoor_seating"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "bar",
+        "breakfast",
+        "cafe",
+        "café",
+        "canteen",
+        "dine",
+        "dining",
+        "dinner",
+        "drive-in",
+        "eat",
+        "grill",
+        "lunch",
+        "table",
+        "pasta",
+        "pizza"
+    ],
+    "tags": {
+        "amenity": "restaurant",
+        "cuisine": "italian"
+    },
+    "reference": {
+        "key": "cuisine",
+        "value": "italian"
+    },
+    "name": "Italian Restaurant"
+}

data/presets/presets/amenity/restaurant/japanese.json

@@ -0,0 +1,43 @@
+{
+    "icon": "maki-restaurant-noodle",
+    "fields": [
+        "name",
+        "cuisine",
+        "address",
+        "building_area",
+        "opening_hours",
+        "capacity",
+        "takeaway",
+        "delivery",
+        "smoking",
+        "outdoor_seating"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "bar",
+        "breakfast",
+        "cafe",
+        "café",
+        "canteen",
+        "dine",
+        "dining",
+        "dinner",
+        "drive-in",
+        "eat",
+        "grill",
+        "lunch",
+        "table"
+    ],
+    "tags": {
+        "amenity": "restaurant",
+        "cuisine": "japanese"
+    },
+    "reference": {
+        "key": "cuisine",
+        "value": "japanese"
+    },
+    "name": "Japanese Restaurant"
+}

data/presets/presets/amenity/restaurant/mexican.json

@@ -0,0 +1,49 @@
+{
+    "icon": "maki-restaurant",
+    "fields": [
+        "name",
+        "cuisine",
+        "address",
+        "building_area",
+        "opening_hours",
+        "capacity",
+        "takeaway",
+        "delivery",
+        "smoking",
+        "outdoor_seating"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "bar",
+        "breakfast",
+        "dine",
+        "dining",
+        "dinner",
+        "drive-in",
+        "eat",
+        "grill",
+        "lunch",
+        "table",
+        "tacos",
+        "burritos",
+        "enchiladas",
+        "fajitas",
+        "nachos",
+        "tortillas",
+        "salsa",
+        "tamales",
+        "quesadillas"
+    ],
+    "tags": {
+        "amenity": "restaurant",
+        "cuisine": "mexican"
+    },
+    "reference": {
+        "key": "cuisine",
+        "value": "mexican"
+    },
+    "name": "Mexican Restaurant"
+}

data/presets/presets/amenity/restaurant/noodle.json

@@ -0,0 +1,48 @@
+{
+    "icon": "maki-restaurant-noodle",
+    "fields": [
+        "name",
+        "cuisine",
+        "address",
+        "building_area",
+        "opening_hours",
+        "capacity",
+        "takeaway",
+        "delivery",
+        "smoking",
+        "outdoor_seating"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "bar",
+        "breakfast",
+        "cafe",
+        "café",
+        "canteen",
+        "dine",
+        "dining",
+        "dinner",
+        "drive-in",
+        "eat",
+        "grill",
+        "lunch",
+        "table",
+        "ramen noodles",
+        "soup",
+        "soba noodles",
+        "cellophane noodles",
+        "rice noodles"
+    ],
+    "tags": {
+        "amenity": "restaurant",
+        "cuisine": "noodle"
+    },
+    "reference": {
+        "key": "cuisine",
+        "value": "noodle"
+    },
+    "name": "Noodle Restaurant"
+}

data/presets/presets/amenity/restaurant/pizza.json

@@ -0,0 +1,41 @@
+{
+    "icon": "maki-restaurant-pizza",
+    "fields": [
+        "name",
+        "cuisine",
+        "address",
+        "building_area",
+        "opening_hours",
+        "capacity",
+        "takeaway",
+        "delivery",
+        "smoking",
+        "outdoor_seating"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "bar",
+        "dine",
+        "dining",
+        "dinner",
+        "drive-in",
+        "eat",
+        "lunch",
+        "table",
+        "deep dish",
+        "thin crust",
+        "slice"
+    ],
+    "tags": {
+        "amenity": "restaurant",
+        "cuisine": "pizza"
+    },
+    "reference": {
+        "key": "cuisine",
+        "value": "pizza"
+    },
+    "name": "Pizza Restaurant"
+}

data/presets/presets/amenity/restaurant/seafood.json

@@ -0,0 +1,53 @@
+{
+    "icon": "maki-restaurant-seafood",
+    "fields": [
+        "name",
+        "cuisine",
+        "address",
+        "building_area",
+        "opening_hours",
+        "capacity",
+        "takeaway",
+        "delivery",
+        "smoking",
+        "outdoor_seating"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "bar",
+        "breakfast",
+        "cafe",
+        "café",
+        "dine",
+        "dining",
+        "dinner",
+        "drive-in",
+        "eat",
+        "grill",
+        "lunch",
+        "table",
+        "fish",
+        "shellfish",
+        "molluscs",
+        "crustaceans",
+        "clams",
+        "oysters",
+        "lobsters",
+        "crab",
+        "shrimp",
+        "squid",
+        "octopus"
+    ],
+    "tags": {
+        "amenity": "restaurant",
+        "cuisine": "seafood"
+    },
+    "reference": {
+        "key": "cuisine",
+        "value": "seafood"
+    },
+    "name": "Seafood Restaurant"
+}

data/presets/presets/amenity/restaurant/steakhouse.json

@@ -0,0 +1,46 @@
+{
+    "icon": "maki-slaughterhouse",
+    "fields": [
+        "name",
+        "cuisine",
+        "address",
+        "building_area",
+        "opening_hours",
+        "capacity",
+        "takeaway",
+        "delivery",
+        "smoking",
+        "outdoor_seating"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "bar",
+        "breakfast",
+        "cafe",
+        "café",
+        "canteen",
+        "dine",
+        "dining",
+        "dinner",
+        "drive-in",
+        "eat",
+        "grill",
+        "lunch",
+        "table",
+        "steak house",
+        "chop house",
+        "beef"
+    ],
+    "tags": {
+        "amenity": "restaurant",
+        "cuisine": "steak_house"
+    },
+    "reference": {
+        "key": "cuisine",
+        "value": "steak_house"
+    },
+    "name": "Steakhouse"
+}

data/presets/presets/amenity/restaurant/sushi.json

@@ -0,0 +1,43 @@
+{
+    "icon": "fas-fish",
+    "fields": [
+        "name",
+        "cuisine",
+        "address",
+        "building_area",
+        "opening_hours",
+        "capacity",
+        "takeaway",
+        "delivery",
+        "smoking",
+        "outdoor_seating"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "bar",
+        "breakfast",
+        "cafe",
+        "café",
+        "canteen",
+        "dine",
+        "dining",
+        "dinner",
+        "drive-in",
+        "eat",
+        "grill",
+        "lunch",
+        "table"
+    ],
+    "tags": {
+        "amenity": "restaurant",
+        "cuisine": "sushi"
+    },
+    "reference": {
+        "key": "cuisine",
+        "value": "sushi"
+    },
+    "name": "Sushi Restaurant"
+}

data/presets/presets/amenity/restaurant/thai.json

@@ -0,0 +1,43 @@
+{
+    "icon": "maki-restaurant-noodle",
+    "fields": [
+        "name",
+        "cuisine",
+        "address",
+        "building_area",
+        "opening_hours",
+        "capacity",
+        "takeaway",
+        "delivery",
+        "smoking",
+        "outdoor_seating"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "bar",
+        "breakfast",
+        "cafe",
+        "café",
+        "canteen",
+        "dine",
+        "dining",
+        "dinner",
+        "drive-in",
+        "eat",
+        "grill",
+        "lunch",
+        "table"
+    ],
+    "tags": {
+        "amenity": "restaurant",
+        "cuisine": "thai"
+    },
+    "reference": {
+        "key": "cuisine",
+        "value": "thai"
+    },
+    "name": "Thai Restaurant"
+}

data/presets/presets/amenity/restaurant/turkish.json

@@ -0,0 +1,43 @@
+{
+    "icon": "maki-restaurant",
+    "fields": [
+        "name",
+        "cuisine",
+        "address",
+        "building_area",
+        "opening_hours",
+        "capacity",
+        "takeaway",
+        "delivery",
+        "smoking",
+        "outdoor_seating"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "bar",
+        "breakfast",
+        "cafe",
+        "café",
+        "canteen",
+        "dine",
+        "dining",
+        "dinner",
+        "drive-in",
+        "eat",
+        "grill",
+        "lunch",
+        "table"
+    ],
+    "tags": {
+        "amenity": "restaurant",
+        "cuisine": "turkish"
+    },
+    "reference": {
+        "key": "cuisine",
+        "value": "turkish"
+    },
+    "name": "Turkish Restaurant"
+}

data/presets/presets/amenity/restaurant/vietnamese.json

@@ -0,0 +1,43 @@
+{
+    "icon": "maki-restaurant-noodle",
+    "fields": [
+        "name",
+        "cuisine",
+        "address",
+        "building_area",
+        "opening_hours",
+        "capacity",
+        "takeaway",
+        "delivery",
+        "smoking",
+        "outdoor_seating"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "bar",
+        "breakfast",
+        "cafe",
+        "café",
+        "canteen",
+        "dine",
+        "dining",
+        "dinner",
+        "drive-in",
+        "eat",
+        "grill",
+        "lunch",
+        "table"
+    ],
+    "tags": {
+        "amenity": "restaurant",
+        "cuisine": "vietnamese"
+    },
+    "reference": {
+        "key": "cuisine",
+        "value": "vietnamese"
+    },
+    "name": "Vietnamese Restaurant"
+}

data/presets/presets/craft/confectionery.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-bakery",
+    "icon": "maki-confectionary",
     "fields": [
         "name",
         "operator",

data/presets/presets/craft/shoemaker.json

@@ -1,5 +1,5 @@
 {
-    "icon": "temaki-tools",
+    "icon": "maki-shoe",
     "fields": [
         "name",
         "operator",

data/presets/presets/craft/watchmaker.json

@@ -1,5 +1,5 @@
 {
-    "icon": "temaki-clock",
+    "icon": "maki-watch",
     "fields": [
         "name",
         "operator",

data/presets/presets/leisure/adult_gaming_centre.json

@@ -1,5 +1,5 @@
 {
-    "icon": "temaki-dice",
+    "icon": "maki-casino",
     "fields": [
         "name",
         "operator",

data/presets/presets/leisure/beach_resort.json

@@ -1,5 +1,5 @@
 {
-    "icon": "temaki-beach",
+    "icon": "maki-beach",
     "fields": [
         "name",
         "address",

data/presets/presets/leisure/pitch/beachvolleyball.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-basketball",
+    "icon": "maki-volleyball",
     "fields": [
         "name",
         "surface",

data/presets/presets/leisure/pitch/skateboard.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-pitch",
+    "icon": "maki-skateboard",
     "fields": [
         "name",
         "surface",

data/presets/presets/leisure/pitch/volleyball.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-basketball",
+    "icon": "maki-volleyball",
     "fields": [
         "name",
         "surface",

data/presets/presets/leisure/slipway.json

@@ -1,5 +1,5 @@
 {
-    "icon": "temaki-beach",
+    "icon": "maki-slipway",
     "fields": [
         "access_simple"
     ],

data/presets/presets/man_made/bridge.json

@@ -1,5 +1,5 @@
 {
-    "icon": "fas-archway",
+    "icon": "maki-bridge",
     "fields": [
         "name",
         "bridge",

data/presets/presets/man_made/mast.json

@@ -1,5 +1,5 @@
 {
-    "icon": "temaki-antenna",
+    "icon": "maki-communications-tower",
     "fields": [
         "tower/type",
         "tower/construction",

data/presets/presets/man_made/watermill.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-religious-buddhist",
+    "icon": "maki-watermill",
     "fields": [
         "building_area"
     ],

data/presets/presets/man_made/windmill.json

@@ -1,5 +1,5 @@
 {
-    "icon": "temaki-windmill",
+    "icon": "maki-windmill",
     "fields": [
         "building_area"
     ],

data/presets/presets/shop/car_repair.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-car",
+    "icon": "maki-car-repair",
     "fields": [
         "name",
         "operator",

data/presets/presets/shop/confectionery.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shop",
+    "icon": "maki-confectionary",
     "fields": [
         "name",
         "operator",

data/presets/presets/shop/jewelry.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shop",
+    "icon": "maki-jewelry-store",
     "fields": [
         "name",
         "operator",

data/presets/presets/shop/optician.json

@@ -1,5 +1,5 @@
 {
-    "icon": "fas-glasses",
+    "icon": "maki-optician",
     "fields": [
         "name",
         "operator",

data/presets/presets/shop/shoes.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shop",
+    "icon": "maki-shoe",
     "fields": [
         "name",
         "operator",

data/presets/presets/shop/watches.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shop",
+    "icon": "maki-watch",
     "fields": [
         "name",
         "operator",

data/presets/presets/waterway/waterfall.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-water",
+    "icon": "maki-waterfall",
     "fields": [
         "name",
         "height",

data/taginfo.json

@@ -405,7 +405,7 @@
       "value": "car_rental",
       "description": "Car Rental",
       "object_types": ["node", "area"],
-      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/car-15.svg?sanitize=true"
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/car-rental-15.svg?sanitize=true"
     },
     {
       "key": "amenity",
@@ -426,7 +426,7 @@
       "value": "casino",
       "description": "Casino",
       "object_types": ["node", "area"],
-      "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/dice.svg?sanitize=true"
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/casino-15.svg?sanitize=true"
     },
     {
       "key": "amenity",
@@ -568,6 +568,48 @@
       "object_types": ["node", "area"],
       "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/fast-food-15.svg?sanitize=true"
     },
+    {
+      "key": "cuisine",
+      "value": "burger",
+      "description": "Burger Shop",
+      "object_types": ["node", "area"],
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/fast-food-15.svg?sanitize=true"
+    },
+    {
+      "key": "cuisine",
+      "value": "chicken",
+      "description": "Chicken Shop",
+      "object_types": ["node", "area"],
+      "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-drumstick-bite.svg?sanitize=true"
+    },
+    {
+      "key": "cuisine",
+      "value": "fish_and_chips",
+      "description": "Fish & Chips Shop",
+      "object_types": ["node", "area"],
+      "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-fish.svg?sanitize=true"
+    },
+    {
+      "key": "cuisine",
+      "value": "kebab",
+      "description": "Kebab Shop",
+      "object_types": ["node", "area"],
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/restaurant-15.svg?sanitize=true"
+    },
+    {
+      "key": "cuisine",
+      "value": "pizza",
+      "description": "Pizza Shop, Pizza Restaurant",
+      "object_types": ["node", "area"],
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/restaurant-pizza-15.svg?sanitize=true"
+    },
+    {
+      "key": "cuisine",
+      "value": "sandwich",
+      "description": "Sandwich Shop",
+      "object_types": ["node", "area"],
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/restaurant-15.svg?sanitize=true"
+    },
     {
       "key": "amenity",
       "value": "fire_station",
@@ -881,6 +923,125 @@
       "object_types": ["node", "area"],
       "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/restaurant-15.svg?sanitize=true"
     },
+    {
+      "key": "cuisine",
+      "value": "american",
+      "description": "American Restaurant",
+      "object_types": ["node", "area"],
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/restaurant-15.svg?sanitize=true"
+    },
+    {
+      "key": "cuisine",
+      "value": "asian",
+      "description": "Asian Restaurant",
+      "object_types": ["node", "area"],
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/restaurant-noodle-15.svg?sanitize=true"
+    },
+    {
+      "key": "cuisine",
+      "value": "chinese",
+      "description": "Chinese Restaurant",
+      "object_types": ["node", "area"],
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/restaurant-noodle-15.svg?sanitize=true"
+    },
+    {
+      "key": "cuisine",
+      "value": "french",
+      "description": "French Restaurant",
+      "object_types": ["node", "area"],
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/restaurant-15.svg?sanitize=true"
+    },
+    {
+      "key": "cuisine",
+      "value": "german",
+      "description": "German Restaurant",
+      "object_types": ["node", "area"],
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/restaurant-15.svg?sanitize=true"
+    },
+    {
+      "key": "cuisine",
+      "value": "greek",
+      "description": "Greek Restaurant",
+      "object_types": ["node", "area"],
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/restaurant-15.svg?sanitize=true"
+    },
+    {
+      "key": "cuisine",
+      "value": "indian",
+      "description": "Indian Restaurant",
+      "object_types": ["node", "area"],
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/restaurant-15.svg?sanitize=true"
+    },
+    {
+      "key": "cuisine",
+      "value": "italian",
+      "description": "Italian Restaurant",
+      "object_types": ["node", "area"],
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/restaurant-15.svg?sanitize=true"
+    },
+    {
+      "key": "cuisine",
+      "value": "japanese",
+      "description": "Japanese Restaurant",
+      "object_types": ["node", "area"],
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/restaurant-noodle-15.svg?sanitize=true"
+    },
+    {
+      "key": "cuisine",
+      "value": "mexican",
+      "description": "Mexican Restaurant",
+      "object_types": ["node", "area"],
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/restaurant-15.svg?sanitize=true"
+    },
+    {
+      "key": "cuisine",
+      "value": "noodle",
+      "description": "Noodle Restaurant",
+      "object_types": ["node", "area"],
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/restaurant-noodle-15.svg?sanitize=true"
+    },
+    {
+      "key": "cuisine",
+      "value": "seafood",
+      "description": "Seafood Restaurant",
+      "object_types": ["node", "area"],
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/restaurant-seafood-15.svg?sanitize=true"
+    },
+    {
+      "key": "cuisine",
+      "value": "steak_house",
+      "description": "Steakhouse",
+      "object_types": ["node", "area"],
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/slaughterhouse-15.svg?sanitize=true"
+    },
+    {
+      "key": "cuisine",
+      "value": "sushi",
+      "description": "Sushi Restaurant",
+      "object_types": ["node", "area"],
+      "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-fish.svg?sanitize=true"
+    },
+    {
+      "key": "cuisine",
+      "value": "thai",
+      "description": "Thai Restaurant",
+      "object_types": ["node", "area"],
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/restaurant-noodle-15.svg?sanitize=true"
+    },
+    {
+      "key": "cuisine",
+      "value": "turkish",
+      "description": "Turkish Restaurant",
+      "object_types": ["node", "area"],
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/restaurant-15.svg?sanitize=true"
+    },
+    {
+      "key": "cuisine",
+      "value": "vietnamese",
+      "description": "Vietnamese Restaurant",
+      "object_types": ["node", "area"],
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/restaurant-noodle-15.svg?sanitize=true"
+    },
     {
       "key": "amenity",
       "value": "sanitary_dump_station",
@@ -1972,7 +2133,7 @@
       "value": "confectionery",
       "description": "Candy Maker",
       "object_types": ["node", "area"],
-      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/bakery-15.svg?sanitize=true"
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/confectionary-15.svg?sanitize=true"
     },
     {
       "key": "craft",
@@ -2147,7 +2308,7 @@
       "value": "shoemaker",
       "description": "Shoemaker",
       "object_types": ["node", "area"],
-      "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/tools.svg?sanitize=true"
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shoe-15.svg?sanitize=true"
     },
     {
       "key": "craft",
@@ -2182,7 +2343,7 @@
       "value": "watchmaker",
       "description": "Watchmaker",
       "object_types": ["node", "area"],
-      "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/clock.svg?sanitize=true"
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/watch-15.svg?sanitize=true"
     },
     {
       "key": "craft",
@@ -3245,7 +3406,7 @@
       "value": "adult_gaming_centre",
       "description": "Adult Gaming Center",
       "object_types": ["node", "area"],
-      "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/dice.svg?sanitize=true"
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/casino-15.svg?sanitize=true"
     },
     {
       "key": "leisure",
@@ -3266,7 +3427,7 @@
       "value": "beach_resort",
       "description": "Beach Resort",
       "object_types": ["node", "area"],
-      "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/beach.svg?sanitize=true"
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/beach-15.svg?sanitize=true"
     },
     {
       "key": "leisure",
@@ -3545,7 +3706,7 @@
       "value": "beachvolleyball",
       "description": "Beach Volleyball Court",
       "object_types": ["node", "area"],
-      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/basketball-15.svg?sanitize=true"
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/volleyball-15.svg?sanitize=true"
     },
     {
       "key": "sport",
@@ -3594,7 +3755,7 @@
       "value": "skateboard",
       "description": "Skate Park",
       "object_types": ["node", "area"],
-      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/pitch-15.svg?sanitize=true"
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/skateboard-15.svg?sanitize=true"
     },
     {
       "key": "sport",
@@ -3629,7 +3790,7 @@
       "value": "volleyball",
       "description": "Volleyball Court",
       "object_types": ["node", "area"],
-      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/basketball-15.svg?sanitize=true"
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/volleyball-15.svg?sanitize=true"
     },
     {
       "key": "leisure",
@@ -3664,7 +3825,7 @@
       "value": "slipway",
       "description": "Slipway",
       "object_types": ["node", "way"],
-      "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/beach.svg?sanitize=true"
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/slipway-15.svg?sanitize=true"
     },
     {
       "key": "leisure",
@@ -3739,7 +3900,7 @@
       "value": "bridge",
       "description": "Bridge",
       "object_types": ["area"],
-      "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-archway.svg?sanitize=true"
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/bridge-15.svg?sanitize=true"
     },
     {
       "key": "man_made",
@@ -3814,7 +3975,7 @@
       "value": "mast",
       "description": "Mast",
       "object_types": ["node"],
-      "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/antenna.svg?sanitize=true"
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/communications-tower-15.svg?sanitize=true"
     },
     {
       "key": "man_made",
@@ -3939,14 +4100,14 @@
       "value": "watermill",
       "description": "Watermill",
       "object_types": ["node", "area"],
-      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/religious-buddhist-15.svg?sanitize=true"
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/watermill-15.svg?sanitize=true"
     },
     {
       "key": "man_made",
       "value": "windmill",
       "description": "Windmill",
       "object_types": ["node", "area"],
-      "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/windmill.svg?sanitize=true"
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/windmill-15.svg?sanitize=true"
     },
     {
       "key": "man_made",
@@ -5279,7 +5440,7 @@
       "value": "car_repair",
       "description": "Car Repair Shop",
       "object_types": ["node", "area"],
-      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/car-15.svg?sanitize=true"
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/car-repair-15.svg?sanitize=true"
     },
     {
       "key": "shop",
@@ -5349,7 +5510,7 @@
       "value": "confectionery",
       "description": "Candy Store",
       "object_types": ["node", "area"],
-      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/confectionary-15.svg?sanitize=true"
     },
     {
       "key": "shop",
@@ -5580,7 +5741,7 @@
       "value": "jewelry",
       "description": "Jeweler",
       "object_types": ["node", "area"],
-      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/jewelry-store-15.svg?sanitize=true"
     },
     {
       "key": "shop",
@@ -5706,7 +5867,7 @@
       "value": "optician",
       "description": "Optician",
       "object_types": ["node", "area"],
-      "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-glasses.svg?sanitize=true"
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/optician-15.svg?sanitize=true"
     },
     {
       "key": "organic",
@@ -5825,7 +5986,7 @@
       "value": "shoes",
       "description": "Shoe Store",
       "object_types": ["node", "area"],
-      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shoe-15.svg?sanitize=true"
     },
     {
       "key": "shop",
@@ -5958,7 +6119,7 @@
       "value": "watches",
       "description": "Watches Shop",
       "object_types": ["node", "area"],
-      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/watch-15.svg?sanitize=true"
     },
     {
       "key": "shop",
@@ -6585,7 +6746,7 @@
       "value": "waterfall",
       "description": "Waterfall",
       "object_types": ["node"],
-      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/water-15.svg?sanitize=true"
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/waterfall-15.svg?sanitize=true"
     },
     {
       "key": "waterway",

dist/locales/en.json

@@ -3516,6 +3516,30 @@
                     "name": "Fast Food",
                     "terms": "restaurant,takeaway"
                 },
+                "amenity/fast_food/burger": {
+                    "name": "Burger Shop",
+                    "terms": "breakfast,dine,dining,dinner,drive-in,eat,grill,lunch,table"
+                },
+                "amenity/fast_food/chicken": {
+                    "name": "Chicken Shop",
+                    "terms": "breakfast,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table"
+                },
+                "amenity/fast_food/fish_and_chips": {
+                    "name": "Fish & Chips Shop",
+                    "terms": "breakfast,cafe,café,dine,dining,dinner,drive-in,eat,grill,lunch,table,french fries"
+                },
+                "amenity/fast_food/kebab": {
+                    "name": "Kebab Shop",
+                    "terms": "bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table"
+                },
+                "amenity/fast_food/pizza": {
+                    "name": "Pizza Shop",
+                    "terms": "dine,dining,dinner,drive-in,eat,lunch,table,deep dish,thin crust,slice"
+                },
+                "amenity/fast_food/sandwich": {
+                    "name": "Sandwich Shop",
+                    "terms": "breakfast,cafe,café,dine,dining,dinner,drive-in,eat,grill,lunch,table"
+                },
                 "amenity/fire_station": {
                     "name": "Fire Station",
                     "terms": ""
@@ -3696,6 +3720,78 @@
                     "name": "Restaurant",
                     "terms": "bar,breakfast,cafe,café,canteen,coffee,dine,dining,dinner,drive-in,eat,grill,lunch,table"
                 },
+                "amenity/restaurant/american": {
+                    "name": "American Restaurant",
+                    "terms": "bar,breakfast,cafe,café,canteen,coffee,dine,dining,dinner,drive-in,eat,grill,lunch,table"
+                },
+                "amenity/restaurant/asian": {
+                    "name": "Asian Restaurant",
+                    "terms": "bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table"
+                },
+                "amenity/restaurant/chinese": {
+                    "name": "Chinese Restaurant",
+                    "terms": "bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table"
+                },
+                "amenity/restaurant/french": {
+                    "name": "French Restaurant",
+                    "terms": "bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table"
+                },
+                "amenity/restaurant/german": {
+                    "name": "German Restaurant",
+                    "terms": "bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table"
+                },
+                "amenity/restaurant/greek": {
+                    "name": "Greek Restaurant",
+                    "terms": "bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table,gyros,pitas,olives"
+                },
+                "amenity/restaurant/indian": {
+                    "name": "Indian Restaurant",
+                    "terms": "bar,breakfast,dine,dining,dinner,drive-in,eat,grill,lunch,table,curry"
+                },
+                "amenity/restaurant/italian": {
+                    "name": "Italian Restaurant",
+                    "terms": "bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table,pasta,pizza"
+                },
+                "amenity/restaurant/japanese": {
+                    "name": "Japanese Restaurant",
+                    "terms": "bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table"
+                },
+                "amenity/restaurant/mexican": {
+                    "name": "Mexican Restaurant",
+                    "terms": "bar,breakfast,dine,dining,dinner,drive-in,eat,grill,lunch,table,tacos,burritos,enchiladas,fajitas,nachos,tortillas,salsa,tamales,quesadillas"
+                },
+                "amenity/restaurant/noodle": {
+                    "name": "Noodle Restaurant",
+                    "terms": "bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table,ramen noodles,soup,soba noodles,cellophane noodles,rice noodles"
+                },
+                "amenity/restaurant/pizza": {
+                    "name": "Pizza Restaurant",
+                    "terms": "bar,dine,dining,dinner,drive-in,eat,lunch,table,deep dish,thin crust,slice"
+                },
+                "amenity/restaurant/seafood": {
+                    "name": "Seafood Restaurant",
+                    "terms": "bar,breakfast,cafe,café,dine,dining,dinner,drive-in,eat,grill,lunch,table,fish,shellfish,molluscs,crustaceans,clams,oysters,lobsters,crab,shrimp,squid,octopus"
+                },
+                "amenity/restaurant/steakhouse": {
+                    "name": "Steakhouse",
+                    "terms": "bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table,steak house,chop house,beef"
+                },
+                "amenity/restaurant/sushi": {
+                    "name": "Sushi Restaurant",
+                    "terms": "bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table"
+                },
+                "amenity/restaurant/thai": {
+                    "name": "Thai Restaurant",
+                    "terms": "bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table"
+                },
+                "amenity/restaurant/turkish": {
+                    "name": "Turkish Restaurant",
+                    "terms": "bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table"
+                },
+                "amenity/restaurant/vietnamese": {
+                    "name": "Vietnamese Restaurant",
+                    "terms": "bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table"
+                },
                 "amenity/sanitary_dump_station": {
                     "name": "RV Toilet Disposal",
                     "terms": "Motor Home,Camper,Sanitary,Dump Station,Elsan,CDP,CTDP,Chemical Toilet"

svg/fontawesome/fas-drumstick-bite.svg

@@ -0,0 +1 @@
+<svg aria-hidden="true" data-prefix="fas" data-icon="drumstick-bite" class="svg-inline--fa fa-drumstick-bite fa-w-16" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="currentColor" d="M462.79 49.57c-66.14-66.09-173.36-66.09-239.5 0C187.81 85.02 160.12 128 160.12 192v85.83l-40.62 40.59c-9.7 9.69-24.04 11.07-36.78 5.98-21.72-8.68-47.42-4.29-65.02 13.29-23.61 23.59-23.61 61.84 0 85.43 15.28 15.27 36.53 19.58 56.14 15.09-4.5 19.6-.18 40.83 15.1 56.1 23.61 23.59 61.88 23.59 85.49 0 17.6-17.58 21.99-43.26 13.31-64.97-5.09-12.73-3.72-27.05 5.99-36.75L234.35 352h85.89c23.2 0 43.57-3.72 61.89-10.03-39.64-43.89-39.83-110.23 1.05-151.07 34.38-34.36 86.76-39.46 128.74-16.8 1.3-44.93-14.81-90.25-49.13-124.53z"></path></svg>

svg/fontawesome/fas-glasses.svg

@@ -1 +0,0 @@
-<svg aria-hidden="true" data-prefix="fas" data-icon="glasses" class="svg-inline--fa fa-glasses fa-w-18" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><path fill="currentColor" d="M574.1 280.37L528.75 98.66c-5.91-23.7-21.59-44.05-43-55.81-21.44-11.73-46.97-14.11-70.19-6.33l-15.25 5.08c-8.39 2.79-12.92 11.86-10.12 20.24l5.06 15.18c2.79 8.38 11.85 12.91 20.23 10.12l13.18-4.39c10.87-3.62 23-3.57 33.16 1.73 10.29 5.37 17.57 14.56 20.37 25.82l38.46 153.82c-22.19-6.81-49.79-12.46-81.2-12.46-34.77 0-73.98 7.02-114.85 26.74h-73.18c-40.87-19.74-80.08-26.75-114.86-26.75-31.42 0-59.02 5.65-81.21 12.46l38.46-153.83c2.79-11.25 10.09-20.45 20.38-25.81 10.16-5.3 22.28-5.35 33.15-1.73l13.17 4.39c8.38 2.79 17.44-1.74 20.23-10.12l5.06-15.18c2.8-8.38-1.73-17.45-10.12-20.24l-15.25-5.08c-23.22-7.78-48.75-5.41-70.19 6.33-21.41 11.77-37.09 32.11-43 55.8L1.9 280.37A64.218 64.218 0 0 0 0 295.86v70.25C0 429.01 51.58 480 115.2 480h37.12c60.28 0 110.37-45.94 114.88-105.37l2.93-38.63h35.75l2.93 38.63C313.31 434.06 363.4 480 423.68 480h37.12c63.62 0 115.2-50.99 115.2-113.88v-70.25c0-5.23-.64-10.43-1.9-15.5zm-370.72 89.42c-1.97 25.91-24.4 46.21-51.06 46.21H115.2C86.97 416 64 393.62 64 366.11v-37.54c18.12-6.49 43.42-12.92 72.58-12.92 23.86 0 47.26 4.33 69.93 12.92l-3.13 41.22zM512 366.12c0 27.51-22.97 49.88-51.2 49.88h-37.12c-26.67 0-49.1-20.3-51.06-46.21l-3.13-41.22c22.67-8.59 46.08-12.92 69.95-12.92 29.12 0 54.43 6.44 72.55 12.93v37.54z"></path></svg>