From 23d7e7594359d7105e919429258178109cb14a31 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Sat, 21 Dec 2019 14:22:49 -0500 Subject: [PATCH] Update to temaki v3.8.0 --- CHANGELOG.md | 2 +- data/presets/presets.json | 22 +++++++++---------- data/presets/presets/amenity/parking.json | 2 +- data/presets/presets/building/cabin.json | 2 +- data/presets/presets/craft/blacksmith.json | 2 +- data/presets/presets/tourism/alpine_hut.json | 2 +- data/presets/presets/tourism/chalet.json | 2 +- data/presets/presets/tourism/hostel.json | 2 +- .../presets/tourism/wilderness_hut.json | 2 +- data/taginfo.json | 14 ++++++------ package.json | 2 +- 11 files changed, 27 insertions(+), 27 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 75dddf400..220e63570 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -226,7 +226,7 @@ _Breaking changes, which may affect downstream projects or sites that embed iD, * Update icons for Gate, Kissing Gate, and Cattle Grid ([#6814], [#6489]) * Update icon for Park to be different from Tree ([#6633]) * Update icons for Bunker and Military Bunker ([#7139]) -* Update icons for presets: diplomatic offices, marked crossings, transit platforms, buoys, Billboard, Jet Bridge, Scrap Yard, Bicycle Parking Garage, Bicycle Lockers, Bicycle Rental, Bicycle Repair Tool Stand, Boat Rental, Car Pooling Station, Car Sharing Station, Multilevel Parking Garage, Underground Parking, Park & Ride Lot, Lean-To, Picnic Shelter, Transit Shelter, Block, Chain, Height Restrictor, Turnstile, Barn, Stable, Basket Maker, Boar Builder, Handicraft, Pottery, Indoor Corridor, Cycle & Foot Path, Street Lamp, Commemorative Plaque, Fire Pit, Pier, Floating Pier, Minaret, Tunnel Area, Water Tower, Grassland, Grass, Tree Row, Energy Supplier Office, Insurance Office, Slide, Water Slide, Play Structure, Underground Power Cable, Chocolate Store, Lighting Store, Motorcycle Repair Shop, Storage Rental, Art Installation, Sculpture, Statue, Coastline, Boat Store, Boatyard +* Update icons for presets: diplomatic offices, marked crossings, transit platforms, buoys, Billboard, Jet Bridge, Scrap Yard, Bicycle Parking Garage, Bicycle Lockers, Bicycle Rental, Bicycle Repair Tool Stand, Boat Rental, Car Pooling Station, Car Sharing Station, Parking Lot, Multilevel Parking Garage, Underground Parking, Park & Ride Lot, Lean-To, Picnic Shelter, Transit Shelter, Block, Chain, Height Restrictor, Turnstile, Barn, Stable, Basket Maker, Boar Builder, Handicraft, Pottery, Indoor Corridor, Cycle & Foot Path, Street Lamp, Commemorative Plaque, Fire Pit, Pier, Floating Pier, Minaret, Tunnel Area, Water Tower, Grassland, Grass, Tree Row, Energy Supplier Office, Insurance Office, Slide, Water Slide, Play Structure, Underground Power Cable, Chocolate Store, Lighting Store, Motorcycle Repair Shop, Storage Rental, Art Installation, Sculpture, Statue, Coastline, Boat Store, Boatyard, Cabin, Holiday Cottage, Alpine Hut, Wilderness Hut, Hostel, Blacksmith * Add "tree" as a search term for Natural Wood and Managed Forest ([#7097]) * Add "packstation" as a search term for package pickup and dropoff lockers ([#7052]) * Add "pilates" as a search term for Gym / Fitness Center ([#7137]) diff --git a/data/presets/presets.json b/data/presets/presets.json index fd50547da..fde12b06e 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -150,7 +150,7 @@ "amenity/nightclub/lgbtq": {"icon": "maki-bar", "geometry": ["point", "area"], "tags": {"amenity": "nightclub", "lgbtq": "primary"}, "terms": ["gay nightclub", "lesbian nightclub", "lgbtq nightclub", "lgbt nightclub", "lgb nightclub"], "name": "LGBTQ+ Nightclub"}, "amenity/parking_entrance": {"icon": "maki-entrance-alt1", "fields": ["ref", "access_simple", "address", "level"], "geometry": ["vertex"], "tags": {"amenity": "parking_entrance"}, "name": "Parking Garage Entrance/Exit"}, "amenity/parking_space": {"fields": ["capacity"], "geometry": ["area", "point", "vertex"], "terms": [], "tags": {"amenity": "parking_space"}, "matchScore": 0.95, "name": "Parking Space"}, - "amenity/parking": {"icon": "maki-car", "fields": ["operator", "operator/type", "parking", "capacity", "access_simple", "fee", "payment_multi_fee", "charge_fee", "surface"], "moreFields": ["address", "covered", "email", "fax", "maxstay", "name", "opening_hours", "park_ride", "phone", "ref", "supervised", "website", "wheelchair"], "geometry": ["area", "point", "vertex"], "tags": {"amenity": "parking"}, "terms": ["automobile parking", "car lot", "car parking", "rv parking", "truck parking", "vehicle parking"], "name": "Parking Lot"}, + "amenity/parking": {"icon": "temaki-car_parked", "fields": ["operator", "operator/type", "parking", "capacity", "access_simple", "fee", "payment_multi_fee", "charge_fee", "surface"], "moreFields": ["address", "covered", "email", "fax", "maxstay", "name", "opening_hours", "park_ride", "phone", "ref", "supervised", "website", "wheelchair"], "geometry": ["area", "point", "vertex"], "tags": {"amenity": "parking"}, "terms": ["automobile parking", "car lot", "car parking", "rv parking", "truck parking", "vehicle parking"], "name": "Parking Lot"}, "amenity/parking/multi-storey": {"icon": "temaki-car_structure", "fields": ["name", "{amenity/parking}", "building"], "moreFields": ["{amenity/parking}", "height", "levels"], "geometry": ["area"], "tags": {"amenity": "parking", "parking": "multi-storey"}, "addTags": {"building": "parking", "amenity": "parking", "parking": "multi-storey"}, "reference": {"key": "parking", "value": "multi-storey"}, "terms": ["car", "indoor parking", "multistorey car park", "parkade", "parking building", "parking deck", "parking garage", "parking ramp", "parking structure"], "matchScore": 1.05, "name": "Multilevel Parking Garage"}, "amenity/parking/park_ride": {"icon": "temaki-sign_and_car", "geometry": ["area", "point", "vertex"], "tags": {"amenity": "parking", "park_ride": "yes"}, "reference": {"key": "park_ride", "value": "yes"}, "terms": ["commuter parking lot", "incentive parking lot", "metro parking lot", "park and pool lot", "park and ride lot", "P+R", "public transport parking lot", "public transit parking lot", "train parking lot"], "name": "Park & Ride Lot"}, "amenity/parking/underground": {"icon": "temaki-car_structure", "fields": ["{amenity/parking}", "layer"], "geometry": ["area", "point", "vertex"], "tags": {"amenity": "parking", "parking": "underground"}, "addTags": {"amenity": "parking", "parking": "underground", "layer": "-1"}, "reference": {"key": "parking", "value": "underground"}, "terms": ["automobile parking", "car lot", "car parking", "rv parking", "subsurface parking", "truck parking", "vehicle parking"], "matchScore": 1.05, "name": "Underground Parking"}, @@ -335,7 +335,7 @@ "building/barn": {"icon": "temaki-barn", "geometry": ["area"], "tags": {"building": "barn"}, "matchScore": 0.5, "name": "Barn"}, "building/boathouse": {"icon": "maki-harbor", "geometry": ["area"], "tags": {"building": "boathouse"}, "matchScore": 0.5, "terms": [], "name": "Boathouse"}, "building/bungalow": {"icon": "maki-home", "geometry": ["area"], "tags": {"building": "bungalow"}, "terms": ["home", "detached"], "matchScore": 0.5, "name": "Bungalow"}, - "building/cabin": {"icon": "maki-home", "geometry": ["area"], "tags": {"building": "cabin"}, "matchScore": 0.5, "name": "Cabin"}, + "building/cabin": {"icon": "temaki-cabin", "geometry": ["area"], "tags": {"building": "cabin"}, "matchScore": 0.5, "name": "Cabin"}, "building/carport": {"icon": "fas-warehouse", "fields": ["{building}", "capacity"], "geometry": ["area"], "tags": {"building": "carport"}, "matchScore": 0.5, "terms": ["covered parking space", "garage", "car", "porch"], "name": "Carport"}, "building/cathedral": {"icon": "maki-place-of-worship", "geometry": ["area"], "tags": {"building": "cathedral"}, "matchScore": 0.5, "name": "Cathedral Building"}, "building/chapel": {"icon": "maki-place-of-worship", "geometry": ["area"], "tags": {"building": "chapel"}, "matchScore": 0.5, "name": "Chapel Building"}, @@ -387,7 +387,7 @@ "craft/agricultural_engines": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"craft": "agricultural_engines"}, "name": "Argricultural Engines Mechanic"}, "craft/basket_maker": {"icon": "temaki-vase", "geometry": ["point", "area"], "tags": {"craft": "basket_maker"}, "name": "Basket Maker"}, "craft/beekeeper": {"icon": "maki-farm", "geometry": ["point", "area"], "tags": {"craft": "beekeeper"}, "name": "Beekeeper"}, - "craft/blacksmith": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"craft": "blacksmith"}, "name": "Blacksmith"}, + "craft/blacksmith": {"icon": "temaki-anvil_and_hammer", "geometry": ["point", "area"], "tags": {"craft": "blacksmith"}, "name": "Blacksmith"}, "craft/boatbuilder": {"icon": "temaki-boat_repair", "geometry": ["point", "area"], "tags": {"craft": "boatbuilder"}, "matchScore": 0.6, "name": "Boat Builder"}, "craft/bookbinder": {"icon": "maki-library", "geometry": ["point", "area"], "terms": ["book repair"], "tags": {"craft": "bookbinder"}, "name": "Bookbinder"}, "craft/brewery": {"icon": "temaki-storage_fermenter", "fields": ["{craft}", "product"], "moreFields": ["{craft}", "min_age"], "geometry": ["point", "area"], "terms": ["alcohol", "beer", "beverage", "bier", "booze", "cider"], "tags": {"craft": "brewery"}, "name": "Brewery"}, @@ -1171,7 +1171,7 @@ "shop/window_blind": {"icon": "temaki-window", "geometry": ["point", "area"], "tags": {"shop": "window_blind"}, "name": "Window Blind Store"}, "shop/wine": {"icon": "maki-alcohol-shop", "moreFields": ["{shop}", "min_age"], "geometry": ["point", "area"], "tags": {"shop": "wine"}, "name": "Wine Shop"}, "telecom/data_center": {"icon": "fas-server", "fields": ["name", "ref", "operator", "building_area"], "moreFields": ["address", "gnis/feature_id", "phone", "website"], "geometry": ["point", "area"], "tags": {"telecom": "data_center"}, "terms": ["computer systems storage", "information technology", "server farm", "the cloud", "telecommunications"], "name": "Data Center"}, - "tourism/alpine_hut": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "internet_access", "internet_access/fee", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["email", "fax", "gnis/feature_id", "internet_access/ssid", "phone", "reservation", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["climbing hut"], "tags": {"tourism": "alpine_hut"}, "name": "Alpine Hut"}, + "tourism/alpine_hut": {"icon": "temaki-cabin", "fields": ["name", "operator", "address", "building_area", "internet_access", "internet_access/fee", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["email", "fax", "gnis/feature_id", "internet_access/ssid", "phone", "reservation", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["climbing hut"], "tags": {"tourism": "alpine_hut"}, "name": "Alpine Hut"}, "tourism/apartment": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "rooms", "internet_access", "internet_access/fee"], "moreFields": ["building/levels_building", "email", "fax", "height_building", "internet_access/ssid", "level", "payment_multi", "phone", "reservation", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"tourism": "apartment"}, "name": "Guest Apartment / Condo"}, "tourism/aquarium": {"icon": "maki-aquarium", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["charge_fee", "email", "fax", "fee", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi_fee", "phone", "ref/vatin", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["fish", "sea", "water"], "tags": {"tourism": "aquarium"}, "name": "Aquarium"}, "tourism/artwork": {"icon": "maki-art-gallery", "fields": ["name", "artwork_type", "artist"], "moreFields": ["level", "material", "website"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "artwork"}, "terms": ["mural", "sculpture", "statue"], "name": "Artwork"}, @@ -1185,10 +1185,10 @@ "tourism/camp_pitch": {"icon": "maki-campsite", "fields": ["name", "ref"], "geometry": ["point", "area"], "terms": ["tent", "rv"], "tags": {"tourism": "camp_pitch"}, "name": "Camp Pitch"}, "tourism/camp_site": {"icon": "maki-campsite", "fields": ["name", "operator", "address", "access_simple", "capacity", "fee", "payment_multi_fee", "charge_fee", "internet_access", "internet_access/fee"], "moreFields": ["email", "fax", "gnis/feature_id", "internet_access/ssid", "phone", "power_supply", "ref/vatin", "reservation", "sanitary_dump_station", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["tent", "rv"], "tags": {"tourism": "camp_site"}, "name": "Campground"}, "tourism/caravan_site": {"icon": "temaki-rv_park", "fields": ["name", "address", "capacity", "sanitary_dump_station", "power_supply", "internet_access", "internet_access/fee"], "moreFields": ["charge_fee", "email", "fax", "fee", "gnis/feature_id", "internet_access/ssid", "operator", "payment_multi_fee", "phone", "reservation", "smoking", "website", "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", "internet_access/fee"], "moreFields": ["air_conditioning", "building/levels_building", "email", "fax", "gnis/feature_id", "height_building", "internet_access/ssid", "payment_multi", "phone", "reservation", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["holiday", "holiday cottage", "holiday home", "vacation", "vacation home"], "tags": {"tourism": "chalet"}, "name": "Holiday Cottage"}, + "tourism/chalet": {"icon": "temaki-cabin", "fields": ["name", "operator", "address", "building_area", "internet_access", "internet_access/fee"], "moreFields": ["air_conditioning", "building/levels_building", "email", "fax", "gnis/feature_id", "height_building", "internet_access/ssid", "payment_multi", "phone", "reservation", "smoking", "website", "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": ["email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi", "phone", "ref/vatin", "website", "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", "guest_house", "address", "building_area", "rooms", "internet_access", "internet_access/fee"], "moreFields": ["air_conditioning", "building/levels_building", "email", "fax", "gnis/feature_id", "height_building", "internet_access/ssid", "payment_multi", "phone", "ref/vatin", "reservation", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"tourism": "guest_house"}, "terms": ["B&B", "Bed and Breakfast"], "name": "Guest House"}, - "tourism/hostel": {"icon": "maki-lodging", "fields": ["{tourism/guest_house}"], "moreFields": ["{tourism/guest_house}"], "geometry": ["point", "area"], "tags": {"tourism": "hostel"}, "name": "Hostel"}, + "tourism/hostel": {"icon": "temaki-bunk_beds", "fields": ["{tourism/guest_house}"], "moreFields": ["{tourism/guest_house}"], "geometry": ["point", "area"], "tags": {"tourism": "hostel"}, "name": "Hostel"}, "tourism/hotel": {"icon": "fas-concierge-bell", "fields": ["{tourism/motel}"], "moreFields": ["{tourism/motel}", "bar", "stars"], "geometry": ["point", "area"], "tags": {"tourism": "hotel"}, "name": "Hotel"}, "tourism/information": {"icon": "maki-information", "fields": ["information", "operator", "address", "building_area"], "moreFields": ["level"], "geometry": ["point", "vertex", "area"], "tags": {"tourism": "information"}, "name": "Information"}, "tourism/information/board": {"icon": "maki-information", "fields": ["name", "operator", "board_type", "direction"], "geometry": ["point", "vertex"], "tags": {"tourism": "information", "information": "board"}, "reference": {"key": "information", "value": "board"}, "name": "Information Board"}, @@ -1203,7 +1203,7 @@ "tourism/theme_park": {"icon": "maki-amusement-park", "fields": ["name", "operator", "address", "opening_hours"], "moreFields": ["email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"tourism": "theme_park"}, "name": "Theme Park"}, "tourism/trail_riding_station": {"icon": "maki-horse-riding", "fields": ["name", "horse_stables", "horse_riding", "horse_dressage"], "moreFields": ["address", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "opening_hours", "phone", "website"], "geometry": ["point", "area"], "tags": {"tourism": "trail_riding_station"}, "name": "Trail Riding Station", "matchScore": 2}, "tourism/viewpoint": {"icon": "temaki-binoculars", "geometry": ["point", "vertex"], "fields": ["direction"], "moreFields": ["level"], "tags": {"tourism": "viewpoint"}, "name": "Viewpoint"}, - "tourism/wilderness_hut": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "fee", "payment_multi_fee", "charge_fee", "fireplace"], "moreFields": ["gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "reservation", "wheelchair"], "geometry": ["point", "area"], "terms": ["wilderness hut", "backcountry hut", "bothy"], "tags": {"tourism": "wilderness_hut"}, "name": "Wilderness Hut"}, + "tourism/wilderness_hut": {"icon": "temaki-cabin", "fields": ["name", "operator", "address", "building_area", "fee", "payment_multi_fee", "charge_fee", "fireplace"], "moreFields": ["gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "reservation", "wheelchair"], "geometry": ["point", "area"], "terms": ["wilderness hut", "backcountry hut", "bothy"], "tags": {"tourism": "wilderness_hut"}, "name": "Wilderness Hut"}, "tourism/zoo": {"icon": "temaki-zoo", "fields": ["name", "operator", "address", "opening_hours", "fee", "charge_fee"], "moreFields": ["email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi", "phone", "ref/vatin", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["animal"], "tags": {"tourism": "zoo"}, "name": "Zoo"}, "tourism/zoo/petting": {"icon": "fas-horse", "geometry": ["point", "area"], "tags": {"tourism": "zoo", "zoo": "petting_zoo"}, "reference": {"key": "zoo", "value": "petting_zoo"}, "terms": ["Children's Zoo", "Children's Farm", "Petting Farm", "farm animals"], "name": "Petting Zoo"}, "tourism/zoo/safari": {"icon": "temaki-zoo", "geometry": ["point", "area"], "tags": {"tourism": "zoo", "zoo": "safari_park"}, "reference": {"key": "zoo", "value": "safari_park"}, "terms": ["Drive-Through Zoo", "Drive-In Zoo"], "name": "Safari Park"}, @@ -2827,10 +2827,10 @@ "amenity/money_transfer/MoneyGram": {"name": "MoneyGram", "icon": "temaki-money_hand", "imageURL": "https://graph.facebook.com/moneygram/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1944412", "amenity": "money_transfer"}, "addTags": {"amenity": "money_transfer", "brand": "MoneyGram", "brand:wikidata": "Q1944412", "brand:wikipedia": "en:MoneyGram", "name": "MoneyGram"}, "countryCodes": ["de", "fr", "gr"], "terms": [], "matchScore": 2, "suggestion": true}, "amenity/money_transfer/Orange Money": {"name": "Orange Money", "icon": "temaki-money_hand", "imageURL": "https://graph.facebook.com/orange/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q16668220", "amenity": "money_transfer"}, "addTags": {"amenity": "money_transfer", "brand": "Orange Money", "brand:wikidata": "Q16668220", "brand:wikipedia": "en:Orange Money", "name": "Orange Money"}, "countryCodes": ["ml"], "terms": [], "matchScore": 2, "suggestion": true}, "amenity/money_transfer/Western Union": {"name": "Western Union", "icon": "temaki-money_hand", "imageURL": "https://graph.facebook.com/WesternUnion/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q861042", "amenity": "money_transfer"}, "addTags": {"amenity": "money_transfer", "brand": "Western Union", "brand:wikidata": "Q861042", "brand:wikipedia": "en:Western Union", "name": "Western Union"}, "terms": [], "matchScore": 2, "suggestion": true}, - "amenity/parking/Diamond Parking": {"name": "Diamond Parking", "icon": "maki-car", "imageURL": "https://graph.facebook.com/DiamondParkingService/picture?type=large", "geometry": ["area", "point", "vertex"], "tags": {"brand:wikidata": "Q5270887", "amenity": "parking"}, "addTags": {"amenity": "parking", "brand": "Diamond Parking", "brand:wikidata": "Q5270887", "brand:wikipedia": "en:Diamond Parking", "name": "Diamond Parking"}, "countryCodes": ["ca", "us"], "terms": [], "matchScore": 2, "suggestion": true}, - "amenity/parking/Parking Company of America": {"name": "Parking Company of America", "icon": "maki-car", "imageURL": "https://graph.facebook.com/parkingcompanyofamerica/picture?type=large", "geometry": ["area", "point", "vertex"], "tags": {"brand:wikidata": "Q65491376", "amenity": "parking"}, "addTags": {"amenity": "parking", "brand": "Parking Company of America", "brand:wikidata": "Q65491376", "fee": "yes", "name": "Parking Company of America", "short_name": "PCA"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true}, - "amenity/parking/SP+": {"name": "SP+", "icon": "maki-car", "imageURL": "https://graph.facebook.com/sppluscorp/picture?type=large", "geometry": ["area", "point", "vertex"], "tags": {"brand:wikidata": "Q7598289", "amenity": "parking"}, "addTags": {"alt_name": "SP Plus", "amenity": "parking", "brand": "SP+", "brand:wikidata": "Q7598289", "brand:wikipedia": "en:SP Plus Corporation", "fee": "yes", "name": "SP+"}, "countryCodes": ["ca", "us"], "terms": ["central parking", "central parking system", "standard parking"], "matchScore": 2, "suggestion": true}, - "amenity/parking/Wilson Parking": {"name": "Wilson Parking", "icon": "maki-car", "imageURL": "https://graph.facebook.com/wilsonstorage.hk/picture?type=large", "geometry": ["area", "point", "vertex"], "tags": {"brand:wikidata": "Q28448427", "amenity": "parking"}, "addTags": {"amenity": "parking", "brand": "Wilson Parking", "brand:wikidata": "Q28448427", "brand:wikipedia": "en:Wilson Parking", "fee": "yes", "name": "Wilson Parking"}, "countryCodes": ["au", "cn", "hk", "ko", "nz", "sg"], "terms": ["wilson"], "matchScore": 2, "suggestion": true}, + "amenity/parking/Diamond Parking": {"name": "Diamond Parking", "icon": "temaki-car_parked", "imageURL": "https://graph.facebook.com/DiamondParkingService/picture?type=large", "geometry": ["area", "point", "vertex"], "tags": {"brand:wikidata": "Q5270887", "amenity": "parking"}, "addTags": {"amenity": "parking", "brand": "Diamond Parking", "brand:wikidata": "Q5270887", "brand:wikipedia": "en:Diamond Parking", "name": "Diamond Parking"}, "countryCodes": ["ca", "us"], "terms": [], "matchScore": 2, "suggestion": true}, + "amenity/parking/Parking Company of America": {"name": "Parking Company of America", "icon": "temaki-car_parked", "imageURL": "https://graph.facebook.com/parkingcompanyofamerica/picture?type=large", "geometry": ["area", "point", "vertex"], "tags": {"brand:wikidata": "Q65491376", "amenity": "parking"}, "addTags": {"amenity": "parking", "brand": "Parking Company of America", "brand:wikidata": "Q65491376", "fee": "yes", "name": "Parking Company of America", "short_name": "PCA"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true}, + "amenity/parking/SP+": {"name": "SP+", "icon": "temaki-car_parked", "imageURL": "https://graph.facebook.com/sppluscorp/picture?type=large", "geometry": ["area", "point", "vertex"], "tags": {"brand:wikidata": "Q7598289", "amenity": "parking"}, "addTags": {"alt_name": "SP Plus", "amenity": "parking", "brand": "SP+", "brand:wikidata": "Q7598289", "brand:wikipedia": "en:SP Plus Corporation", "fee": "yes", "name": "SP+"}, "countryCodes": ["ca", "us"], "terms": ["central parking", "central parking system", "standard parking"], "matchScore": 2, "suggestion": true}, + "amenity/parking/Wilson Parking": {"name": "Wilson Parking", "icon": "temaki-car_parked", "imageURL": "https://graph.facebook.com/wilsonstorage.hk/picture?type=large", "geometry": ["area", "point", "vertex"], "tags": {"brand:wikidata": "Q28448427", "amenity": "parking"}, "addTags": {"amenity": "parking", "brand": "Wilson Parking", "brand:wikidata": "Q28448427", "brand:wikipedia": "en:Wilson Parking", "fee": "yes", "name": "Wilson Parking"}, "countryCodes": ["au", "cn", "hk", "ko", "nz", "sg"], "terms": ["wilson"], "matchScore": 2, "suggestion": true}, "amenity/payment_centre/Abitab": {"name": "Abitab", "icon": "temaki-money_hand", "imageURL": "https://graph.facebook.com/Abitaboficial/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q16488129", "amenity": "payment_centre"}, "addTags": {"amenity": "payment_centre", "brand": "Abitab", "brand:wikidata": "Q16488129", "brand:wikipedia": "es:Abitab", "name": "Abitab"}, "countryCodes": ["uy"], "terms": [], "matchScore": 2, "suggestion": true}, "amenity/payment_centre/Rapipago": {"name": "Rapipago", "icon": "temaki-money_hand", "imageURL": "https://graph.facebook.com/Rapipago/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q6100413", "amenity": "payment_centre"}, "addTags": {"amenity": "payment_centre", "brand": "Rapipago", "brand:wikidata": "Q6100413", "brand:wikipedia": "es:Rapipago", "name": "Rapipago"}, "countryCodes": ["ar"], "terms": [], "matchScore": 2, "suggestion": true}, "amenity/payment_terminal/Qiwi": {"name": "Qiwi", "icon": "far-credit-card", "imageURL": "https://graph.facebook.com/qiwirussia/picture?type=large", "geometry": ["point"], "tags": {"brand:wikidata": "Q4047736", "amenity": "payment_terminal"}, "addTags": {"amenity": "payment_terminal", "brand": "Qiwi", "brand:wikidata": "Q4047736", "brand:wikipedia": "en:Qiwi", "name": "Qiwi"}, "countryCodes": ["ru"], "terms": [], "matchScore": 2, "suggestion": true}, diff --git a/data/presets/presets/amenity/parking.json b/data/presets/presets/amenity/parking.json index 2fe8ee4ba..6da18c497 100644 --- a/data/presets/presets/amenity/parking.json +++ b/data/presets/presets/amenity/parking.json @@ -1,5 +1,5 @@ { - "icon": "maki-car", + "icon": "temaki-car_parked", "fields": [ "operator", "operator/type", diff --git a/data/presets/presets/building/cabin.json b/data/presets/presets/building/cabin.json index 234c62068..90537cac5 100644 --- a/data/presets/presets/building/cabin.json +++ b/data/presets/presets/building/cabin.json @@ -1,5 +1,5 @@ { - "icon": "maki-home", + "icon": "temaki-cabin", "geometry": [ "area" ], diff --git a/data/presets/presets/craft/blacksmith.json b/data/presets/presets/craft/blacksmith.json index b058b8349..bf290809e 100644 --- a/data/presets/presets/craft/blacksmith.json +++ b/data/presets/presets/craft/blacksmith.json @@ -1,5 +1,5 @@ { - "icon": "temaki-tools", + "icon": "temaki-anvil_and_hammer", "geometry": [ "point", "area" diff --git a/data/presets/presets/tourism/alpine_hut.json b/data/presets/presets/tourism/alpine_hut.json index 68b19f63f..998e530ef 100644 --- a/data/presets/presets/tourism/alpine_hut.json +++ b/data/presets/presets/tourism/alpine_hut.json @@ -1,5 +1,5 @@ { - "icon": "maki-lodging", + "icon": "temaki-cabin", "fields": [ "name", "operator", diff --git a/data/presets/presets/tourism/chalet.json b/data/presets/presets/tourism/chalet.json index ffb051d8c..237f28af8 100644 --- a/data/presets/presets/tourism/chalet.json +++ b/data/presets/presets/tourism/chalet.json @@ -1,5 +1,5 @@ { - "icon": "maki-lodging", + "icon": "temaki-cabin", "fields": [ "name", "operator", diff --git a/data/presets/presets/tourism/hostel.json b/data/presets/presets/tourism/hostel.json index 2302fc165..feec3869a 100644 --- a/data/presets/presets/tourism/hostel.json +++ b/data/presets/presets/tourism/hostel.json @@ -1,5 +1,5 @@ { - "icon": "maki-lodging", + "icon": "temaki-bunk_beds", "fields": [ "{tourism/guest_house}" ], diff --git a/data/presets/presets/tourism/wilderness_hut.json b/data/presets/presets/tourism/wilderness_hut.json index 5e7296625..f197c69e5 100644 --- a/data/presets/presets/tourism/wilderness_hut.json +++ b/data/presets/presets/tourism/wilderness_hut.json @@ -1,5 +1,5 @@ { - "icon": "maki-lodging", + "icon": "temaki-cabin", "fields": [ "name", "operator", diff --git a/data/taginfo.json b/data/taginfo.json index 9ea2656aa..1e7601221 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -151,7 +151,7 @@ {"key": "amenity", "value": "nightclub", "description": "🄿 Nightclub", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/bar-15.svg"}, {"key": "amenity", "value": "parking_entrance", "description": "🄿 Parking Garage Entrance/Exit", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/entrance-alt1-15.svg"}, {"key": "amenity", "value": "parking_space", "description": "🄿 Parking Space", "object_types": ["area", "node"]}, - {"key": "amenity", "value": "parking", "description": "🄿 Parking Lot", "object_types": ["area", "node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/car-15.svg"}, + {"key": "amenity", "value": "parking", "description": "🄿 Parking Lot", "object_types": ["area", "node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/car_parked.svg"}, {"key": "parking", "value": "multi-storey", "description": "🄿 Multilevel Parking Garage, 🄵 Type", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/car_structure.svg"}, {"key": "park_ride", "value": "yes", "description": "🄿 Park & Ride Lot", "object_types": ["area", "node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/sign_and_car.svg"}, {"key": "parking", "value": "underground", "description": "🄿 Underground Parking, 🄵 Type", "object_types": ["area", "node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/car_structure.svg"}, @@ -330,7 +330,7 @@ {"key": "building", "value": "barn", "description": "🄿 Barn", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/barn.svg"}, {"key": "building", "value": "boathouse", "description": "🄿 Boathouse", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/harbor-15.svg"}, {"key": "building", "value": "bungalow", "description": "🄿 Bungalow", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/home-15.svg"}, - {"key": "building", "value": "cabin", "description": "🄿 Cabin", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/home-15.svg"}, + {"key": "building", "value": "cabin", "description": "🄿 Cabin", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/cabin.svg"}, {"key": "building", "value": "carport", "description": "🄿 Carport", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-warehouse.svg"}, {"key": "building", "value": "cathedral", "description": "🄿 Cathedral Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/place-of-worship-15.svg"}, {"key": "building", "value": "chapel", "description": "🄿 Chapel Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/place-of-worship-15.svg"}, @@ -382,7 +382,7 @@ {"key": "craft", "value": "agricultural_engines", "description": "🄿 Argricultural Engines Mechanic", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/tools.svg"}, {"key": "craft", "value": "basket_maker", "description": "🄿 Basket Maker", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/vase.svg"}, {"key": "craft", "value": "beekeeper", "description": "🄿 Beekeeper", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/farm-15.svg"}, - {"key": "craft", "value": "blacksmith", "description": "🄿 Blacksmith", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/tools.svg"}, + {"key": "craft", "value": "blacksmith", "description": "🄿 Blacksmith", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/anvil_and_hammer.svg"}, {"key": "craft", "value": "boatbuilder", "description": "🄿 Boat Builder", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/boat_repair.svg"}, {"key": "craft", "value": "bookbinder", "description": "🄿 Bookbinder", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/library-15.svg"}, {"key": "craft", "value": "brewery", "description": "🄿 Brewery", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/storage_fermenter.svg"}, @@ -1114,7 +1114,7 @@ {"key": "shop", "value": "window_blind", "description": "🄿 Window Blind Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/window.svg"}, {"key": "shop", "value": "wine", "description": "🄿 Wine Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/alcohol-shop-15.svg"}, {"key": "telecom", "value": "data_center", "description": "🄿 Data Center", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-server.svg"}, - {"key": "tourism", "value": "alpine_hut", "description": "🄿 Alpine Hut", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/lodging-15.svg"}, + {"key": "tourism", "value": "alpine_hut", "description": "🄿 Alpine Hut", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/cabin.svg"}, {"key": "tourism", "value": "apartment", "description": "🄿 Guest Apartment / Condo", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/lodging-15.svg"}, {"key": "tourism", "value": "aquarium", "description": "🄿 Aquarium", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/aquarium-15.svg"}, {"key": "tourism", "value": "artwork", "description": "🄿 Artwork", "object_types": ["node", "way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/art-gallery-15.svg"}, @@ -1128,10 +1128,10 @@ {"key": "tourism", "value": "camp_pitch", "description": "🄿 Camp Pitch", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/campsite-15.svg"}, {"key": "tourism", "value": "camp_site", "description": "🄿 Campground", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/campsite-15.svg"}, {"key": "tourism", "value": "caravan_site", "description": "🄿 RV Park", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/rv_park.svg"}, - {"key": "tourism", "value": "chalet", "description": "🄿 Holiday Cottage", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/lodging-15.svg"}, + {"key": "tourism", "value": "chalet", "description": "🄿 Holiday Cottage", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/cabin.svg"}, {"key": "tourism", "value": "gallery", "description": "🄿 Art Gallery", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/art-gallery-15.svg"}, {"key": "tourism", "value": "guest_house", "description": "🄿 Guest House", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/lodging-15.svg"}, - {"key": "tourism", "value": "hostel", "description": "🄿 Hostel", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/lodging-15.svg"}, + {"key": "tourism", "value": "hostel", "description": "🄿 Hostel", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/bunk_beds.svg"}, {"key": "tourism", "value": "hotel", "description": "🄿 Hotel", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-concierge-bell.svg"}, {"key": "tourism", "value": "information", "description": "🄿 Information", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/information-15.svg"}, {"key": "information", "value": "board", "description": "🄿 Information Board", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/information-15.svg"}, @@ -1146,7 +1146,7 @@ {"key": "tourism", "value": "theme_park", "description": "🄿 Theme Park", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/amusement-park-15.svg"}, {"key": "tourism", "value": "trail_riding_station", "description": "🄿 Trail Riding Station", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/horse-riding-15.svg"}, {"key": "tourism", "value": "viewpoint", "description": "🄿 Viewpoint", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/binoculars.svg"}, - {"key": "tourism", "value": "wilderness_hut", "description": "🄿 Wilderness Hut", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/lodging-15.svg"}, + {"key": "tourism", "value": "wilderness_hut", "description": "🄿 Wilderness Hut", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/cabin.svg"}, {"key": "tourism", "value": "zoo", "description": "🄿 Zoo", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/zoo.svg"}, {"key": "zoo", "value": "petting_zoo", "description": "🄿 Petting Zoo", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-horse.svg"}, {"key": "zoo", "value": "safari_park", "description": "🄿 Safari Park", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/zoo.svg"}, diff --git a/package.json b/package.json index a5d23211c..6d004d28c 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "@fortawesome/free-brands-svg-icons": "^5.11.2", "@fortawesome/free-regular-svg-icons": "^5.11.2", "@fortawesome/free-solid-svg-icons": "^5.11.2", - "@ideditor/temaki": "~3.7.0", + "@ideditor/temaki": "~3.8.0", "@mapbox/maki": "^6.0.0", "@rollup/plugin-buble": "^0.20.0", "chai": "^4.1.0",