Update Temaki to v1.2.0

Use new Temaki icons for a variety of presets
Add terms to the shop/outdoor preset

data/presets.yaml

@@ -6349,7 +6349,7 @@ en:
       shop/outdoor:
         # shop=outdoor
         name: Outdoors Store
-        # 'terms: camping,climbing,hiking'
+        # 'terms: camping,climbing,hiking,outfitter,outdoor equipment,outdoor supplies'
         terms: '<translate with synonyms or related terms for ''Outdoors Store'', separated by commas>'
       shop/paint:
         # shop=paint

data/presets/presets.json

@@ -18,7 +18,7 @@
     "advertising/column": {"icon": "temaki-storage_tank", "fields": ["lit"], "geometry": ["point", "area"], "tags": {"advertising": "column"}, "name": "Advertising Column"},
     "aerialway/station": {"icon": "maki-aerialway", "geometry": ["point", "vertex", "area"], "fields": ["aerialway/access", "aerialway/summer/access", "elevation", "building_area"], "tags": {"aerialway": "station"}, "name": "Aerialway Station", "searchable": false},
     "aerialway/cable_car": {"geometry": ["line"], "terms": ["tramway", "ropeway"], "fields": ["name", "aerialway/occupancy", "aerialway/capacity", "aerialway/duration", "aerialway/heating"], "tags": {"aerialway": "cable_car"}, "name": "Cable Car"},
-    "aerialway/chair_lift": {"geometry": ["line"], "fields": ["name", "aerialway/occupancy", "aerialway/capacity", "aerialway/duration", "aerialway/bubble", "aerialway/heating"], "tags": {"aerialway": "chair_lift"}, "name": "Chair Lift"},
+    "aerialway/chair_lift": {"icon": "temaki-chairlift", "geometry": ["line"], "fields": ["name", "aerialway/occupancy", "aerialway/capacity", "aerialway/duration", "aerialway/bubble", "aerialway/heating"], "tags": {"aerialway": "chair_lift"}, "name": "Chair Lift"},
     "aerialway/drag_lift": {"geometry": ["line"], "fields": ["name", "aerialway/capacity", "aerialway/duration"], "tags": {"aerialway": "drag_lift"}, "name": "Drag Lift"},
     "aerialway/gondola": {"geometry": ["line"], "fields": ["name", "aerialway/occupancy", "aerialway/capacity", "aerialway/duration", "aerialway/bubble", "aerialway/heating"], "tags": {"aerialway": "gondola"}, "name": "Gondola"},
     "aerialway/goods": {"geometry": ["line"], "fields": ["name", "aerialway/capacity", "aerialway/duration"], "tags": {"aerialway": "goods"}, "name": "Goods Aerialway"},
@@ -58,13 +58,13 @@
     "amenity/bicycle_rental": {"icon": "maki-bicycle", "fields": ["capacity", "network", "operator", "fee", "payment_multi"], "moreFields": ["opening_hours", "address", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["bike"], "tags": {"amenity": "bicycle_rental"}, "name": "Bicycle Rental"},
     "amenity/bicycle_repair_station": {"icon": "maki-bicycle", "fields": ["operator", "brand", "opening_hours", "fee", "service/bicycle"], "moreFields": ["payment_multi"], "geometry": ["point", "vertex"], "terms": ["bike", "repair", "chain", "pump"], "tags": {"amenity": "bicycle_repair_station"}, "name": "Bicycle Repair Tool Stand"},
     "amenity/biergarten": {"icon": "maki-beer", "fields": ["name", "address", "building", "outdoor_seating", "brewery"], "moreFields": ["{amenity/bar}"], "geometry": ["point", "area"], "tags": {"amenity": "biergarten"}, "terms": ["beer", "bier", "booze"], "name": "Biergarten"},
-    "amenity/boat_rental": {"fields": ["name", "operator", "fee", "payment_multi"], "moreFields": ["address", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "boat_rental"}, "name": "Boat Rental"},
+    "amenity/boat_rental": {"icon": "temaki-boating", "fields": ["name", "operator", "fee", "payment_multi"], "moreFields": ["address", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "boat_rental"}, "name": "Boat Rental"},
     "amenity/bureau_de_change": {"icon": "maki-bank", "fields": ["name", "operator", "payment_multi", "currency_multi", "address", "building_area"], "moreFields": ["opening_hours", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["bureau de change", "money changer"], "tags": {"amenity": "bureau_de_change"}, "name": "Currency Exchange"},
     "amenity/cafe": {"icon": "maki-cafe", "fields": ["name", "cuisine", "address", "building_area", "outdoor_seating"], "moreFields": ["diet_multi", "takeaway", "delivery", "capacity", "opening_hours", "smoking", "payment_multi", "internet_access", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["bistro", "coffee", "tea"], "tags": {"amenity": "cafe"}, "name": "Cafe"},
     "amenity/car_pooling": {"icon": "maki-car", "fields": ["name", "operator", "capacity", "address", "opening_hours", "lit"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "car_pooling"}, "name": "Car Pooling"},
     "amenity/car_rental": {"icon": "maki-car-rental", "fields": ["name", "operator", "address", "opening_hours", "payment_multi"], "moreFields": ["brand", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "car_rental"}, "name": "Car Rental"},
     "amenity/car_sharing": {"icon": "maki-car", "fields": ["name", "operator", "capacity", "address", "payment_multi", "supervised"], "moreFields": ["lit", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "car_sharing"}, "name": "Car Sharing"},
-    "amenity/car_wash": {"icon": "maki-car", "fields": ["address", "building_area", "opening_hours", "payment_multi"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "car_wash"}, "name": "Car Wash"},
+    "amenity/car_wash": {"icon": "temaki-car_wash", "fields": ["address", "building_area", "opening_hours", "payment_multi"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "car_wash"}, "name": "Car Wash"},
     "amenity/casino": {"icon": "maki-casino", "fields": ["name", "operator", "address", "building_area", "opening_hours", "smoking"], "moreFields": ["payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["gambling", "roulette", "craps", "poker", "blackjack"], "tags": {"amenity": "casino"}, "name": "Casino"},
     "amenity/charging_station": {"icon": "fas-charging-station", "fields": ["operator", "capacity", "fee", "payment_multi"], "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"], "moreFields": ["payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["daycare", "orphanage", "playgroup"], "tags": {"amenity": "childcare"}, "name": "Nursery/Childcare"},
@@ -76,7 +76,7 @@
     "amenity/college": {"icon": "maki-college", "fields": ["name", "operator", "address", "website", "internet_access"], "moreFields": ["religion", "denomination", "internet_access/fee", "internet_access/ssid", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["university", "undergraduate school"], "tags": {"amenity": "college"}, "name": "College Grounds"},
     "amenity/community_centre": {"icon": "maki-town-hall", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["event", "hall"], "tags": {"amenity": "community_centre"}, "name": "Community Center"},
     "amenity/compressed_air": {"icon": "maki-car", "fields": ["operator", "fee", "payment_multi", "lit"], "geometry": ["point", "area"], "tags": {"amenity": "compressed_air"}, "name": "Compressed Air"},
-    "amenity/courthouse": {"icon": "maki-town-hall", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "courthouse"}, "name": "Courthouse"},
+    "amenity/courthouse": {"icon": "temaki-courthouse", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "courthouse"}, "name": "Courthouse"},
     "amenity/crematorium": {"icon": "maki-cemetery", "fields": ["name", "website", "phone", "opening_hours", "wheelchair"], "moreFields": ["address", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["area", "point"], "tags": {"amenity": "crematorium"}, "terms": ["cemetery", "funeral"], "name": "Crematorium"},
     "amenity/dentist": {"icon": "maki-dentist", "fields": ["name", "operator", "healthcare/speciality", "address", "building_area", "opening_hours"], "moreFields": ["payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["tooth", "teeth"], "tags": {"amenity": "dentist"}, "addTags": {"amenity": "dentist", "healthcare": "dentist"}, "removeTags": {"amenity": "dentist", "healthcare": "dentist"}, "reference": {"key": "amenity", "value": "dentist"}, "name": "Dentist"},
     "amenity/dive_centre": {"icon": "maki-swimming", "fields": ["name", "operator", "address", "building_area", "opening_hours", "scuba_diving"], "moreFields": ["payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["diving", "scuba"], "tags": {"amenity": "dive_centre"}, "name": "Dive Center"},
@@ -130,7 +130,7 @@
     "amenity/place_of_worship/taoist": {"icon": "temaki-taoism", "fields": ["name", "religion", "denomination", "building_area", "address", "service_times"], "geometry": ["point", "area"], "terms": ["daoist", "monastery", "temple"], "tags": {"amenity": "place_of_worship", "religion": "taoist"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Taoist Temple"},
     "amenity/planetarium": {"icon": "maki-museum", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["fee", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["museum", "astronomy", "observatory"], "tags": {"amenity": "planetarium"}, "name": "Planetarium"},
     "amenity/police": {"icon": "maki-police", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["badge", "constable", "constabulary", "cop", "detective", "fed", "law", "enforcement", "officer", "patrol"], "tags": {"amenity": "police"}, "name": "Police"},
-    "amenity/post_box": {"icon": "maki-post", "fields": ["operator", "collection_times", "drive_through", "ref"], "moreFields": ["wheelchair"], "geometry": ["point", "vertex"], "tags": {"amenity": "post_box"}, "terms": ["letter", "post"], "name": "Mailbox"},
+    "amenity/post_box": {"icon": "temaki-post_box", "fields": ["operator", "collection_times", "drive_through", "ref"], "moreFields": ["wheelchair"], "geometry": ["point", "vertex"], "tags": {"amenity": "post_box"}, "terms": ["letter", "post"], "name": "Mailbox"},
     "amenity/post_office": {"icon": "maki-post", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["letter", "mail"], "tags": {"amenity": "post_office"}, "name": "Post Office"},
     "amenity/prison": {"icon": "maki-prison", "fields": ["name", "operator", "address"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["cell", "jail"], "tags": {"amenity": "prison"}, "name": "Prison Grounds"},
     "amenity/pub": {"icon": "maki-beer", "fields": ["name", "address", "building_area", "opening_hours", "smoking", "brewery"], "moreFields": ["outdoor_seating", "diet_multi", "payment_multi", "internet_access", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "pub"}, "terms": ["alcohol", "drink", "dive", "beer", "bier", "booze"], "name": "Pub"},
@@ -201,7 +201,7 @@
     "amenity/vending_machine/public_transport_tickets": {"icon": "temaki-vending_machine", "geometry": ["point"], "terms": ["bus", "train", "ferry", "rail", "ticket", "transportation"], "tags": {"amenity": "vending_machine", "vending": "public_transport_tickets"}, "reference": {"key": "vending", "value": "public_transport_tickets"}, "name": "Transit Ticket Vending Machine"},
     "amenity/vending_machine/stamps": {"icon": "temaki-vending_machine", "geometry": ["point"], "terms": ["mail", "postage", "stamp"], "tags": {"amenity": "vending_machine", "vending": "stamps"}, "reference": {"key": "vending", "value": "stamps"}, "name": "Postage Vending Machine"},
     "amenity/vending_machine/sweets": {"icon": "temaki-vending_machine", "geometry": ["point"], "terms": ["candy", "gum", "chip", "pretzel", "cookie", "cracker"], "tags": {"amenity": "vending_machine", "vending": "sweets"}, "reference": {"key": "vending", "value": "sweets"}, "name": "Snack Vending Machine"},
-    "amenity/veterinary": {"icon": "maki-veterinary", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["fee", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["pet clinic", "veterinarian", "animal hospital", "pet doctor"], "tags": {"amenity": "veterinary"}, "name": "Veterinary"},
+    "amenity/veterinary": {"icon": "temaki-veterinary_care", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["fee", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["pet clinic", "veterinarian", "animal hospital", "pet doctor"], "tags": {"amenity": "veterinary"}, "name": "Veterinary"},
     "amenity/waste_basket": {"icon": "maki-waste-basket", "fields": ["collection_times"], "geometry": ["point", "vertex"], "tags": {"amenity": "waste_basket"}, "terms": ["bin", "garbage", "rubbish", "litter", "trash"], "name": "Waste Basket"},
     "amenity/waste_disposal": {"icon": "maki-waste-basket", "fields": ["operator", "collection_times"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "waste_disposal"}, "terms": ["garbage", "rubbish", "litter", "trash"], "name": "Garbage Dumpster"},
     "amenity/waste_transfer_station": {"icon": "maki-waste-basket", "fields": ["name", "operator", "address", "opening_hours", "fee", "payment_multi"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["dump", "garbage", "recycling", "rubbish", "scrap", "trash"], "tags": {"amenity": "waste_transfer_station"}, "name": "Waste Transfer Station"},
@@ -215,7 +215,7 @@
     "attraction/big_wheel": {"icon": "maki-amusement-park", "fields": ["{attraction}", "height"], "geometry": ["point"], "terms": ["ferris wheel", "theme park", "amusement ride"], "tags": {"attraction": "big_wheel"}, "name": "Big Wheel"},
     "attraction/bumper_car": {"icon": "maki-car", "geometry": ["point", "area"], "terms": ["theme park", "dodgem cars", "autoscooter"], "tags": {"attraction": "bumper_car"}, "name": "Bumper Car"},
     "attraction/bungee_jumping": {"icon": "maki-pitch", "fields": ["{attraction}", "height"], "geometry": ["point", "area"], "terms": ["theme park", "bungy jumping", "jumping platform"], "tags": {"attraction": "bungee_jumping"}, "name": "Bungee Jumping"},
-    "attraction/carousel": {"icon": "maki-horse-riding", "geometry": ["point", "area"], "terms": ["theme park", "roundabout", "merry-go-round", "galloper", "jumper", "horseabout", "flying horses"], "tags": {"attraction": "carousel"}, "name": "Carousel"},
+    "attraction/carousel": {"icon": "temaki-amusement_park", "geometry": ["point", "area"], "terms": ["theme park", "roundabout", "merry-go-round", "galloper", "jumper", "horseabout", "flying horses"], "tags": {"attraction": "carousel"}, "name": "Carousel"},
     "attraction/dark_ride": {"icon": "maki-rail-metro", "geometry": ["point", "line", "area"], "terms": ["theme park", "ghost train"], "tags": {"attraction": "dark_ride"}, "name": "Dark Ride"},
     "attraction/drop_tower": {"icon": "temaki-tower", "fields": ["{attraction}", "height"], "geometry": ["point", "area"], "terms": ["theme park", "amusement ride", "gondola", "tower", "big drop"], "tags": {"attraction": "drop_tower"}, "name": "Drop Tower"},
     "attraction/maze": {"icon": "maki-amusement-park", "geometry": ["point", "area"], "terms": ["theme park", "amusement ride", "labyrinth"], "tags": {"attraction": "maze"}, "name": "Maze"},
@@ -336,7 +336,7 @@
     "craft/photographer": {"icon": "maki-attraction", "geometry": ["point", "area"], "tags": {"craft": "photographer"}, "name": "Photographer"},
     "craft/photographic_laboratory": {"icon": "maki-attraction", "geometry": ["point", "area"], "terms": ["film"], "tags": {"craft": "photographic_laboratory"}, "name": "Photographic Laboratory"},
     "craft/plasterer": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"craft": "plasterer"}, "name": "Plasterer"},
-    "craft/plumber": {"icon": "temaki-tools", "geometry": ["point", "area"], "terms": ["pipe"], "tags": {"craft": "plumber"}, "name": "Plumber"},
+    "craft/plumber": {"icon": "temaki-plumber", "geometry": ["point", "area"], "terms": ["pipe"], "tags": {"craft": "plumber"}, "name": "Plumber"},
     "craft/pottery": {"icon": "maki-art-gallery", "geometry": ["point", "area"], "terms": ["ceramic"], "tags": {"craft": "pottery"}, "name": "Pottery"},
     "craft/rigger": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"craft": "rigger"}, "name": "Rigger"},
     "craft/roofer": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"craft": "roofer"}, "name": "Roofer"},
@@ -393,7 +393,7 @@
     "healthcare/midwife": {"icon": "maki-hospital", "geometry": ["point", "area"], "terms": ["baby", "childbirth", "delivery", "labour", "labor", "pregnancy"], "tags": {"healthcare": "midwife"}, "name": "Midwife"},
     "healthcare/occupational_therapist": {"icon": "maki-hospital", "geometry": ["point", "area"], "terms": ["therapist", "therapy"], "tags": {"healthcare": "occupational_therapist"}, "name": "Occupational Therapist"},
     "healthcare/optometrist": {"icon": "maki-hospital", "geometry": ["point", "area"], "terms": ["eye", "glasses", "lasik", "lenses", "vision"], "tags": {"healthcare": "optometrist"}, "name": "Optometrist"},
-    "healthcare/physiotherapist": {"icon": "maki-hospital", "geometry": ["point", "area"], "terms": ["physical", "therapist", "therapy"], "tags": {"healthcare": "physiotherapist"}, "name": "Physiotherapist"},
+    "healthcare/physiotherapist": {"icon": "temaki-physiotherapist", "geometry": ["point", "area"], "terms": ["physical", "therapist", "therapy"], "tags": {"healthcare": "physiotherapist"}, "name": "Physiotherapist"},
     "healthcare/podiatrist": {"icon": "maki-hospital", "geometry": ["point", "area"], "terms": ["foot", "feet", "nails"], "tags": {"healthcare": "podiatrist"}, "name": "Podiatrist"},
     "healthcare/psychotherapist": {"icon": "maki-hospital", "geometry": ["point", "area"], "terms": ["anxiety", "counselor", "depression", "mental health", "mind", "suicide", "therapist", "therapy"], "tags": {"healthcare": "psychotherapist"}, "name": "Psychotherapist"},
     "healthcare/rehabilitation": {"icon": "maki-hospital", "geometry": ["point", "area"], "terms": ["rehab", "therapist", "therapy"], "tags": {"healthcare": "rehabilitation"}, "name": "Rehabilitation Facility"},
@@ -522,7 +522,7 @@
     "landuse/retail": {"icon": "maki-commercial", "geometry": ["area"], "fields": ["name"], "moreFields": ["address", "website", "phone", "email", "fax"], "tags": {"landuse": "retail"}, "matchScore": 0.9, "name": "Retail Area"},
     "landuse/vineyard": {"fields": ["name", "operator", "grape_variety"], "moreFields": ["address", "website", "phone", "email", "fax"], "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": "maki-casino", "fields": ["{amenity/casino}"], "moreFields": ["{amenity/casino}"], "geometry": ["point", "area"], "terms": ["gambling", "slot machine"], "tags": {"leisure": "adult_gaming_centre"}, "name": "Adult Gaming Center"},
+    "leisure/adult_gaming_centre": {"icon": "temaki-casino", "fields": ["{amenity/casino}"], "moreFields": ["{amenity/casino}"], "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"], "moreFields": ["opening_hours", "payment_multi", "smoking", "website", "phone", "email", "fax"], "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"], "moreFields": ["website"], "geometry": ["point", "area"], "tags": {"leisure": "bandstand"}, "name": "Bandstand"},
     "leisure/beach_resort": {"icon": "maki-beach", "fields": ["name", "address", "fee"], "moreFields": ["opening_hours", "payment_multi", "smoking", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "tags": {"leisure": "beach_resort"}, "name": "Beach Resort"},
@@ -674,7 +674,7 @@
     "office/administrative": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "administrative"}, "terms": [], "searchable": false, "name": "Administrative Office"},
     "office/physician": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "physician"}, "searchable": false, "name": "Physician"},
     "office/travel_agent": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "travel_agent"}, "reference": {"key": "shop", "value": "travel_agency"}, "terms": [], "name": "Travel Agency", "searchable": false},
-    "office/accountant": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "accountant"}, "terms": [], "name": "Accountant Office"},
+    "office/accountant": {"icon": "temaki-accounting", "geometry": ["point", "area"], "tags": {"office": "accountant"}, "terms": [], "name": "Accountant Office"},
     "office/adoption_agency": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "adoption_agency"}, "terms": [], "name": "Adoption Agency"},
     "office/advertising_agency": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "advertising_agency"}, "terms": ["ad", "ad agency", "advert agency", "advertising", "marketing"], "name": "Advertising Agency"},
     "office/architect": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "architect"}, "terms": [], "name": "Architect Office"},
@@ -685,7 +685,7 @@
     "office/educational_institution": {"icon": "maki-school", "geometry": ["point", "area"], "tags": {"office": "educational_institution"}, "terms": [], "name": "Educational Institution"},
     "office/employment_agency": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "employment_agency"}, "terms": ["job"], "name": "Employment Agency"},
     "office/energy_supplier": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "energy_supplier"}, "terms": ["electricity", "energy company", "energy utility", "gas utility"], "name": "Energy Supplier Office"},
-    "office/estate_agent": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "estate_agent"}, "terms": ["real estate"], "name": "Real Estate Office"},
+    "office/estate_agent": {"icon": "temaki-real_estate_agency", "geometry": ["point", "area"], "tags": {"office": "estate_agent"}, "terms": ["real estate"], "name": "Real Estate Office"},
     "office/financial": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "financial"}, "terms": [], "name": "Financial Office"},
     "office/forestry": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "forestry"}, "terms": ["forest", "ranger"], "name": "Forestry Office"},
     "office/foundation": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "foundation"}, "terms": [], "name": "Foundation Office"},
@@ -713,7 +713,7 @@
     "office/water_utility": {"icon": "maki-suitcase", "fields": ["{office}", "operator"], "geometry": ["point", "area"], "tags": {"office": "water_utility"}, "terms": ["water board", "utility"], "name": "Water Utility Office"},
     "piste/downhill": {"icon": "fas-skiing", "fields": ["name", "piste/type", "piste/difficulty_downhill", "piste/grooming_downhill", "oneway", "lit"], "geometry": ["line", "area"], "terms": ["ski", "alpine", "snowboard", "downhill", "piste"], "tags": {"piste:type": "downhill"}, "name": "Downhill Piste/Ski Run"},
     "piste/downhill/halfpipe": {"icon": "fas-snowboarding", "fields": ["name", "piste/type", "piste/difficulty_downhill", "piste/grooming_downhill", "oneway", "lit"], "geometry": ["line", "area"], "terms": ["ski", "alpine", "halfpipe", "half pipe", "snowboard", "downhill", "piste"], "tags": {"piste:type": "downhill", "man_made": "piste:halfpipe"}, "name": "Halfpipe"},
-    "piste/hike": {"icon": "fas-skating", "fields": ["name", "piste/type", "piste/difficulty", "piste/grooming_hike", "oneway", "lit"], "geometry": ["line", "area"], "terms": ["hike", "winter hiking", "snowshoe", "snowshoeing", "piste", "ski"], "tags": {"piste:type": "hike"}, "name": "Snowshoeing or Winter Hiking Trail"},
+    "piste/hike": {"icon": "temaki-snow_shoeing", "fields": ["name", "piste/type", "piste/difficulty", "piste/grooming_hike", "oneway", "lit"], "geometry": ["line", "area"], "terms": ["hike", "winter hiking", "snowshoe", "snowshoeing", "piste", "ski"], "tags": {"piste:type": "hike"}, "name": "Snowshoeing or Winter Hiking Trail"},
     "piste/ice_skate": {"icon": "fas-skating", "fields": ["name", "piste/type", "sport_ice", "oneway", "lit"], "geometry": ["line", "area"], "terms": ["ice", "skating", "ski", "piste"], "tags": {"piste:type": "ice_skate"}, "name": "Ice Skating Piste"},
     "piste/nordic": {"icon": "fas-skiing-nordic", "fields": ["name", "piste/type", "piste/difficulty_nordic", "piste/grooming_nordic", "oneway", "lit"], "geometry": ["line", "area"], "terms": ["ski", "nordic", "crosscountry", "skating", "piste"], "tags": {"piste:type": "nordic"}, "name": "Nordic or Crosscountry Piste/Ski Trail"},
     "piste/piste": {"icon": "fas-skiing", "fields": ["name", "piste/type", "piste/difficulty", "piste/grooming", "oneway", "lit"], "geometry": ["line", "area"], "terms": ["ski", "nordic", "crosscountry", "downhill", "alpine", "snowboard", "skitour", "ski touring", "sled", "luge", "sleigh", "sledge", "ski-joring", "husky", "horse", "winter hiking", "snowshoe", "snowshoeing", "ice", "skating"], "tags": {"piste:type": "*"}, "name": "Winter Sport Trails"},
@@ -865,7 +865,7 @@
     "shop/car_parts": {"icon": "maki-car", "geometry": ["point", "area"], "terms": ["auto"], "tags": {"shop": "car_parts"}, "name": "Car Parts Store"},
     "shop/car_repair": {"icon": "maki-car-repair", "fields": ["{shop}", "service/vehicle"], "geometry": ["point", "area"], "terms": ["auto", "garage", "service"], "tags": {"shop": "car_repair"}, "name": "Car Repair Shop"},
     "shop/car": {"icon": "maki-car", "fields": ["name", "brand", "{shop}", "second_hand", "service/vehicle"], "geometry": ["point", "area"], "terms": ["auto"], "tags": {"shop": "car"}, "name": "Car Dealership"},
-    "shop/caravan": {"icon": "maki-car", "fields": ["name", "brand", "{shop}", "second_hand", "service/vehicle"], "geometry": ["point", "area"], "terms": ["auto"], "tags": {"shop": "caravan"}, "name": "RV Dealership"},
+    "shop/caravan": {"icon": "temaki-rv_park", "fields": ["name", "brand", "{shop}", "second_hand", "service/vehicle"], "geometry": ["point", "area"], "terms": ["auto"], "tags": {"shop": "caravan"}, "name": "RV Dealership"},
     "shop/carpet": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["rug"], "tags": {"shop": "carpet"}, "name": "Carpet Store"},
     "shop/catalogue": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "catalogue"}, "name": "Catalog Shop"},
     "shop/charity": {"icon": "maki-shop", "fields": ["{shop}", "second_hand"], "geometry": ["point", "area"], "terms": ["thrift", "op shop", "nonprofit"], "tags": {"shop": "charity"}, "name": "Charity Store"},
@@ -905,7 +905,7 @@
     "shop/gift": {"icon": "maki-gift", "geometry": ["point", "area"], "terms": ["souvenir"], "tags": {"shop": "gift"}, "name": "Gift Shop"},
     "shop/greengrocer": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["fruit", "vegetable"], "tags": {"shop": "greengrocer"}, "name": "Greengrocer"},
     "shop/hairdresser_supply": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["barber", "shampoo", "conditioner"], "tags": {"shop": "hairdresser_supply"}, "name": "Hairdresser Supply Store"},
-    "shop/hairdresser": {"icon": "maki-hairdresser", "geometry": ["point", "area"], "terms": ["barber"], "tags": {"shop": "hairdresser"}, "name": "Hairdresser"},
+    "shop/hairdresser": {"icon": "temaki-beauty_salon", "geometry": ["point", "area"], "terms": ["barber"], "tags": {"shop": "hairdresser"}, "name": "Hairdresser"},
     "shop/hardware": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"shop": "hardware"}, "name": "Hardware Store"},
     "shop/health_food": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["wholefood", "vitamins", "vegetarian", "vegan"], "tags": {"shop": "health_food"}, "name": "Health Food Shop"},
     "shop/hearing_aids": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "hearing_aids"}, "name": "Hearing Aids Store"},
@@ -922,7 +922,7 @@
     "shop/locksmith": {"icon": "fas-key", "geometry": ["point", "area"], "terms": ["key", "lockpick"], "tags": {"shop": "locksmith"}, "name": "Locksmith"},
     "shop/lottery": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "lottery"}, "name": "Lottery Shop"},
     "shop/mall": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["shopping"], "tags": {"shop": "mall"}, "name": "Mall"},
-    "shop/massage": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "massage"}, "name": "Massage Shop"},
+    "shop/massage": {"icon": "temaki-spa", "geometry": ["point", "area"], "tags": {"shop": "massage"}, "name": "Massage Shop"},
     "shop/medical_supply": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "medical_supply"}, "name": "Medical Supply Store"},
     "shop/mobile_phone": {"icon": "maki-mobile-phone", "geometry": ["point", "area"], "tags": {"shop": "mobile_phone"}, "name": "Mobile Phone Store"},
     "shop/money_lender": {"icon": "maki-bank", "fields": ["{shop}", "currency_multi"], "geometry": ["point", "area"], "tags": {"shop": "money_lender"}, "name": "Money Lender"},
@@ -934,7 +934,7 @@
     "shop/nutrition_supplements": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "nutrition_supplements"}, "name": "Nutrition Supplements Store"},
     "shop/optician": {"icon": "maki-optician", "geometry": ["point", "area"], "terms": ["eye", "glasses"], "tags": {"shop": "optician"}, "name": "Optician"},
     "shop/organic": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "supermarket", "organic": "only"}, "name": "Organic Goods Store"},
-    "shop/outdoor": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["camping", "climbing", "hiking"], "tags": {"shop": "outdoor"}, "name": "Outdoors Store"},
+    "shop/outdoor": {"icon": "temaki-compass", "geometry": ["point", "area"], "terms": ["camping", "climbing", "hiking", "outfitter", "outdoor equipment", "outdoor supplies"], "tags": {"shop": "outdoor"}, "name": "Outdoors Store"},
     "shop/paint": {"icon": "fas-paint-roller", "geometry": ["point", "area"], "tags": {"shop": "paint"}, "name": "Paint Store"},
     "shop/party": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["balloons", "costumes", "decorations", "invitations"], "tags": {"shop": "party"}, "name": "Party Supply Store"},
     "shop/pastry": {"icon": "maki-bakery", "geometry": ["point", "area"], "tags": {"shop": "pastry"}, "terms": ["patisserie", "cake shop", "cakery"], "name": "Pastry Shop"},
@@ -968,7 +968,7 @@
     "shop/vacuum_cleaner": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "vacuum_cleaner"}, "name": "Vacuum Cleaner Store"},
     "shop/variety_store": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "variety_store"}, "name": "Variety Store"},
     "shop/video_games": {"icon": "maki-gaming", "geometry": ["point", "area"], "tags": {"shop": "video_games"}, "name": "Video Game Store"},
-    "shop/video": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["DVD"], "tags": {"shop": "video"}, "name": "Video Store"},
+    "shop/video": {"icon": "temaki-movie_rental", "geometry": ["point", "area"], "terms": ["DVD"], "tags": {"shop": "video"}, "name": "Video Store"},
     "shop/watches": {"icon": "maki-watch", "geometry": ["point", "area"], "tags": {"shop": "watches"}, "name": "Watches Shop"},
     "shop/water_sports": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "water_sports"}, "name": "Watersport/Swim Shop"},
     "shop/water": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "water"}, "name": "Drinking Water Shop"},
@@ -986,7 +986,7 @@
     "tourism/artwork/statue": {"icon": "maki-art-gallery", "fields": ["name", "artist", "material"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "artwork", "artwork_type": "statue"}, "reference": {"key": "artwork_type", "value": "statue"}, "terms": ["sculpture", "figure", "carving"], "name": "Statue"},
     "tourism/attraction": {"icon": "maki-star", "fields": ["name", "operator", "address"], "geometry": ["point", "vertex", "area"], "tags": {"tourism": "attraction"}, "name": "Tourist Attraction"},
     "tourism/camp_site": {"icon": "maki-campsite", "fields": ["name", "operator", "address", "access_simple", "capacity", "fee", "internet_access"], "moreFields": ["payment_multi", "internet_access/fee", "internet_access/ssid", "sanitary_dump_station", "power_supply", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["tent", "rv"], "tags": {"tourism": "camp_site"}, "name": "Campground"},
-    "tourism/caravan_site": {"icon": "maki-bus", "fields": ["name", "address", "capacity", "sanitary_dump_station", "power_supply", "internet_access"], "moreFields": ["operator", "fee", "payment_multi", "internet_access/fee", "internet_access/ssid", "smoking", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["Motor Home", "Camper"], "tags": {"tourism": "caravan_site"}, "name": "RV Park"},
+    "tourism/caravan_site": {"icon": "temaki-rv_park", "fields": ["name", "address", "capacity", "sanitary_dump_station", "power_supply", "internet_access"], "moreFields": ["operator", "fee", "payment_multi", "internet_access/fee", "internet_access/ssid", "smoking", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["Motor Home", "Camper"], "tags": {"tourism": "caravan_site"}, "name": "RV Park"},
     "tourism/chalet": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "internet_access"], "moreFields": ["smoking", "payment_multi", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["holiday", "holiday cottage", "holiday home", "vacation", "vacation home"], "tags": {"tourism": "chalet"}, "name": "Holiday Cottage"},
     "tourism/gallery": {"icon": "maki-art-gallery", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["art*", "exhibit*", "paint*", "photo*", "sculpt*"], "tags": {"tourism": "gallery"}, "name": "Art Gallery"},
     "tourism/guest_house": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "rooms", "internet_access"], "moreFields": ["smoking", "payment_multi", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"tourism": "guest_house"}, "terms": ["B&B", "Bed and Breakfast"], "name": "Guest House"},
@@ -1004,7 +1004,7 @@
     "tourism/trail_riding_station": {"icon": "maki-horse-riding", "fields": ["name", "horse_stables", "horse_riding", "horse_dressage"], "moreFields": ["address", "opening_hours", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "tags": {"tourism": "trail_riding_station"}, "name": "Trail Riding Station", "matchScore": 2},
     "tourism/viewpoint": {"icon": "temaki-binoculars", "geometry": ["point", "vertex"], "fields": ["direction"], "tags": {"tourism": "viewpoint"}, "name": "Viewpoint"},
     "tourism/wilderness_hut": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "fee", "fireplace"], "moreFields": ["payment_multi", "wheelchair"], "geometry": ["point", "area"], "terms": ["wilderness hut", "backcountry hut", "bothy"], "tags": {"tourism": "wilderness_hut"}, "name": "Wilderness Hut"},
-    "tourism/zoo": {"icon": "maki-zoo", "fields": ["name", "operator", "address", "opening_hours", "fee"], "moreFields": ["payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["animal"], "tags": {"tourism": "zoo"}, "name": "Zoo"},
+    "tourism/zoo": {"icon": "temaki-zoo", "fields": ["name", "operator", "address", "opening_hours", "fee"], "moreFields": ["payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["animal"], "tags": {"tourism": "zoo"}, "name": "Zoo"},
     "traffic_calming": {"icon": "temaki-diamond", "fields": ["traffic_calming", "surface", "direction_vertex"], "geometry": ["vertex", "line", "area"], "tags": {"traffic_calming": "*"}, "terms": ["bump", "hump", "slow", "speed"], "name": "Traffic Calming"},
     "traffic_calming/bump": {"icon": "temaki-diamond", "fields": ["surface", "direction_vertex"], "geometry": ["vertex", "line"], "terms": ["hump", "speed", "slow"], "tags": {"traffic_calming": "bump"}, "name": "Speed Bump"},
     "traffic_calming/chicane": {"icon": "temaki-diamond", "fields": ["surface", "direction_vertex"], "geometry": ["vertex", "area"], "terms": ["driveway link", "speed", "slow"], "tags": {"traffic_calming": "chicane"}, "name": "Traffic Chicane"},
@@ -1834,8 +1834,8 @@
     "amenity/pharmacy/Walgreens": {"name": "Walgreens", "icon": "maki-pharmacy", "geometry": ["point", "area"], "tags": {"amenity": "pharmacy", "brand:wikidata": "Q1591889"}, "addTags": {"amenity": "pharmacy", "brand": "Walgreens", "brand:wikidata": "Q1591889", "brand:wikipedia": "en:Walgreens", "healthcare": "pharmacy", "name": "Walgreens"}, "removeTags": {"amenity": "pharmacy", "brand": "Walgreens", "brand:wikidata": "Q1591889", "brand:wikipedia": "en:Walgreens", "healthcare": "pharmacy", "name": "Walgreens"}, "reference": {"key": "amenity", "value": "pharmacy"}, "matchScore": 2, "suggestion": true},
     "amenity/pharmacy/Walmart Pharmacy": {"name": "Walmart Pharmacy", "icon": "maki-pharmacy", "geometry": ["point", "area"], "tags": {"amenity": "pharmacy", "brand:wikidata": "Q483551"}, "addTags": {"amenity": "pharmacy", "brand": "Walmart", "brand:wikidata": "Q483551", "brand:wikipedia": "en:Walmart", "healthcare": "pharmacy", "name": "Walmart Pharmacy", "operator": "Walmart", "operator:wikidata": "Q483551", "operator:wikipedia": "en:Walmart"}, "removeTags": {"amenity": "pharmacy", "brand": "Walmart", "brand:wikidata": "Q483551", "brand:wikipedia": "en:Walmart", "healthcare": "pharmacy", "name": "Walmart Pharmacy", "operator": "Walmart", "operator:wikidata": "Q483551", "operator:wikipedia": "en:Walmart"}, "reference": {"key": "amenity", "value": "pharmacy"}, "matchScore": 2, "suggestion": true},
     "amenity/pharmacy/Well Pharmacy": {"name": "Well Pharmacy", "icon": "maki-pharmacy", "geometry": ["point", "area"], "tags": {"amenity": "pharmacy", "brand:wikidata": "Q7726524"}, "addTags": {"amenity": "pharmacy", "brand": "Well Pharmacy", "brand:wikidata": "Q7726524", "brand:wikipedia": "en:Well Pharmacy", "healthcare": "pharmacy", "name": "Well Pharmacy"}, "removeTags": {"amenity": "pharmacy", "brand": "Well Pharmacy", "brand:wikidata": "Q7726524", "brand:wikipedia": "en:Well Pharmacy", "healthcare": "pharmacy", "name": "Well Pharmacy"}, "reference": {"key": "amenity", "value": "pharmacy"}, "matchScore": 2, "suggestion": true},
-    "amenity/post_box/Deutsche Post": {"name": "Deutsche Post", "icon": "maki-post", "geometry": ["point", "vertex"], "tags": {"amenity": "post_box", "brand:wikidata": "Q157645"}, "addTags": {"amenity": "post_box", "brand": "Deutsche Post", "brand:wikidata": "Q157645", "brand:wikipedia": "en:Deutsche Post", "name": "Deutsche Post"}, "removeTags": {"amenity": "post_box", "brand": "Deutsche Post", "brand:wikidata": "Q157645", "brand:wikipedia": "en:Deutsche Post", "name": "Deutsche Post"}, "matchScore": 2, "suggestion": true},
-    "amenity/post_box/USPS": {"name": "USPS", "icon": "maki-post", "geometry": ["point", "vertex"], "tags": {"amenity": "post_box", "brand:wikidata": "Q668687"}, "addTags": {"amenity": "post_box", "brand": "USPS", "brand:wikidata": "Q668687", "brand:wikipedia": "en:United States Postal Service", "name": "USPS", "operator": "USPS"}, "removeTags": {"amenity": "post_box", "brand": "USPS", "brand:wikidata": "Q668687", "brand:wikipedia": "en:United States Postal Service", "name": "USPS", "operator": "USPS"}, "matchScore": 2, "suggestion": true},
+    "amenity/post_box/Deutsche Post": {"name": "Deutsche Post", "icon": "temaki-post_box", "geometry": ["point", "vertex"], "tags": {"amenity": "post_box", "brand:wikidata": "Q157645"}, "addTags": {"amenity": "post_box", "brand": "Deutsche Post", "brand:wikidata": "Q157645", "brand:wikipedia": "en:Deutsche Post", "name": "Deutsche Post"}, "removeTags": {"amenity": "post_box", "brand": "Deutsche Post", "brand:wikidata": "Q157645", "brand:wikipedia": "en:Deutsche Post", "name": "Deutsche Post"}, "matchScore": 2, "suggestion": true},
+    "amenity/post_box/USPS": {"name": "USPS", "icon": "temaki-post_box", "geometry": ["point", "vertex"], "tags": {"amenity": "post_box", "brand:wikidata": "Q668687"}, "addTags": {"amenity": "post_box", "brand": "USPS", "brand:wikidata": "Q668687", "brand:wikipedia": "en:United States Postal Service", "name": "USPS", "operator": "USPS"}, "removeTags": {"amenity": "post_box", "brand": "USPS", "brand:wikidata": "Q668687", "brand:wikipedia": "en:United States Postal Service", "name": "USPS", "operator": "USPS"}, "matchScore": 2, "suggestion": true},
     "amenity/post_office/Australia Post": {"name": "Australia Post", "icon": "maki-post", "geometry": ["point", "area"], "tags": {"amenity": "post_office", "brand:wikidata": "Q1142936"}, "addTags": {"amenity": "post_office", "brand": "Australia Post", "brand:wikidata": "Q1142936", "brand:wikipedia": "en:Australia Post", "name": "Australia Post"}, "removeTags": {"amenity": "post_office", "brand": "Australia Post", "brand:wikidata": "Q1142936", "brand:wikipedia": "en:Australia Post", "name": "Australia Post"}, "matchScore": 2, "suggestion": true},
     "amenity/post_office/CTT": {"name": "CTT", "icon": "maki-post", "geometry": ["point", "area"], "tags": {"amenity": "post_office", "brand:wikidata": "Q909429"}, "addTags": {"amenity": "post_office", "brand": "CTT", "brand:wikidata": "Q909429", "brand:wikipedia": "en:CTT (Macau)", "name": "CTT"}, "removeTags": {"amenity": "post_office", "brand": "CTT", "brand:wikidata": "Q909429", "brand:wikipedia": "en:CTT (Macau)", "name": "CTT"}, "matchScore": 2, "suggestion": true},
     "amenity/post_office/Canada Post": {"name": "Canada Post", "icon": "maki-post", "geometry": ["point", "area"], "tags": {"amenity": "post_office", "brand:wikidata": "Q1032001"}, "addTags": {"amenity": "post_office", "brand": "Canada Post", "brand:wikidata": "Q1032001", "brand:wikipedia": "en:Canada Post", "name": "Canada Post"}, "removeTags": {"amenity": "post_office", "brand": "Canada Post", "brand:wikidata": "Q1032001", "brand:wikipedia": "en:Canada Post", "name": "Canada Post"}, "matchScore": 2, "suggestion": true},
@@ -1984,7 +1984,7 @@
     "amenity/vending_machine/public_transport_tickets/KKM": {"name": "KKM", "icon": "temaki-vending_machine", "geometry": ["point"], "tags": {"amenity": "vending_machine", "vending": "public_transport_tickets", "brand:wikidata": "Q57515549"}, "addTags": {"amenity": "vending_machine", "brand": "KKM", "brand:wikidata": "Q57515549", "name": "KKM", "vending": "public_transport_tickets"}, "removeTags": {"amenity": "vending_machine", "brand": "KKM", "brand:wikidata": "Q57515549", "name": "KKM", "vending": "public_transport_tickets"}, "reference": {"key": "vending", "value": "public_transport_tickets"}, "matchScore": 2, "suggestion": true},
     "amenity/vending_machine/parcel_pickup_dropoff/Paczkomat InPost": {"name": "Paczkomat InPost", "icon": "temaki-vending_machine", "geometry": ["point"], "tags": {"amenity": "vending_machine", "vending": "parcel_pickup;parcel_mail_in", "brand:wikidata": "Q3182097"}, "addTags": {"amenity": "vending_machine", "brand": "InPost", "brand:wikidata": "Q3182097", "brand:wikipedia": "pl:InPost", "name": "Paczkomat InPost", "vending": "parcel_pickup;parcel_mail_in"}, "removeTags": {"amenity": "vending_machine", "brand": "InPost", "brand:wikidata": "Q3182097", "brand:wikipedia": "pl:InPost", "name": "Paczkomat InPost", "vending": "parcel_pickup;parcel_mail_in"}, "reference": {"key": "vending", "value": "parcel_pickup;parcel_mail_in"}, "matchScore": 2, "suggestion": true},
     "amenity/vending_machine/Redbox": {"name": "Redbox", "icon": "temaki-vending_machine", "geometry": ["point"], "tags": {"amenity": "vending_machine", "brand:wikidata": "Q7305489"}, "addTags": {"amenity": "vending_machine", "brand": "Redbox", "brand:wikidata": "Q7305489", "brand:wikipedia": "en:Redbox", "name": "Redbox"}, "removeTags": {"amenity": "vending_machine", "brand": "Redbox", "brand:wikidata": "Q7305489", "brand:wikipedia": "en:Redbox", "name": "Redbox"}, "matchScore": 2, "suggestion": true},
-    "amenity/veterinary/Banfield Pet Hospital": {"name": "Banfield Pet Hospital", "icon": "maki-veterinary", "geometry": ["point", "area"], "tags": {"amenity": "veterinary", "brand:wikidata": "Q2882416"}, "addTags": {"amenity": "veterinary", "brand": "Banfield Pet Hospital", "brand:wikidata": "Q2882416", "brand:wikipedia": "en:Banfield Pet Hospital", "name": "Banfield Pet Hospital"}, "removeTags": {"amenity": "veterinary", "brand": "Banfield Pet Hospital", "brand:wikidata": "Q2882416", "brand:wikipedia": "en:Banfield Pet Hospital", "name": "Banfield Pet Hospital"}, "matchScore": 2, "suggestion": true},
+    "amenity/veterinary/Banfield Pet Hospital": {"name": "Banfield Pet Hospital", "icon": "temaki-veterinary_care", "geometry": ["point", "area"], "tags": {"amenity": "veterinary", "brand:wikidata": "Q2882416"}, "addTags": {"amenity": "veterinary", "brand": "Banfield Pet Hospital", "brand:wikidata": "Q2882416", "brand:wikipedia": "en:Banfield Pet Hospital", "name": "Banfield Pet Hospital"}, "removeTags": {"amenity": "veterinary", "brand": "Banfield Pet Hospital", "brand:wikidata": "Q2882416", "brand:wikipedia": "en:Banfield Pet Hospital", "name": "Banfield Pet Hospital"}, "matchScore": 2, "suggestion": true},
     "leisure/fitness_centre/24 Hour Fitness": {"name": "24 Hour Fitness", "icon": "fas-dumbbell", "geometry": ["point", "area"], "tags": {"leisure": "fitness_centre", "brand:wikidata": "Q4631849"}, "addTags": {"brand": "24 Hour Fitness", "brand:wikidata": "Q4631849", "brand:wikipedia": "en:24 Hour Fitness", "leisure": "fitness_centre", "name": "24 Hour Fitness"}, "removeTags": {"brand": "24 Hour Fitness", "brand:wikidata": "Q4631849", "brand:wikipedia": "en:24 Hour Fitness", "leisure": "fitness_centre", "name": "24 Hour Fitness"}, "matchScore": 2, "suggestion": true},
     "leisure/fitness_centre/Anytime Fitness": {"name": "Anytime Fitness", "icon": "fas-dumbbell", "geometry": ["point", "area"], "tags": {"leisure": "fitness_centre", "brand:wikidata": "Q4778364"}, "addTags": {"brand": "Anytime Fitness", "brand:wikidata": "Q4778364", "brand:wikipedia": "en:Anytime Fitness", "leisure": "fitness_centre", "name": "Anytime Fitness"}, "removeTags": {"brand": "Anytime Fitness", "brand:wikidata": "Q4778364", "brand:wikipedia": "en:Anytime Fitness", "leisure": "fitness_centre", "name": "Anytime Fitness"}, "matchScore": 2, "suggestion": true},
     "leisure/fitness_centre/Curves": {"name": "Curves", "icon": "fas-dumbbell", "geometry": ["point", "area"], "tags": {"leisure": "fitness_centre", "brand:wikidata": "Q5196080"}, "addTags": {"brand": "Curves", "brand:wikidata": "Q5196080", "brand:wikipedia": "en:Curves International", "leisure": "fitness_centre", "name": "Curves"}, "removeTags": {"brand": "Curves", "brand:wikidata": "Q5196080", "brand:wikipedia": "en:Curves International", "leisure": "fitness_centre", "name": "Curves"}, "matchScore": 2, "suggestion": true},
@@ -2451,15 +2451,15 @@
     "shop/gift/Hallmark": {"name": "Hallmark", "icon": "maki-gift", "geometry": ["point", "area"], "tags": {"shop": "gift", "brand:wikidata": "Q1521910"}, "addTags": {"brand": "Hallmark", "brand:wikidata": "Q1521910", "brand:wikipedia": "en:Hallmark Cards", "name": "Hallmark", "shop": "gift"}, "removeTags": {"brand": "Hallmark", "brand:wikidata": "Q1521910", "brand:wikipedia": "en:Hallmark Cards", "name": "Hallmark", "shop": "gift"}, "matchScore": 2, "suggestion": true},
     "shop/gift/Nanu-Nana": {"name": "Nanu-Nana", "icon": "maki-gift", "geometry": ["point", "area"], "tags": {"shop": "gift", "brand:wikidata": "Q1720245"}, "addTags": {"brand": "Nanu-Nana", "brand:wikidata": "Q1720245", "brand:wikipedia": "de:Nanu-Nana", "name": "Nanu-Nana", "shop": "gift"}, "removeTags": {"brand": "Nanu-Nana", "brand:wikidata": "Q1720245", "brand:wikipedia": "de:Nanu-Nana", "name": "Nanu-Nana", "shop": "gift"}, "matchScore": 2, "suggestion": true},
     "shop/hairdresser_supply/Sally Beauty Supply": {"name": "Sally Beauty Supply", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "hairdresser_supply", "brand:wikidata": "Q7405065"}, "addTags": {"brand": "Sally Beauty Supply", "brand:wikidata": "Q7405065", "brand:wikipedia": "en:Sally Beauty Holdings", "name": "Sally Beauty Supply", "shop": "hairdresser_supply"}, "removeTags": {"brand": "Sally Beauty Supply", "brand:wikidata": "Q7405065", "brand:wikipedia": "en:Sally Beauty Holdings", "name": "Sally Beauty Supply", "shop": "hairdresser_supply"}, "matchScore": 2, "suggestion": true},
-    "shop/hairdresser/Fantastic Sams": {"name": "Fantastic Sams", "icon": "maki-hairdresser", "geometry": ["point", "area"], "tags": {"shop": "hairdresser", "brand:wikidata": "Q5434222"}, "addTags": {"brand": "Fantastic Sams", "brand:wikidata": "Q5434222", "brand:wikipedia": "en:Fantastic Sams", "name": "Fantastic Sams", "shop": "hairdresser"}, "removeTags": {"brand": "Fantastic Sams", "brand:wikidata": "Q5434222", "brand:wikipedia": "en:Fantastic Sams", "name": "Fantastic Sams", "shop": "hairdresser"}, "matchScore": 2, "suggestion": true},
-    "shop/hairdresser/First Choice Haircutters": {"name": "First Choice Haircutters", "icon": "maki-hairdresser", "geometry": ["point", "area"], "tags": {"shop": "hairdresser", "brand:wikidata": "Q5452622"}, "addTags": {"brand": "First Choice Haircutters", "brand:wikidata": "Q5452622", "brand:wikipedia": "en:First Choice Haircutters", "name": "First Choice Haircutters", "shop": "hairdresser"}, "removeTags": {"brand": "First Choice Haircutters", "brand:wikidata": "Q5452622", "brand:wikipedia": "en:First Choice Haircutters", "name": "First Choice Haircutters", "shop": "hairdresser"}, "matchScore": 2, "suggestion": true},
-    "shop/hairdresser/Great Clips": {"name": "Great Clips", "icon": "maki-hairdresser", "geometry": ["point", "area"], "tags": {"shop": "hairdresser", "brand:wikidata": "Q5598967"}, "addTags": {"brand": "Great Clips", "brand:wikidata": "Q5598967", "brand:wikipedia": "en:Great Clips", "name": "Great Clips", "shop": "hairdresser"}, "removeTags": {"brand": "Great Clips", "brand:wikidata": "Q5598967", "brand:wikipedia": "en:Great Clips", "name": "Great Clips", "shop": "hairdresser"}, "matchScore": 2, "suggestion": true},
-    "shop/hairdresser/Hair Cuttery": {"name": "Hair Cuttery", "icon": "maki-hairdresser", "geometry": ["point", "area"], "tags": {"shop": "hairdresser", "brand:wikidata": "Q5639484"}, "addTags": {"brand": "Hair Cuttery", "brand:wikidata": "Q5639484", "brand:wikipedia": "en:Hair Cuttery", "name": "Hair Cuttery", "shop": "hairdresser"}, "removeTags": {"brand": "Hair Cuttery", "brand:wikidata": "Q5639484", "brand:wikipedia": "en:Hair Cuttery", "name": "Hair Cuttery", "shop": "hairdresser"}, "matchScore": 2, "suggestion": true},
-    "shop/hairdresser/Hair Express": {"name": "Hair Express", "icon": "maki-hairdresser", "geometry": ["point", "area"], "tags": {"shop": "hairdresser", "brand:wikidata": "Q57550814"}, "addTags": {"brand": "Hair Express", "brand:wikidata": "Q57550814", "name": "Hair Express", "shop": "hairdresser"}, "removeTags": {"brand": "Hair Express", "brand:wikidata": "Q57550814", "name": "Hair Express", "shop": "hairdresser"}, "matchScore": 2, "suggestion": true},
-    "shop/hairdresser/Hairkiller": {"name": "Hairkiller", "icon": "maki-hairdresser", "geometry": ["point", "area"], "tags": {"shop": "hairdresser", "brand:wikidata": "Q58305998"}, "addTags": {"brand": "Hairkiller", "brand:wikidata": "Q58305998", "name": "Hairkiller", "shop": "hairdresser"}, "removeTags": {"brand": "Hairkiller", "brand:wikidata": "Q58305998", "name": "Hairkiller", "shop": "hairdresser"}, "matchScore": 2, "suggestion": true},
-    "shop/hairdresser/Klier": {"name": "Klier", "icon": "maki-hairdresser", "geometry": ["point", "area"], "tags": {"shop": "hairdresser", "brand:wikidata": "Q1465159"}, "addTags": {"brand": "Klier", "brand:wikidata": "Q1465159", "brand:wikipedia": "de:Frisör Klier", "name": "Klier", "shop": "hairdresser"}, "removeTags": {"brand": "Klier", "brand:wikidata": "Q1465159", "brand:wikipedia": "de:Frisör Klier", "name": "Klier", "shop": "hairdresser"}, "matchScore": 2, "suggestion": true},
-    "shop/hairdresser/Supercuts": {"name": "Supercuts", "icon": "maki-hairdresser", "geometry": ["point", "area"], "tags": {"shop": "hairdresser", "brand:wikidata": "Q7643239"}, "addTags": {"brand": "Supercuts", "brand:wikidata": "Q7643239", "brand:wikipedia": "en:Supercuts", "name": "Supercuts", "shop": "hairdresser"}, "removeTags": {"brand": "Supercuts", "brand:wikidata": "Q7643239", "brand:wikipedia": "en:Supercuts", "name": "Supercuts", "shop": "hairdresser"}, "matchScore": 2, "suggestion": true},
-    "shop/hairdresser/Toni & Guy": {"name": "Toni & Guy", "icon": "maki-hairdresser", "geometry": ["point", "area"], "tags": {"shop": "hairdresser", "brand:wikidata": "Q324784"}, "addTags": {"brand": "Toni & Guy", "brand:wikidata": "Q324784", "brand:wikipedia": "en:Toni & Guy", "name": "Toni & Guy", "shop": "hairdresser"}, "removeTags": {"brand": "Toni & Guy", "brand:wikidata": "Q324784", "brand:wikipedia": "en:Toni & Guy", "name": "Toni & Guy", "shop": "hairdresser"}, "matchScore": 2, "suggestion": true},
+    "shop/hairdresser/Fantastic Sams": {"name": "Fantastic Sams", "icon": "temaki-beauty_salon", "geometry": ["point", "area"], "tags": {"shop": "hairdresser", "brand:wikidata": "Q5434222"}, "addTags": {"brand": "Fantastic Sams", "brand:wikidata": "Q5434222", "brand:wikipedia": "en:Fantastic Sams", "name": "Fantastic Sams", "shop": "hairdresser"}, "removeTags": {"brand": "Fantastic Sams", "brand:wikidata": "Q5434222", "brand:wikipedia": "en:Fantastic Sams", "name": "Fantastic Sams", "shop": "hairdresser"}, "matchScore": 2, "suggestion": true},
+    "shop/hairdresser/First Choice Haircutters": {"name": "First Choice Haircutters", "icon": "temaki-beauty_salon", "geometry": ["point", "area"], "tags": {"shop": "hairdresser", "brand:wikidata": "Q5452622"}, "addTags": {"brand": "First Choice Haircutters", "brand:wikidata": "Q5452622", "brand:wikipedia": "en:First Choice Haircutters", "name": "First Choice Haircutters", "shop": "hairdresser"}, "removeTags": {"brand": "First Choice Haircutters", "brand:wikidata": "Q5452622", "brand:wikipedia": "en:First Choice Haircutters", "name": "First Choice Haircutters", "shop": "hairdresser"}, "matchScore": 2, "suggestion": true},
+    "shop/hairdresser/Great Clips": {"name": "Great Clips", "icon": "temaki-beauty_salon", "geometry": ["point", "area"], "tags": {"shop": "hairdresser", "brand:wikidata": "Q5598967"}, "addTags": {"brand": "Great Clips", "brand:wikidata": "Q5598967", "brand:wikipedia": "en:Great Clips", "name": "Great Clips", "shop": "hairdresser"}, "removeTags": {"brand": "Great Clips", "brand:wikidata": "Q5598967", "brand:wikipedia": "en:Great Clips", "name": "Great Clips", "shop": "hairdresser"}, "matchScore": 2, "suggestion": true},
+    "shop/hairdresser/Hair Cuttery": {"name": "Hair Cuttery", "icon": "temaki-beauty_salon", "geometry": ["point", "area"], "tags": {"shop": "hairdresser", "brand:wikidata": "Q5639484"}, "addTags": {"brand": "Hair Cuttery", "brand:wikidata": "Q5639484", "brand:wikipedia": "en:Hair Cuttery", "name": "Hair Cuttery", "shop": "hairdresser"}, "removeTags": {"brand": "Hair Cuttery", "brand:wikidata": "Q5639484", "brand:wikipedia": "en:Hair Cuttery", "name": "Hair Cuttery", "shop": "hairdresser"}, "matchScore": 2, "suggestion": true},
+    "shop/hairdresser/Hair Express": {"name": "Hair Express", "icon": "temaki-beauty_salon", "geometry": ["point", "area"], "tags": {"shop": "hairdresser", "brand:wikidata": "Q57550814"}, "addTags": {"brand": "Hair Express", "brand:wikidata": "Q57550814", "name": "Hair Express", "shop": "hairdresser"}, "removeTags": {"brand": "Hair Express", "brand:wikidata": "Q57550814", "name": "Hair Express", "shop": "hairdresser"}, "matchScore": 2, "suggestion": true},
+    "shop/hairdresser/Hairkiller": {"name": "Hairkiller", "icon": "temaki-beauty_salon", "geometry": ["point", "area"], "tags": {"shop": "hairdresser", "brand:wikidata": "Q58305998"}, "addTags": {"brand": "Hairkiller", "brand:wikidata": "Q58305998", "name": "Hairkiller", "shop": "hairdresser"}, "removeTags": {"brand": "Hairkiller", "brand:wikidata": "Q58305998", "name": "Hairkiller", "shop": "hairdresser"}, "matchScore": 2, "suggestion": true},
+    "shop/hairdresser/Klier": {"name": "Klier", "icon": "temaki-beauty_salon", "geometry": ["point", "area"], "tags": {"shop": "hairdresser", "brand:wikidata": "Q1465159"}, "addTags": {"brand": "Klier", "brand:wikidata": "Q1465159", "brand:wikipedia": "de:Frisör Klier", "name": "Klier", "shop": "hairdresser"}, "removeTags": {"brand": "Klier", "brand:wikidata": "Q1465159", "brand:wikipedia": "de:Frisör Klier", "name": "Klier", "shop": "hairdresser"}, "matchScore": 2, "suggestion": true},
+    "shop/hairdresser/Supercuts": {"name": "Supercuts", "icon": "temaki-beauty_salon", "geometry": ["point", "area"], "tags": {"shop": "hairdresser", "brand:wikidata": "Q7643239"}, "addTags": {"brand": "Supercuts", "brand:wikidata": "Q7643239", "brand:wikipedia": "en:Supercuts", "name": "Supercuts", "shop": "hairdresser"}, "removeTags": {"brand": "Supercuts", "brand:wikidata": "Q7643239", "brand:wikipedia": "en:Supercuts", "name": "Supercuts", "shop": "hairdresser"}, "matchScore": 2, "suggestion": true},
+    "shop/hairdresser/Toni & Guy": {"name": "Toni & Guy", "icon": "temaki-beauty_salon", "geometry": ["point", "area"], "tags": {"shop": "hairdresser", "brand:wikidata": "Q324784"}, "addTags": {"brand": "Toni & Guy", "brand:wikidata": "Q324784", "brand:wikipedia": "en:Toni & Guy", "name": "Toni & Guy", "shop": "hairdresser"}, "removeTags": {"brand": "Toni & Guy", "brand:wikidata": "Q324784", "brand:wikipedia": "en:Toni & Guy", "name": "Toni & Guy", "shop": "hairdresser"}, "matchScore": 2, "suggestion": true},
     "shop/hardware/Harbor Freight Tools": {"name": "Harbor Freight Tools", "icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"shop": "hardware", "brand:wikidata": "Q5654601"}, "addTags": {"brand": "Harbor Freight Tools", "brand:wikidata": "Q5654601", "brand:wikipedia": "en:Harbor Freight Tools", "name": "Harbor Freight Tools", "shop": "hardware"}, "removeTags": {"brand": "Harbor Freight Tools", "brand:wikidata": "Q5654601", "brand:wikipedia": "en:Harbor Freight Tools", "name": "Harbor Freight Tools", "shop": "hardware"}, "matchScore": 2, "suggestion": true},
     "shop/hardware/True Value": {"name": "True Value", "icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"shop": "hardware", "brand:wikidata": "Q7847545"}, "addTags": {"brand": "True Value", "brand:wikidata": "Q7847545", "brand:wikipedia": "en:True Value", "name": "True Value", "shop": "hardware"}, "removeTags": {"brand": "True Value", "brand:wikidata": "Q7847545", "brand:wikipedia": "en:True Value", "name": "True Value", "shop": "hardware"}, "matchScore": 2, "suggestion": true},
     "shop/health_food/Holland & Barrett": {"name": "Holland & Barrett", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "health_food", "brand:wikidata": "Q5880870"}, "addTags": {"brand": "Holland & Barrett", "brand:wikidata": "Q5880870", "brand:wikipedia": "en:Holland & Barrett", "name": "Holland & Barrett", "shop": "health_food"}, "removeTags": {"brand": "Holland & Barrett", "brand:wikidata": "Q5880870", "brand:wikipedia": "en:Holland & Barrett", "name": "Holland & Barrett", "shop": "health_food"}, "matchScore": 2, "suggestion": true},
@@ -2490,7 +2490,7 @@
     "shop/kiosk/Pressbyrån": {"name": "Pressbyrån", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "kiosk", "brand:wikidata": "Q2489072"}, "addTags": {"brand": "Pressbyrån", "brand:wikidata": "Q2489072", "brand:wikipedia": "en:Pressbyrån", "name": "Pressbyrån", "shop": "kiosk"}, "removeTags": {"brand": "Pressbyrån", "brand:wikidata": "Q2489072", "brand:wikipedia": "en:Pressbyrån", "name": "Pressbyrån", "shop": "kiosk"}, "matchScore": 2, "suggestion": true},
     "shop/kiosk/R-Kioski": {"name": "R-Kioski", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "kiosk", "brand:wikidata": "Q1571400"}, "addTags": {"brand": "R-Kioski", "brand:wikidata": "Q1571400", "brand:wikipedia": "en:R-kioski", "name": "R-Kioski", "shop": "kiosk"}, "removeTags": {"brand": "R-Kioski", "brand:wikidata": "Q1571400", "brand:wikipedia": "en:R-kioski", "name": "R-Kioski", "shop": "kiosk"}, "matchScore": 2, "suggestion": true},
     "shop/kiosk/Ruch": {"name": "Ruch", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "kiosk", "brand:wikidata": "Q1260314"}, "addTags": {"brand": "Ruch", "brand:wikidata": "Q1260314", "brand:wikipedia": "pl:Ruch (przedsiębiorstwo)", "name": "Ruch", "shop": "kiosk"}, "removeTags": {"brand": "Ruch", "brand:wikidata": "Q1260314", "brand:wikipedia": "pl:Ruch (przedsiębiorstwo)", "name": "Ruch", "shop": "kiosk"}, "matchScore": 2, "suggestion": true},
-    "shop/massage/Massage Envy": {"name": "Massage Envy", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "massage", "brand:wikidata": "Q22922899"}, "addTags": {"brand": "Massage Envy", "brand:wikidata": "Q22922899", "brand:wikipedia": "en:Massage Envy", "name": "Massage Envy", "shop": "massage"}, "removeTags": {"brand": "Massage Envy", "brand:wikidata": "Q22922899", "brand:wikipedia": "en:Massage Envy", "name": "Massage Envy", "shop": "massage"}, "matchScore": 2, "suggestion": true},
+    "shop/massage/Massage Envy": {"name": "Massage Envy", "icon": "temaki-spa", "geometry": ["point", "area"], "tags": {"shop": "massage", "brand:wikidata": "Q22922899"}, "addTags": {"brand": "Massage Envy", "brand:wikidata": "Q22922899", "brand:wikipedia": "en:Massage Envy", "name": "Massage Envy", "shop": "massage"}, "removeTags": {"brand": "Massage Envy", "brand:wikidata": "Q22922899", "brand:wikipedia": "en:Massage Envy", "name": "Massage Envy", "shop": "massage"}, "matchScore": 2, "suggestion": true},
     "shop/mobile_phone/AT&T": {"name": "AT&T", "icon": "maki-mobile-phone", "geometry": ["point", "area"], "tags": {"shop": "mobile_phone", "brand:wikidata": "Q298594"}, "addTags": {"brand": "AT&T", "brand:wikidata": "Q298594", "brand:wikipedia": "en:AT&T Mobility", "name": "AT&T", "shop": "mobile_phone"}, "removeTags": {"brand": "AT&T", "brand:wikidata": "Q298594", "brand:wikipedia": "en:AT&T Mobility", "name": "AT&T", "shop": "mobile_phone"}, "matchScore": 2, "suggestion": true},
     "shop/mobile_phone/Bell": {"name": "Bell", "icon": "maki-mobile-phone", "geometry": ["point", "area"], "tags": {"shop": "mobile_phone", "brand:wikidata": "Q2894594"}, "addTags": {"brand": "Bell", "brand:wikidata": "Q2894594", "brand:wikipedia": "en:Bell Mobility", "name": "Bell", "shop": "mobile_phone"}, "removeTags": {"brand": "Bell", "brand:wikidata": "Q2894594", "brand:wikipedia": "en:Bell Mobility", "name": "Bell", "shop": "mobile_phone"}, "matchScore": 2, "suggestion": true},
     "shop/mobile_phone/Boost Mobile": {"name": "Boost Mobile", "icon": "maki-mobile-phone", "geometry": ["point", "area"], "tags": {"shop": "mobile_phone", "brand:wikidata": "Q4943790"}, "addTags": {"brand": "Boost Mobile", "brand:wikidata": "Q4943790", "brand:wikipedia": "en:Boost Mobile", "name": "Boost Mobile", "shop": "mobile_phone"}, "removeTags": {"brand": "Boost Mobile", "brand:wikidata": "Q4943790", "brand:wikipedia": "en:Boost Mobile", "name": "Boost Mobile", "shop": "mobile_phone"}, "matchScore": 2, "suggestion": true},
@@ -2561,10 +2561,10 @@
     "shop/optician/Vision Express": {"name": "Vision Express", "icon": "maki-optician", "geometry": ["point", "area"], "tags": {"shop": "optician", "brand:wikidata": "Q7936150"}, "addTags": {"brand": "Vision Express", "brand:wikidata": "Q7936150", "brand:wikipedia": "en:Vision Express", "name": "Vision Express", "shop": "optician"}, "removeTags": {"brand": "Vision Express", "brand:wikidata": "Q7936150", "brand:wikipedia": "en:Vision Express", "name": "Vision Express", "shop": "optician"}, "matchScore": 2, "suggestion": true},
     "shop/optician/Visionworks": {"name": "Visionworks", "icon": "maki-optician", "geometry": ["point", "area"], "tags": {"shop": "optician", "brand:wikidata": "Q5422607"}, "addTags": {"brand": "Visionworks", "brand:wikidata": "Q5422607", "brand:wikipedia": "en:Visionworks", "name": "Visionworks", "shop": "optician"}, "removeTags": {"brand": "Visionworks", "brand:wikidata": "Q5422607", "brand:wikipedia": "en:Visionworks", "name": "Visionworks", "shop": "optician"}, "matchScore": 2, "suggestion": true},
     "shop/optician/メガネスーパー": {"name": "メガネスーパー", "icon": "maki-optician", "geometry": ["point", "area"], "tags": {"shop": "optician", "brand:wikidata": "Q11343504"}, "addTags": {"brand": "メガネスーパー", "brand:wikidata": "Q11343504", "brand:wikipedia": "ja:メガネスーパー", "name": "メガネスーパー", "shop": "optician"}, "removeTags": {"brand": "メガネスーパー", "brand:wikidata": "Q11343504", "brand:wikipedia": "ja:メガネスーパー", "name": "メガネスーパー", "shop": "optician"}, "matchScore": 2, "suggestion": true},
-    "shop/outdoor/Jack Wolfskin": {"name": "Jack Wolfskin", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "outdoor", "brand:wikidata": "Q536133"}, "addTags": {"brand": "Jack Wolfskin", "brand:wikidata": "Q536133", "brand:wikipedia": "en:Jack Wolfskin", "name": "Jack Wolfskin", "shop": "outdoor"}, "removeTags": {"brand": "Jack Wolfskin", "brand:wikidata": "Q536133", "brand:wikipedia": "en:Jack Wolfskin", "name": "Jack Wolfskin", "shop": "outdoor"}, "matchScore": 2, "suggestion": true},
-    "shop/outdoor/Mountain Warehouse": {"name": "Mountain Warehouse", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "outdoor", "brand:wikidata": "Q6925414"}, "addTags": {"brand": "Mountain Warehouse", "brand:wikidata": "Q6925414", "brand:wikipedia": "en:Mountain Warehouse", "name": "Mountain Warehouse", "shop": "outdoor"}, "removeTags": {"brand": "Mountain Warehouse", "brand:wikidata": "Q6925414", "brand:wikipedia": "en:Mountain Warehouse", "name": "Mountain Warehouse", "shop": "outdoor"}, "matchScore": 2, "suggestion": true},
-    "shop/outdoor/REI": {"name": "REI", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "outdoor", "brand:wikidata": "Q3414933"}, "addTags": {"brand": "REI", "brand:wikidata": "Q3414933", "brand:wikipedia": "en:Recreational Equipment, Inc.", "name": "REI", "shop": "outdoor"}, "removeTags": {"brand": "REI", "brand:wikidata": "Q3414933", "brand:wikipedia": "en:Recreational Equipment, Inc.", "name": "REI", "shop": "outdoor"}, "matchScore": 2, "suggestion": true},
-    "shop/outdoor/Trespass": {"name": "Trespass", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "outdoor", "brand:wikidata": "Q17035733"}, "addTags": {"brand": "Trespass", "brand:wikidata": "Q17035733", "brand:wikipedia": "en:Trespass (clothing)", "name": "Trespass", "shop": "outdoor"}, "removeTags": {"brand": "Trespass", "brand:wikidata": "Q17035733", "brand:wikipedia": "en:Trespass (clothing)", "name": "Trespass", "shop": "outdoor"}, "matchScore": 2, "suggestion": true},
+    "shop/outdoor/Jack Wolfskin": {"name": "Jack Wolfskin", "icon": "temaki-compass", "geometry": ["point", "area"], "tags": {"shop": "outdoor", "brand:wikidata": "Q536133"}, "addTags": {"brand": "Jack Wolfskin", "brand:wikidata": "Q536133", "brand:wikipedia": "en:Jack Wolfskin", "name": "Jack Wolfskin", "shop": "outdoor"}, "removeTags": {"brand": "Jack Wolfskin", "brand:wikidata": "Q536133", "brand:wikipedia": "en:Jack Wolfskin", "name": "Jack Wolfskin", "shop": "outdoor"}, "matchScore": 2, "suggestion": true},
+    "shop/outdoor/Mountain Warehouse": {"name": "Mountain Warehouse", "icon": "temaki-compass", "geometry": ["point", "area"], "tags": {"shop": "outdoor", "brand:wikidata": "Q6925414"}, "addTags": {"brand": "Mountain Warehouse", "brand:wikidata": "Q6925414", "brand:wikipedia": "en:Mountain Warehouse", "name": "Mountain Warehouse", "shop": "outdoor"}, "removeTags": {"brand": "Mountain Warehouse", "brand:wikidata": "Q6925414", "brand:wikipedia": "en:Mountain Warehouse", "name": "Mountain Warehouse", "shop": "outdoor"}, "matchScore": 2, "suggestion": true},
+    "shop/outdoor/REI": {"name": "REI", "icon": "temaki-compass", "geometry": ["point", "area"], "tags": {"shop": "outdoor", "brand:wikidata": "Q3414933"}, "addTags": {"brand": "REI", "brand:wikidata": "Q3414933", "brand:wikipedia": "en:Recreational Equipment, Inc.", "name": "REI", "shop": "outdoor"}, "removeTags": {"brand": "REI", "brand:wikidata": "Q3414933", "brand:wikipedia": "en:Recreational Equipment, Inc.", "name": "REI", "shop": "outdoor"}, "matchScore": 2, "suggestion": true},
+    "shop/outdoor/Trespass": {"name": "Trespass", "icon": "temaki-compass", "geometry": ["point", "area"], "tags": {"shop": "outdoor", "brand:wikidata": "Q17035733"}, "addTags": {"brand": "Trespass", "brand:wikidata": "Q17035733", "brand:wikipedia": "en:Trespass (clothing)", "name": "Trespass", "shop": "outdoor"}, "removeTags": {"brand": "Trespass", "brand:wikidata": "Q17035733", "brand:wikipedia": "en:Trespass (clothing)", "name": "Trespass", "shop": "outdoor"}, "matchScore": 2, "suggestion": true},
     "shop/paint/Benjamin Moore": {"name": "Benjamin Moore", "icon": "fas-paint-roller", "geometry": ["point", "area"], "tags": {"shop": "paint", "brand:wikidata": "Q4889038"}, "addTags": {"brand": "Benjamin Moore", "brand:wikidata": "Q4889038", "brand:wikipedia": "en:Benjamin Moore & Co.", "name": "Benjamin Moore", "shop": "paint"}, "removeTags": {"brand": "Benjamin Moore", "brand:wikidata": "Q4889038", "brand:wikipedia": "en:Benjamin Moore & Co.", "name": "Benjamin Moore", "shop": "paint"}, "matchScore": 2, "suggestion": true},
     "shop/paint/Comex": {"name": "Comex", "icon": "fas-paint-roller", "geometry": ["point", "area"], "tags": {"shop": "paint", "brand:wikidata": "Q5151654"}, "addTags": {"brand": "Comex", "brand:wikidata": "Q5151654", "brand:wikipedia": "en:Comex Group", "name": "Comex", "shop": "paint"}, "removeTags": {"brand": "Comex", "brand:wikidata": "Q5151654", "brand:wikipedia": "en:Comex Group", "name": "Comex", "shop": "paint"}, "matchScore": 2, "suggestion": true},
     "shop/paint/Jotun": {"name": "Jotun", "icon": "fas-paint-roller", "geometry": ["point", "area"], "tags": {"shop": "paint", "brand:wikidata": "Q1778870"}, "addTags": {"brand": "Jotun", "brand:wikidata": "Q1778870", "brand:wikipedia": "en:Jotun (company)", "name": "Jotun", "shop": "paint"}, "removeTags": {"brand": "Jotun", "brand:wikidata": "Q1778870", "brand:wikipedia": "en:Jotun (company)", "name": "Jotun", "shop": "paint"}, "matchScore": 2, "suggestion": true},
@@ -2994,10 +2994,10 @@
     "shop/video_games/EB Games": {"name": "EB Games", "icon": "maki-gaming", "geometry": ["point", "area"], "tags": {"shop": "video_games", "brand:wikidata": "Q4993686"}, "addTags": {"brand": "EB Games", "brand:wikidata": "Q4993686", "brand:wikipedia": "en:EB Games", "name": "EB Games", "shop": "video_games"}, "removeTags": {"brand": "EB Games", "brand:wikidata": "Q4993686", "brand:wikipedia": "en:EB Games", "name": "EB Games", "shop": "video_games"}, "matchScore": 2, "suggestion": true},
     "shop/video_games/GameStop": {"name": "GameStop", "icon": "maki-gaming", "geometry": ["point", "area"], "tags": {"shop": "video_games", "brand:wikidata": "Q202210"}, "addTags": {"brand": "GameStop", "brand:wikidata": "Q202210", "brand:wikipedia": "en:GameStop", "name": "GameStop", "shop": "video_games"}, "removeTags": {"brand": "GameStop", "brand:wikidata": "Q202210", "brand:wikipedia": "en:GameStop", "name": "GameStop", "shop": "video_games"}, "matchScore": 2, "suggestion": true},
     "shop/video_games/Micromania": {"name": "Micromania", "icon": "maki-gaming", "geometry": ["point", "area"], "tags": {"shop": "video_games", "brand:wikidata": "Q3312221"}, "addTags": {"brand": "Micromania", "brand:wikidata": "Q3312221", "brand:wikipedia": "en:Micromania (video game retailer)", "name": "Micromania", "shop": "video_games"}, "removeTags": {"brand": "Micromania", "brand:wikidata": "Q3312221", "brand:wikipedia": "en:Micromania (video game retailer)", "name": "Micromania", "shop": "video_games"}, "matchScore": 2, "suggestion": true},
-    "shop/video/Blockbuster": {"name": "Blockbuster", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "video", "brand:wikidata": "Q884711"}, "addTags": {"brand": "Blockbuster", "brand:wikidata": "Q884711", "brand:wikipedia": "en:Blockbuster LLC", "name": "Blockbuster", "shop": "video"}, "removeTags": {"brand": "Blockbuster", "brand:wikidata": "Q884711", "brand:wikipedia": "en:Blockbuster LLC", "name": "Blockbuster", "shop": "video"}, "matchScore": 2, "suggestion": true},
-    "shop/video/Family Video": {"name": "Family Video", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "video", "brand:wikidata": "Q5433297"}, "addTags": {"brand": "Family Video", "brand:wikidata": "Q5433297", "brand:wikipedia": "en:Family Video", "name": "Family Video", "shop": "video"}, "removeTags": {"brand": "Family Video", "brand:wikidata": "Q5433297", "brand:wikipedia": "en:Family Video", "name": "Family Video", "shop": "video"}, "matchScore": 2, "suggestion": true},
-    "shop/video/TSUTAYA": {"name": "TSUTAYA", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "video", "brand:wikidata": "Q5193457"}, "addTags": {"brand": "TSUTAYA", "brand:wikidata": "Q5193457", "brand:wikipedia": "ja:カルチュア・コンビニエンス・クラブ", "name": "TSUTAYA", "shop": "video"}, "removeTags": {"brand": "TSUTAYA", "brand:wikidata": "Q5193457", "brand:wikipedia": "ja:カルチュア・コンビニエンス・クラブ", "name": "TSUTAYA", "shop": "video"}, "matchScore": 2, "suggestion": true},
-    "shop/video/ゲオ": {"name": "ゲオ", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "video", "brand:wikidata": "Q5533938"}, "addTags": {"brand": "GEO", "brand:wikidata": "Q5533938", "brand:wikipedia": "ja:ゲオ", "name": "ゲオ", "shop": "video"}, "removeTags": {"brand": "GEO", "brand:wikidata": "Q5533938", "brand:wikipedia": "ja:ゲオ", "name": "ゲオ", "shop": "video"}, "matchScore": 2, "suggestion": true},
+    "shop/video/Blockbuster": {"name": "Blockbuster", "icon": "temaki-movie_rental", "geometry": ["point", "area"], "tags": {"shop": "video", "brand:wikidata": "Q884711"}, "addTags": {"brand": "Blockbuster", "brand:wikidata": "Q884711", "brand:wikipedia": "en:Blockbuster LLC", "name": "Blockbuster", "shop": "video"}, "removeTags": {"brand": "Blockbuster", "brand:wikidata": "Q884711", "brand:wikipedia": "en:Blockbuster LLC", "name": "Blockbuster", "shop": "video"}, "matchScore": 2, "suggestion": true},
+    "shop/video/Family Video": {"name": "Family Video", "icon": "temaki-movie_rental", "geometry": ["point", "area"], "tags": {"shop": "video", "brand:wikidata": "Q5433297"}, "addTags": {"brand": "Family Video", "brand:wikidata": "Q5433297", "brand:wikipedia": "en:Family Video", "name": "Family Video", "shop": "video"}, "removeTags": {"brand": "Family Video", "brand:wikidata": "Q5433297", "brand:wikipedia": "en:Family Video", "name": "Family Video", "shop": "video"}, "matchScore": 2, "suggestion": true},
+    "shop/video/TSUTAYA": {"name": "TSUTAYA", "icon": "temaki-movie_rental", "geometry": ["point", "area"], "tags": {"shop": "video", "brand:wikidata": "Q5193457"}, "addTags": {"brand": "TSUTAYA", "brand:wikidata": "Q5193457", "brand:wikipedia": "ja:カルチュア・コンビニエンス・クラブ", "name": "TSUTAYA", "shop": "video"}, "removeTags": {"brand": "TSUTAYA", "brand:wikidata": "Q5193457", "brand:wikipedia": "ja:カルチュア・コンビニエンス・クラブ", "name": "TSUTAYA", "shop": "video"}, "matchScore": 2, "suggestion": true},
+    "shop/video/ゲオ": {"name": "ゲオ", "icon": "temaki-movie_rental", "geometry": ["point", "area"], "tags": {"shop": "video", "brand:wikidata": "Q5533938"}, "addTags": {"brand": "GEO", "brand:wikidata": "Q5533938", "brand:wikipedia": "ja:ゲオ", "name": "ゲオ", "shop": "video"}, "removeTags": {"brand": "GEO", "brand:wikidata": "Q5533938", "brand:wikipedia": "ja:ゲオ", "name": "ゲオ", "shop": "video"}, "matchScore": 2, "suggestion": true},
     "shop/watches/Swatch": {"name": "Swatch", "icon": "maki-watch", "geometry": ["point", "area"], "tags": {"shop": "watches", "brand:wikidata": "Q573422"}, "addTags": {"brand": "Swatch", "brand:wikidata": "Q573422", "brand:wikipedia": "en:Swatch", "name": "Swatch", "shop": "watches"}, "removeTags": {"brand": "Swatch", "brand:wikidata": "Q573422", "brand:wikipedia": "en:Swatch", "name": "Swatch", "shop": "watches"}, "matchScore": 2, "suggestion": true},
     "shop/wholesale/Costco": {"name": "Costco", "icon": "maki-warehouse", "geometry": ["point", "area"], "tags": {"shop": "wholesale", "brand:wikidata": "Q715583"}, "addTags": {"brand": "Costco", "brand:wikidata": "Q715583", "brand:wikipedia": "en:Costco", "name": "Costco", "shop": "wholesale", "operator": "Costco"}, "removeTags": {"brand": "Costco", "brand:wikidata": "Q715583", "brand:wikipedia": "en:Costco", "name": "Costco", "shop": "wholesale", "operator": "Costco"}, "matchScore": 2, "suggestion": true},
     "shop/wholesale/Makro": {"name": "Makro", "icon": "maki-warehouse", "geometry": ["point", "area"], "tags": {"shop": "wholesale", "brand:wikidata": "Q704606"}, "addTags": {"brand": "Makro", "brand:wikidata": "Q704606", "brand:wikipedia": "en:Makro", "name": "Makro", "shop": "wholesale"}, "removeTags": {"brand": "Makro", "brand:wikidata": "Q704606", "brand:wikipedia": "en:Makro", "name": "Makro", "shop": "wholesale"}, "matchScore": 2, "suggestion": true},

data/presets/presets/aerialway/chair_lift.json

@@ -1,4 +1,5 @@
 {
+    "icon": "temaki-chairlift",
     "geometry": [
         "line"
     ],

data/presets/presets/amenity/boat_rental.json

@@ -1,4 +1,5 @@
 {
+    "icon": "temaki-boating",
     "fields": [
         "name",
         "operator",

data/presets/presets/amenity/car_wash.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-car",
+    "icon": "temaki-car_wash",
     "fields": [
         "address",
         "building_area",

data/presets/presets/amenity/courthouse.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-town-hall",
+    "icon": "temaki-courthouse",
     "fields": [
         "name",
         "operator",

data/presets/presets/amenity/post_box.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-post",
+    "icon": "temaki-post_box",
     "fields": [
         "operator",
         "collection_times",

data/presets/presets/amenity/veterinary.json

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

data/presets/presets/attraction/carousel.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-horse-riding",
+    "icon": "temaki-amusement_park",
     "geometry": [
         "point",
         "area"

data/presets/presets/craft/plumber.json

@@ -1,5 +1,5 @@
 {
-    "icon": "temaki-tools",
+    "icon": "temaki-plumber",
     "geometry": [
         "point",
         "area"

data/presets/presets/healthcare/physiotherapist.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-hospital",
+    "icon": "temaki-physiotherapist",
     "geometry": [
         "point",
         "area"

data/presets/presets/leisure/adult_gaming_centre.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-casino",
+    "icon": "temaki-casino",
     "fields": [
         "{amenity/casino}"
     ],

data/presets/presets/office/accountant.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-suitcase",
+    "icon": "temaki-accounting",
     "geometry": [
         "point",
         "area"

data/presets/presets/office/estate_agent.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-suitcase",
+    "icon": "temaki-real_estate_agency",
     "geometry": [
         "point",
         "area"

data/presets/presets/piste/hike.json

@@ -1,5 +1,5 @@
 {
-    "icon": "fas-skating",
+    "icon": "temaki-snow_shoeing",
     "fields": [
         "name",
         "piste/type",

data/presets/presets/shop/caravan.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-car",
+    "icon": "temaki-rv_park",
     "fields": [
         "name",
         "brand",

data/presets/presets/shop/hairdresser.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-hairdresser",
+    "icon": "temaki-beauty_salon",
     "geometry": [
         "point",
         "area"

data/presets/presets/shop/massage.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shop",
+    "icon": "temaki-spa",
     "geometry": [
         "point",
         "area"

data/presets/presets/shop/outdoor.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shop",
+    "icon": "temaki-compass",
     "geometry": [
         "point",
         "area"
@@ -7,7 +7,10 @@
     "terms": [
         "camping",
         "climbing",
-        "hiking"
+        "hiking",
+        "outfitter",
+        "outdoor equipment",
+        "outdoor supplies"
     ],
     "tags": {
         "shop": "outdoor"

data/presets/presets/shop/video.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shop",
+    "icon": "temaki-movie_rental",
     "geometry": [
         "point",
         "area"

data/presets/presets/tourism/caravan_site.json

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

data/presets/presets/tourism/zoo.json

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

data/taginfo.json

@@ -21,7 +21,7 @@
     {"key": "advertising", "value": "column", "description": "🄿 Advertising Column", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/storage_tank.svg?sanitize=true"},
     {"key": "aerialway", "value": "station", "description": "🄿 Aerialway Station (unsearchable)", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/aerialway-15.svg?sanitize=true"},
     {"key": "aerialway", "value": "cable_car", "description": "🄿 Cable Car", "object_types": ["way"]},
-    {"key": "aerialway", "value": "chair_lift", "description": "🄿 Chair Lift", "object_types": ["way"]},
+    {"key": "aerialway", "value": "chair_lift", "description": "🄿 Chair Lift", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/chairlift.svg?sanitize=true"},
     {"key": "aerialway", "value": "drag_lift", "description": "🄿 Drag Lift", "object_types": ["way"]},
     {"key": "aerialway", "value": "gondola", "description": "🄿 Gondola", "object_types": ["way"]},
     {"key": "aerialway", "value": "goods", "description": "🄿 Goods Aerialway", "object_types": ["way"]},
@@ -61,13 +61,13 @@
     {"key": "amenity", "value": "bicycle_rental", "description": "🄿 Bicycle Rental", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/bicycle-15.svg?sanitize=true"},
     {"key": "amenity", "value": "bicycle_repair_station", "description": "🄿 Bicycle Repair Tool Stand", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/bicycle-15.svg?sanitize=true"},
     {"key": "amenity", "value": "biergarten", "description": "🄿 Biergarten", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/beer-15.svg?sanitize=true"},
-    {"key": "amenity", "value": "boat_rental", "description": "🄿 Boat Rental", "object_types": ["node", "area"]},
+    {"key": "amenity", "value": "boat_rental", "description": "🄿 Boat Rental", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/boating.svg?sanitize=true"},
     {"key": "amenity", "value": "bureau_de_change", "description": "🄿 Currency Exchange", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/bank-15.svg?sanitize=true"},
     {"key": "amenity", "value": "cafe", "description": "🄿 Cafe", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/cafe-15.svg?sanitize=true"},
     {"key": "amenity", "value": "car_pooling", "description": "🄿 Car Pooling", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/car-15.svg?sanitize=true"},
     {"key": "amenity", "value": "car_rental", "description": "🄿 Car Rental", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/car-rental-15.svg?sanitize=true"},
     {"key": "amenity", "value": "car_sharing", "description": "🄿 Car Sharing", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/car-15.svg?sanitize=true"},
-    {"key": "amenity", "value": "car_wash", "description": "🄿 Car Wash", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/car-15.svg?sanitize=true"},
+    {"key": "amenity", "value": "car_wash", "description": "🄿 Car Wash", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/car_wash.svg?sanitize=true"},
     {"key": "amenity", "value": "casino", "description": "🄿 Casino", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/casino-15.svg?sanitize=true"},
     {"key": "amenity", "value": "charging_station", "description": "🄿 Charging Station", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-charging-station.svg?sanitize=true"},
     {"key": "amenity", "value": "childcare", "description": "🄿 Nursery/Childcare", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/school-15.svg?sanitize=true"},
@@ -79,7 +79,7 @@
     {"key": "amenity", "value": "college", "description": "🄿 College Grounds", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/college-15.svg?sanitize=true"},
     {"key": "amenity", "value": "community_centre", "description": "🄿 Community Center", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/town-hall-15.svg?sanitize=true"},
     {"key": "amenity", "value": "compressed_air", "description": "🄿 Compressed Air", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/car-15.svg?sanitize=true"},
-    {"key": "amenity", "value": "courthouse", "description": "🄿 Courthouse", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/town-hall-15.svg?sanitize=true"},
+    {"key": "amenity", "value": "courthouse", "description": "🄿 Courthouse", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/courthouse.svg?sanitize=true"},
     {"key": "amenity", "value": "crematorium", "description": "🄿 Crematorium", "object_types": ["area", "node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/cemetery-15.svg?sanitize=true"},
     {"key": "amenity", "value": "dentist", "description": "🄿 Dentist", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/dentist-15.svg?sanitize=true"},
     {"key": "amenity", "value": "dive_centre", "description": "🄿 Dive Center", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/swimming-15.svg?sanitize=true"},
@@ -133,7 +133,7 @@
     {"key": "religion", "value": "taoist", "description": "🄿 Taoist Temple", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/taoism.svg?sanitize=true"},
     {"key": "amenity", "value": "planetarium", "description": "🄿 Planetarium", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/museum-15.svg?sanitize=true"},
     {"key": "amenity", "value": "police", "description": "🄿 Police", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/police-15.svg?sanitize=true"},
-    {"key": "amenity", "value": "post_box", "description": "🄿 Mailbox", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/post-15.svg?sanitize=true"},
+    {"key": "amenity", "value": "post_box", "description": "🄿 Mailbox", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/post_box.svg?sanitize=true"},
     {"key": "amenity", "value": "post_office", "description": "🄿 Post Office", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/post-15.svg?sanitize=true"},
     {"key": "amenity", "value": "prison", "description": "🄿 Prison Grounds", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/prison-15.svg?sanitize=true"},
     {"key": "amenity", "value": "pub", "description": "🄿 Pub", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/beer-15.svg?sanitize=true"},
@@ -202,7 +202,7 @@
     {"key": "vending", "value": "public_transport_tickets", "description": "🄿 Transit Ticket Vending Machine", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/vending_machine.svg?sanitize=true"},
     {"key": "vending", "value": "stamps", "description": "🄿 Postage Vending Machine", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/vending_machine.svg?sanitize=true"},
     {"key": "vending", "value": "sweets", "description": "🄿 Snack Vending Machine", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/vending_machine.svg?sanitize=true"},
-    {"key": "amenity", "value": "veterinary", "description": "🄿 Veterinary", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/veterinary-15.svg?sanitize=true"},
+    {"key": "amenity", "value": "veterinary", "description": "🄿 Veterinary", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/veterinary_care.svg?sanitize=true"},
     {"key": "amenity", "value": "waste_basket", "description": "🄿 Waste Basket", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/waste-basket-15.svg?sanitize=true"},
     {"key": "amenity", "value": "waste_disposal", "description": "🄿 Garbage Dumpster", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/waste-basket-15.svg?sanitize=true"},
     {"key": "amenity", "value": "waste_transfer_station", "description": "🄿 Waste Transfer Station", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/waste-basket-15.svg?sanitize=true"},
@@ -216,7 +216,7 @@
     {"key": "attraction", "value": "big_wheel", "description": "🄿 Big Wheel", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/amusement-park-15.svg?sanitize=true"},
     {"key": "attraction", "value": "bumper_car", "description": "🄿 Bumper Car", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/car-15.svg?sanitize=true"},
     {"key": "attraction", "value": "bungee_jumping", "description": "🄿 Bungee Jumping", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/pitch-15.svg?sanitize=true"},
-    {"key": "attraction", "value": "carousel", "description": "🄿 Carousel", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/horse-riding-15.svg?sanitize=true"},
+    {"key": "attraction", "value": "carousel", "description": "🄿 Carousel", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/amusement_park.svg?sanitize=true"},
     {"key": "attraction", "value": "dark_ride", "description": "🄿 Dark Ride", "object_types": ["node", "way", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/rail-metro-15.svg?sanitize=true"},
     {"key": "attraction", "value": "drop_tower", "description": "🄿 Drop Tower", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/tower.svg?sanitize=true"},
     {"key": "attraction", "value": "maze", "description": "🄿 Maze", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/amusement-park-15.svg?sanitize=true"},
@@ -337,7 +337,7 @@
     {"key": "craft", "value": "photographer", "description": "🄿 Photographer", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/attraction-15.svg?sanitize=true"},
     {"key": "craft", "value": "photographic_laboratory", "description": "🄿 Photographic Laboratory", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/attraction-15.svg?sanitize=true"},
     {"key": "craft", "value": "plasterer", "description": "🄿 Plasterer", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/tools.svg?sanitize=true"},
-    {"key": "craft", "value": "plumber", "description": "🄿 Plumber", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/tools.svg?sanitize=true"},
+    {"key": "craft", "value": "plumber", "description": "🄿 Plumber", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/plumber.svg?sanitize=true"},
     {"key": "craft", "value": "pottery", "description": "🄿 Pottery", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/art-gallery-15.svg?sanitize=true"},
     {"key": "craft", "value": "rigger", "description": "🄿 Rigger", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/tools.svg?sanitize=true"},
     {"key": "craft", "value": "roofer", "description": "🄿 Roofer", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/tools.svg?sanitize=true"},
@@ -391,7 +391,7 @@
     {"key": "healthcare", "value": "midwife", "description": "🄿 Midwife", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/hospital-15.svg?sanitize=true"},
     {"key": "healthcare", "value": "occupational_therapist", "description": "🄿 Occupational Therapist", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/hospital-15.svg?sanitize=true"},
     {"key": "healthcare", "value": "optometrist", "description": "🄿 Optometrist", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/hospital-15.svg?sanitize=true"},
-    {"key": "healthcare", "value": "physiotherapist", "description": "🄿 Physiotherapist", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/hospital-15.svg?sanitize=true"},
+    {"key": "healthcare", "value": "physiotherapist", "description": "🄿 Physiotherapist", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/physiotherapist.svg?sanitize=true"},
     {"key": "healthcare", "value": "podiatrist", "description": "🄿 Podiatrist", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/hospital-15.svg?sanitize=true"},
     {"key": "healthcare", "value": "psychotherapist", "description": "🄿 Psychotherapist", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/hospital-15.svg?sanitize=true"},
     {"key": "healthcare", "value": "rehabilitation", "description": "🄿 Rehabilitation Facility", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/hospital-15.svg?sanitize=true"},
@@ -510,7 +510,7 @@
     {"key": "landuse", "value": "retail", "description": "🄿 Retail Area", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/commercial-15.svg?sanitize=true"},
     {"key": "landuse", "value": "vineyard", "description": "🄿 Vineyard", "object_types": ["area"]},
     {"key": "leisure", "description": "🄿 Leisure, 🄵 Type", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/pitch-15.svg?sanitize=true"},
-    {"key": "leisure", "value": "adult_gaming_centre", "description": "🄿 Adult Gaming Center", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/casino-15.svg?sanitize=true"},
+    {"key": "leisure", "value": "adult_gaming_centre", "description": "🄿 Adult Gaming Center", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/casino.svg?sanitize=true"},
     {"key": "leisure", "value": "amusement_arcade", "description": "🄿 Amusement Arcade", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/gaming-15.svg?sanitize=true"},
     {"key": "leisure", "value": "bandstand", "description": "🄿 Bandstand", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/music-15.svg?sanitize=true"},
     {"key": "leisure", "value": "beach_resort", "description": "🄿 Beach Resort", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/beach-15.svg?sanitize=true"},
@@ -658,7 +658,7 @@
     {"key": "office", "value": "administrative", "description": "🄿 Administrative Office (unsearchable)", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/suitcase-15.svg?sanitize=true"},
     {"key": "office", "value": "physician", "description": "🄿 Physician (unsearchable)", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/suitcase-15.svg?sanitize=true"},
     {"key": "office", "value": "travel_agent", "description": "🄿 Travel Agency (unsearchable)", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/suitcase-15.svg?sanitize=true"},
-    {"key": "office", "value": "accountant", "description": "🄿 Accountant Office", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/suitcase-15.svg?sanitize=true"},
+    {"key": "office", "value": "accountant", "description": "🄿 Accountant Office", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/accounting.svg?sanitize=true"},
     {"key": "office", "value": "adoption_agency", "description": "🄿 Adoption Agency", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/suitcase-15.svg?sanitize=true"},
     {"key": "office", "value": "advertising_agency", "description": "🄿 Advertising Agency", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/suitcase-15.svg?sanitize=true"},
     {"key": "office", "value": "architect", "description": "🄿 Architect Office", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/suitcase-15.svg?sanitize=true"},
@@ -669,7 +669,7 @@
     {"key": "office", "value": "educational_institution", "description": "🄿 Educational Institution", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/school-15.svg?sanitize=true"},
     {"key": "office", "value": "employment_agency", "description": "🄿 Employment Agency", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/suitcase-15.svg?sanitize=true"},
     {"key": "office", "value": "energy_supplier", "description": "🄿 Energy Supplier Office", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/suitcase-15.svg?sanitize=true"},
-    {"key": "office", "value": "estate_agent", "description": "🄿 Real Estate Office", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/suitcase-15.svg?sanitize=true"},
+    {"key": "office", "value": "estate_agent", "description": "🄿 Real Estate Office", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/real_estate_agency.svg?sanitize=true"},
     {"key": "office", "value": "financial", "description": "🄿 Financial Office", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/suitcase-15.svg?sanitize=true"},
     {"key": "office", "value": "forestry", "description": "🄿 Forestry Office", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/suitcase-15.svg?sanitize=true"},
     {"key": "office", "value": "foundation", "description": "🄿 Foundation Office", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/suitcase-15.svg?sanitize=true"},
@@ -697,7 +697,7 @@
     {"key": "office", "value": "water_utility", "description": "🄿 Water Utility Office", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/suitcase-15.svg?sanitize=true"},
     {"key": "piste:type", "value": "downhill", "description": "🄿 Downhill Piste/Ski Run, 🄵 Type", "object_types": ["way", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-skiing.svg?sanitize=true"},
     {"key": "man_made", "value": "piste:halfpipe", "description": "🄿 Halfpipe", "object_types": ["way", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-snowboarding.svg?sanitize=true"},
-    {"key": "piste:type", "value": "hike", "description": "🄿 Snowshoeing or Winter Hiking Trail, 🄵 Type", "object_types": ["way", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-skating.svg?sanitize=true"},
+    {"key": "piste:type", "value": "hike", "description": "🄿 Snowshoeing or Winter Hiking Trail, 🄵 Type", "object_types": ["way", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/snow_shoeing.svg?sanitize=true"},
     {"key": "piste:type", "value": "ice_skate", "description": "🄿 Ice Skating Piste, 🄵 Type", "object_types": ["way", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-skating.svg?sanitize=true"},
     {"key": "piste:type", "value": "nordic", "description": "🄿 Nordic or Crosscountry Piste/Ski Trail, 🄵 Type", "object_types": ["way", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-skiing-nordic.svg?sanitize=true"},
     {"key": "piste:type", "description": "🄿 Winter Sport Trails", "object_types": ["way", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-skiing.svg?sanitize=true"},
@@ -818,7 +818,7 @@
     {"key": "shop", "value": "car_parts", "description": "🄿 Car Parts Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/car-15.svg?sanitize=true"},
     {"key": "shop", "value": "car_repair", "description": "🄿 Car Repair Shop", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/car-repair-15.svg?sanitize=true"},
     {"key": "shop", "value": "car", "description": "🄿 Car Dealership", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/car-15.svg?sanitize=true"},
-    {"key": "shop", "value": "caravan", "description": "🄿 RV Dealership", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/car-15.svg?sanitize=true"},
+    {"key": "shop", "value": "caravan", "description": "🄿 RV Dealership", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/rv_park.svg?sanitize=true"},
     {"key": "shop", "value": "carpet", "description": "🄿 Carpet Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"},
     {"key": "shop", "value": "catalogue", "description": "🄿 Catalog Shop", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"},
     {"key": "shop", "value": "charity", "description": "🄿 Charity Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"},
@@ -858,7 +858,7 @@
     {"key": "shop", "value": "gift", "description": "🄿 Gift Shop", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/gift-15.svg?sanitize=true"},
     {"key": "shop", "value": "greengrocer", "description": "🄿 Greengrocer", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"},
     {"key": "shop", "value": "hairdresser_supply", "description": "🄿 Hairdresser Supply Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"},
-    {"key": "shop", "value": "hairdresser", "description": "🄿 Hairdresser", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/hairdresser-15.svg?sanitize=true"},
+    {"key": "shop", "value": "hairdresser", "description": "🄿 Hairdresser", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/beauty_salon.svg?sanitize=true"},
     {"key": "shop", "value": "hardware", "description": "🄿 Hardware Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/tools.svg?sanitize=true"},
     {"key": "shop", "value": "health_food", "description": "🄿 Health Food Shop", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"},
     {"key": "shop", "value": "hearing_aids", "description": "🄿 Hearing Aids Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"},
@@ -875,7 +875,7 @@
     {"key": "shop", "value": "locksmith", "description": "🄿 Locksmith", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-key.svg?sanitize=true"},
     {"key": "shop", "value": "lottery", "description": "🄿 Lottery Shop", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"},
     {"key": "shop", "value": "mall", "description": "🄿 Mall", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"},
-    {"key": "shop", "value": "massage", "description": "🄿 Massage Shop", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"},
+    {"key": "shop", "value": "massage", "description": "🄿 Massage Shop", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/spa.svg?sanitize=true"},
     {"key": "shop", "value": "medical_supply", "description": "🄿 Medical Supply Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"},
     {"key": "shop", "value": "mobile_phone", "description": "🄿 Mobile Phone Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/mobile-phone-15.svg?sanitize=true"},
     {"key": "shop", "value": "money_lender", "description": "🄿 Money Lender", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/bank-15.svg?sanitize=true"},
@@ -887,7 +887,7 @@
     {"key": "shop", "value": "nutrition_supplements", "description": "🄿 Nutrition Supplements Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"},
     {"key": "shop", "value": "optician", "description": "🄿 Optician", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/optician-15.svg?sanitize=true"},
     {"key": "organic", "value": "only", "description": "🄿 Organic Goods Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"},
-    {"key": "shop", "value": "outdoor", "description": "🄿 Outdoors Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"},
+    {"key": "shop", "value": "outdoor", "description": "🄿 Outdoors Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/compass.svg?sanitize=true"},
     {"key": "shop", "value": "paint", "description": "🄿 Paint Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-paint-roller.svg?sanitize=true"},
     {"key": "shop", "value": "party", "description": "🄿 Party Supply Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"},
     {"key": "shop", "value": "pastry", "description": "🄿 Pastry Shop", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/bakery-15.svg?sanitize=true"},
@@ -921,7 +921,7 @@
     {"key": "shop", "value": "vacuum_cleaner", "description": "🄿 Vacuum Cleaner Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"},
     {"key": "shop", "value": "variety_store", "description": "🄿 Variety Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"},
     {"key": "shop", "value": "video_games", "description": "🄿 Video Game Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/gaming-15.svg?sanitize=true"},
-    {"key": "shop", "value": "video", "description": "🄿 Video Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"},
+    {"key": "shop", "value": "video", "description": "🄿 Video Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/movie_rental.svg?sanitize=true"},
     {"key": "shop", "value": "watches", "description": "🄿 Watches Shop", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/watch-15.svg?sanitize=true"},
     {"key": "shop", "value": "water_sports", "description": "🄿 Watersport/Swim Shop", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"},
     {"key": "shop", "value": "water", "description": "🄿 Drinking Water Shop", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"},
@@ -939,7 +939,7 @@
     {"key": "artwork_type", "value": "statue", "description": "🄿 Statue", "object_types": ["node", "way", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/art-gallery-15.svg?sanitize=true"},
     {"key": "tourism", "value": "attraction", "description": "🄿 Tourist Attraction", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/star-15.svg?sanitize=true"},
     {"key": "tourism", "value": "camp_site", "description": "🄿 Campground", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/campsite-15.svg?sanitize=true"},
-    {"key": "tourism", "value": "caravan_site", "description": "🄿 RV Park", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/bus-15.svg?sanitize=true"},
+    {"key": "tourism", "value": "caravan_site", "description": "🄿 RV Park", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/rv_park.svg?sanitize=true"},
     {"key": "tourism", "value": "chalet", "description": "🄿 Holiday Cottage", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/lodging-15.svg?sanitize=true"},
     {"key": "tourism", "value": "gallery", "description": "🄿 Art Gallery", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/art-gallery-15.svg?sanitize=true"},
     {"key": "tourism", "value": "guest_house", "description": "🄿 Guest House", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/lodging-15.svg?sanitize=true"},
@@ -957,7 +957,7 @@
     {"key": "tourism", "value": "trail_riding_station", "description": "🄿 Trail Riding Station", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/horse-riding-15.svg?sanitize=true"},
     {"key": "tourism", "value": "viewpoint", "description": "🄿 Viewpoint", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/binoculars.svg?sanitize=true"},
     {"key": "tourism", "value": "wilderness_hut", "description": "🄿 Wilderness Hut", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/lodging-15.svg?sanitize=true"},
-    {"key": "tourism", "value": "zoo", "description": "🄿 Zoo", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/zoo-15.svg?sanitize=true"},
+    {"key": "tourism", "value": "zoo", "description": "🄿 Zoo", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/zoo.svg?sanitize=true"},
     {"key": "traffic_calming", "description": "🄿 Traffic Calming, 🄵 Type", "object_types": ["node", "way", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/diamond.svg?sanitize=true"},
     {"key": "traffic_calming", "value": "bump", "description": "🄿 Speed Bump", "object_types": ["node", "way"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/diamond.svg?sanitize=true"},
     {"key": "traffic_calming", "value": "chicane", "description": "🄿 Traffic Chicane", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/diamond.svg?sanitize=true"},

dist/locales/en.json

@@ -7336,7 +7336,7 @@
                 },
                 "shop/outdoor": {
                     "name": "Outdoors Store",
-                    "terms": "camping,climbing,hiking"
+                    "terms": "camping,climbing,hiking,outfitter,outdoor equipment,outdoor supplies"
                 },
                 "shop/paint": {
                     "name": "Paint Store",

package.json

@@ -89,7 +89,7 @@
     "sinon-chai": "^3.1.0",
     "smash": "0.0",
     "svg-sprite": "1.5.0",
-    "temaki": "1.1.0",
+    "temaki": "1.2.0",
     "uglify-js": "~3.4.0",
     "xml2js": "^0.4.17",
     "xmlbuilder": "^10.0.0"