From 905f36231793964738fe208f6ff9456d2e3392bb Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Sun, 9 Dec 2018 22:43:42 -0500 Subject: [PATCH] Upgrade to maki v6.0.0 (closes #5559) --- data/presets/presets.json | 28 +++++++++---------- data/presets/presets/building/greenhouse.json | 2 +- data/presets/presets/craft/confectionery.json | 2 +- data/presets/presets/craft/gardener.json | 2 +- data/presets/presets/landuse/allotments.json | 2 +- .../leisure/pitch/american_football.json | 2 +- .../presets/leisure/pitch/rugby_league.json | 2 +- .../presets/leisure/pitch/rugby_union.json | 2 +- data/presets/presets/shop/confectionery.json | 2 +- data/presets/presets/shop/garden_centre.json | 2 +- data/taginfo.json | 18 ++++++------ package.json | 2 +- 12 files changed, 33 insertions(+), 33 deletions(-) diff --git a/data/presets/presets.json b/data/presets/presets.json index 7f765d21c..8ab2b599f 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -274,7 +274,7 @@ "building/garage": {"icon": "fas-warehouse", "fields": ["name", "capacity"], "geometry": ["area"], "tags": {"building": "garage"}, "matchScore": 0.5, "name": "Garage"}, "building/garages": {"icon": "fas-warehouse", "fields": ["name", "capacity"], "geometry": ["area"], "tags": {"building": "garages"}, "matchScore": 0.5, "name": "Garages"}, "building/grandstand": {"icon": "maki-building", "fields": ["name", "height"], "geometry": ["area"], "tags": {"building": "grandstand"}, "terms": ["tribune", "stand", "stands", "bleachers"], "matchScore": 0.5, "name": "Grandstand"}, - "building/greenhouse": {"icon": "maki-garden-center", "fields": ["name", "address", "levels", "height"], "geometry": ["area"], "tags": {"building": "greenhouse"}, "matchScore": 0.5, "name": "Greenhouse"}, + "building/greenhouse": {"icon": "maki-garden-centre", "fields": ["name", "address", "levels", "height"], "geometry": ["area"], "tags": {"building": "greenhouse"}, "matchScore": 0.5, "name": "Greenhouse"}, "building/hospital": {"icon": "maki-building", "fields": ["name", "address", "levels", "height"], "geometry": ["area"], "tags": {"building": "hospital"}, "matchScore": 0.5, "name": "Hospital Building"}, "building/hotel": {"icon": "maki-building", "fields": ["name", "address", "levels", "height", "smoking"], "geometry": ["area"], "tags": {"building": "hotel"}, "matchScore": 0.5, "name": "Hotel Building"}, "building/house": {"icon": "maki-home", "fields": ["name", "address", "levels", "height"], "geometry": ["area"], "tags": {"building": "house"}, "terms": ["home", "family", "residence", "dwelling"], "matchScore": 0.5, "name": "House"}, @@ -318,12 +318,12 @@ "craft/caterer": {"icon": "maki-restaurant", "fields": ["name", "cuisine", "operator", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "tags": {"craft": "caterer"}, "name": "Caterer"}, "craft/chimney_sweeper": {"icon": "temaki-chimney", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "tags": {"craft": "chimney_sweeper"}, "name": "Chimney Sweeper"}, "craft/clockmaker": {"icon": "temaki-clock", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "tags": {"craft": "clockmaker"}, "name": "Clockmaker"}, - "craft/confectionery": {"icon": "maki-confectionary", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "terms": ["sweet", "candy"], "tags": {"craft": "confectionery"}, "name": "Candy Maker"}, + "craft/confectionery": {"icon": "maki-confectionery", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "terms": ["sweet", "candy"], "tags": {"craft": "confectionery"}, "name": "Candy Maker"}, "craft/distillery": {"icon": "temaki-storage_tank", "fields": ["name", "operator", "address", "building_area", "opening_hours", "product"], "geometry": ["point", "area"], "terms": ["alcohol", "beverage", "bourbon", "booze", "brandy", "gin", "hooch", "liquor", "mezcal", "moonshine", "rum", "scotch", "spirits", "still", "tequila", "vodka", "whiskey", "whisky"], "tags": {"craft": "distillery"}, "name": "Distillery"}, "craft/dressmaker": {"icon": "maki-clothing-store", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "terms": ["seamstress"], "tags": {"craft": "dressmaker"}, "name": "Dressmaker"}, "craft/electrician": {"icon": "temaki-power", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "terms": ["power", "wire"], "tags": {"craft": "electrician"}, "name": "Electrician"}, "craft/electronics_repair": {"icon": "temaki-tools", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "tags": {"craft": "electronics_repair"}, "name": "Electronics Repair Shop"}, - "craft/gardener": {"icon": "maki-garden-center", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "terms": ["landscaper", "grounds keeper"], "tags": {"craft": "gardener"}, "name": "Gardener"}, + "craft/gardener": {"icon": "maki-garden-centre", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "terms": ["landscaper", "grounds keeper"], "tags": {"craft": "gardener"}, "name": "Gardener"}, "craft/glaziery": {"icon": "temaki-window", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "terms": ["glass", "stained-glass", "window"], "tags": {"craft": "glaziery"}, "name": "Glaziery"}, "craft/handicraft": {"icon": "maki-art-gallery", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "tags": {"craft": "handicraft"}, "name": "Handicraft"}, "craft/hvac": {"icon": "temaki-tools", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "terms": ["heat*", "vent*", "air conditioning"], "tags": {"craft": "hvac"}, "name": "HVAC"}, @@ -473,7 +473,7 @@ "junction": {"icon": "temaki-junction", "fields": ["name"], "geometry": ["vertex", "area"], "tags": {"junction": "yes"}, "name": "Junction"}, "landuse": {"fields": ["name", "landuse"], "geometry": ["area"], "tags": {"landuse": "*"}, "matchScore": 0.9, "name": "Land Use"}, "landuse/farm": {"icon": "maki-farm", "fields": ["name", "operator", "crop"], "geometry": ["point", "area"], "tags": {"landuse": "farm"}, "terms": [], "name": "Farmland", "searchable": false}, - "landuse/allotments": {"icon": "maki-garden-center", "geometry": ["area"], "fields": ["name"], "tags": {"landuse": "allotments"}, "terms": ["allotment", "garden"], "name": "Community Garden"}, + "landuse/allotments": {"icon": "maki-garden-centre", "geometry": ["area"], "fields": ["name"], "tags": {"landuse": "allotments"}, "terms": ["allotment", "garden"], "name": "Community Garden"}, "landuse/aquaculture": {"icon": "maki-aquarium", "fields": ["name", "operator", "produce"], "geometry": ["area"], "tags": {"landuse": "aquaculture"}, "terms": ["fish farm", "crustacean", "algae", "aquafarming", "shrimp farm", "oyster farm", "mariculture", "algaculture"], "name": "Aquaculture"}, "landuse/basin": {"icon": "maki-water", "fields": ["name"], "geometry": ["area"], "tags": {"landuse": "basin"}, "terms": [], "name": "Basin"}, "landuse/brownfield": {"geometry": ["area"], "fields": ["name"], "tags": {"landuse": "brownfield"}, "terms": [], "matchScore": 0.9, "name": "Brownfield"}, @@ -555,7 +555,7 @@ "leisure/park": {"icon": "maki-park", "geometry": ["point", "area"], "fields": ["name"], "terms": ["esplanade", "estate", "forest", "garden", "grass", "green", "grounds", "lawn", "lot", "meadow", "parkland", "place", "playground", "plaza", "pleasure garden", "recreation area", "square", "tract", "village green", "woodland"], "tags": {"leisure": "park"}, "name": "Park"}, "leisure/picnic_table": {"icon": "maki-picnic-site", "geometry": ["point"], "tags": {"leisure": "picnic_table"}, "terms": ["bench"], "name": "Picnic Table"}, "leisure/pitch": {"icon": "maki-pitch", "fields": ["name", "sport", "surface", "lit"], "geometry": ["point", "area"], "tags": {"leisure": "pitch"}, "terms": ["field"], "name": "Sport Pitch"}, - "leisure/pitch/american_football": {"icon": "maki-america-football", "fields": ["name", "surface", "lit"], "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "american_football"}, "reference": {"key": "sport", "value": "american_football"}, "terms": [], "name": "American Football Field"}, + "leisure/pitch/american_football": {"icon": "maki-american-football", "fields": ["name", "surface", "lit"], "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "american_football"}, "reference": {"key": "sport", "value": "american_football"}, "terms": [], "name": "American Football Field"}, "leisure/pitch/badminton": {"icon": "maki-tennis", "fields": ["name", "surface", "lit", "access_simple"], "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "badminton"}, "reference": {"key": "sport", "value": "badminton"}, "terms": [], "name": "Badminton Court"}, "leisure/pitch/baseball": {"icon": "maki-baseball", "fields": ["name", "lit"], "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "baseball"}, "reference": {"key": "sport", "value": "baseball"}, "terms": [], "name": "Baseball Field"}, "leisure/pitch/basketball": {"icon": "maki-basketball", "fields": ["name", "surface", "hoops", "lit", "access_simple"], "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "basketball"}, "reference": {"key": "sport", "value": "basketball"}, "terms": [], "name": "Basketball Court"}, @@ -564,8 +564,8 @@ "leisure/pitch/bowls": {"icon": "maki-pitch", "fields": ["name", "surface", "lit"], "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "bowls"}, "reference": {"key": "sport", "value": "bowls"}, "terms": [], "name": "Bowling Green"}, "leisure/pitch/cricket": {"icon": "maki-cricket", "fields": ["name", "surface", "lit"], "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "cricket"}, "reference": {"key": "sport", "value": "cricket"}, "terms": [], "name": "Cricket Field"}, "leisure/pitch/equestrian": {"icon": "maki-horse-riding", "fields": ["name", "surface", "lit", "building"], "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "equestrian"}, "reference": {"key": "sport", "value": "equestrian"}, "terms": ["dressage", "equestrian", "horse", "horseback", "riding"], "name": "Riding Arena"}, - "leisure/pitch/rugby_league": {"icon": "maki-america-football", "fields": ["name", "surface", "lit"], "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "rugby_league"}, "reference": {"key": "sport", "value": "rugby_league"}, "terms": [], "name": "Rugby League Field"}, - "leisure/pitch/rugby_union": {"icon": "maki-america-football", "fields": ["name", "surface", "lit"], "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "rugby_union"}, "reference": {"key": "sport", "value": "rugby_union"}, "terms": [], "name": "Rugby Union Field"}, + "leisure/pitch/rugby_league": {"icon": "maki-american-football", "fields": ["name", "surface", "lit"], "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "rugby_league"}, "reference": {"key": "sport", "value": "rugby_league"}, "terms": [], "name": "Rugby League Field"}, + "leisure/pitch/rugby_union": {"icon": "maki-american-football", "fields": ["name", "surface", "lit"], "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "rugby_union"}, "reference": {"key": "sport", "value": "rugby_union"}, "terms": [], "name": "Rugby Union Field"}, "leisure/pitch/skateboard": {"icon": "maki-skateboard", "fields": ["name", "surface", "lit"], "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "skateboard"}, "reference": {"key": "sport", "value": "skateboard"}, "terms": [], "name": "Skate Park"}, "leisure/pitch/soccer": {"icon": "maki-soccer", "fields": ["name", "surface", "lit"], "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "soccer"}, "reference": {"key": "sport", "value": "soccer"}, "terms": ["football"], "name": "Soccer Field"}, "leisure/pitch/softball": {"icon": "maki-baseball", "fields": ["name", "lit"], "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "softball"}, "reference": {"key": "sport", "value": "softball"}, "terms": ["softball", "diamond"], "name": "Softball Field"}, @@ -861,7 +861,7 @@ "shop/clothes": {"icon": "maki-clothing-store", "fields": ["name", "clothes", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "clothes"}, "name": "Clothing Store"}, "shop/coffee": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "coffee"}, "name": "Coffee Store"}, "shop/computer": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "computer"}, "name": "Computer Store"}, - "shop/confectionery": {"icon": "maki-confectionary", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["sweet"], "tags": {"shop": "confectionery"}, "name": "Candy Store"}, + "shop/confectionery": {"icon": "maki-confectionery", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["sweet"], "tags": {"shop": "confectionery"}, "name": "Candy Store"}, "shop/convenience": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "convenience"}, "name": "Convenience Store"}, "shop/copyshop": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "copyshop"}, "name": "Copy Store"}, "shop/cosmetics": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "cosmetics"}, "name": "Cosmetics Store"}, @@ -883,7 +883,7 @@ "shop/frame": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "frame"}, "terms": ["art*", "paint*", "photo*", "frame"], "name": "Framing Shop"}, "shop/funeral_directors": {"icon": "maki-cemetery", "fields": ["name", "operator", "address", "building_area", "religion", "denomination"], "geometry": ["point", "area"], "terms": ["undertaker", "memorial home"], "tags": {"shop": "funeral_directors"}, "name": "Funeral Home"}, "shop/furniture": {"icon": "fas-couch", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["chair", "sofa", "table"], "tags": {"shop": "furniture"}, "name": "Furniture Store"}, - "shop/garden_centre": {"icon": "maki-garden-center", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["landscape", "mulch", "shrub", "tree"], "tags": {"shop": "garden_centre"}, "name": "Garden Center"}, + "shop/garden_centre": {"icon": "maki-garden-centre", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["landscape", "mulch", "shrub", "tree"], "tags": {"shop": "garden_centre"}, "name": "Garden Center"}, "shop/gas": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["cng", "lpg", "natural gas", "propane", "refill", "tank"], "tags": {"shop": "gas"}, "name": "Bottled Gas Shop"}, "shop/gift": {"icon": "maki-gift", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["souvenir"], "tags": {"shop": "gift"}, "name": "Gift Shop"}, "shop/greengrocer": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["fruit", "vegetable"], "tags": {"shop": "greengrocer"}, "name": "Greengrocer"}, @@ -2253,8 +2253,8 @@ "shop/coffee/Nespresso": {"name": "Nespresso", "icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "coffee", "brand:wikidata": "Q301301"}, "addTags": {"brand": "Nespresso", "brand:wikidata": "Q301301", "brand:wikipedia": "en:Nespresso", "name": "Nespresso", "shop": "coffee"}, "removeTags": {"brand": "Nespresso", "brand:wikidata": "Q301301", "brand:wikipedia": "en:Nespresso", "name": "Nespresso", "shop": "coffee"}, "matchScore": 2, "suggestion": true}, "shop/coffee/Tchibo": {"name": "Tchibo", "icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "coffee", "brand:wikidata": "Q564213"}, "addTags": {"brand": "Tchibo", "brand:wikidata": "Q564213", "brand:wikipedia": "de:Tchibo", "name": "Tchibo", "shop": "coffee"}, "removeTags": {"brand": "Tchibo", "brand:wikidata": "Q564213", "brand:wikipedia": "de:Tchibo", "name": "Tchibo", "shop": "coffee"}, "matchScore": 2, "suggestion": true}, "shop/computer/PC World": {"name": "PC World", "icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "computer", "brand:wikidata": "Q7118727"}, "addTags": {"brand": "PC World", "brand:wikidata": "Q7118727", "brand:wikipedia": "en:PC World (retailer)", "name": "PC World", "shop": "computer"}, "removeTags": {"brand": "PC World", "brand:wikidata": "Q7118727", "brand:wikipedia": "en:PC World (retailer)", "name": "PC World", "shop": "computer"}, "matchScore": 2, "suggestion": true}, - "shop/confectionery/Adyar Ananda Bhavan": {"name": "Adyar Ananda Bhavan", "icon": "maki-confectionary", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "confectionery", "brand:wikidata": "Q15178238"}, "addTags": {"shop": "confectionery", "brand": "Adyar Ananda Bhavan", "brand:wikidata": "Q15178238", "brand:wikipedia": "en:Adyar Ananda Bhavan", "name": "Adyar Ananda Bhavan"}, "removeTags": {"shop": "confectionery", "brand": "Adyar Ananda Bhavan", "brand:wikidata": "Q15178238", "brand:wikipedia": "en:Adyar Ananda Bhavan", "name": "Adyar Ananda Bhavan"}, "matchScore": 2, "suggestion": true}, - "shop/confectionery/Thorntons": {"name": "Thorntons", "icon": "maki-confectionary", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "confectionery", "brand:wikidata": "Q683102"}, "addTags": {"brand": "Thorntons", "brand:wikidata": "Q683102", "brand:wikipedia": "en:Thorntons", "name": "Thorntons", "shop": "confectionery"}, "removeTags": {"brand": "Thorntons", "brand:wikidata": "Q683102", "brand:wikipedia": "en:Thorntons", "name": "Thorntons", "shop": "confectionery"}, "matchScore": 2, "suggestion": true}, + "shop/confectionery/Adyar Ananda Bhavan": {"name": "Adyar Ananda Bhavan", "icon": "maki-confectionery", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "confectionery", "brand:wikidata": "Q15178238"}, "addTags": {"shop": "confectionery", "brand": "Adyar Ananda Bhavan", "brand:wikidata": "Q15178238", "brand:wikipedia": "en:Adyar Ananda Bhavan", "name": "Adyar Ananda Bhavan"}, "removeTags": {"shop": "confectionery", "brand": "Adyar Ananda Bhavan", "brand:wikidata": "Q15178238", "brand:wikipedia": "en:Adyar Ananda Bhavan", "name": "Adyar Ananda Bhavan"}, "matchScore": 2, "suggestion": true}, + "shop/confectionery/Thorntons": {"name": "Thorntons", "icon": "maki-confectionery", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "confectionery", "brand:wikidata": "Q683102"}, "addTags": {"brand": "Thorntons", "brand:wikidata": "Q683102", "brand:wikipedia": "en:Thorntons", "name": "Thorntons", "shop": "confectionery"}, "removeTags": {"brand": "Thorntons", "brand:wikidata": "Q683102", "brand:wikipedia": "en:Thorntons", "name": "Thorntons", "shop": "confectionery"}, "matchScore": 2, "suggestion": true}, "shop/convenience/8 à Huit": {"name": "8 à Huit", "icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "convenience", "brand:wikidata": "Q2818601"}, "addTags": {"brand": "8 à Huit", "brand:wikidata": "Q2818601", "brand:wikipedia": "en:8 à Huit", "name": "8 à Huit", "shop": "convenience"}, "removeTags": {"brand": "8 à Huit", "brand:wikidata": "Q2818601", "brand:wikipedia": "en:8 à Huit", "name": "8 à Huit", "shop": "convenience"}, "matchScore": 2, "suggestion": true}, "shop/convenience/ABC": {"name": "ABC", "icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "convenience", "brand:wikidata": "Q4650251"}, "addTags": {"brand": "ABC", "brand:wikidata": "Q4650251", "brand:wikipedia": "en:ABC Stores (Hawaii)", "name": "ABC", "shop": "convenience"}, "removeTags": {"brand": "ABC", "brand:wikidata": "Q4650251", "brand:wikipedia": "en:ABC Stores (Hawaii)", "name": "ABC", "shop": "convenience"}, "matchScore": 2, "suggestion": true}, "shop/convenience/BP Shop": {"name": "BP Shop", "icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "convenience", "brand:wikidata": "Q152057"}, "addTags": {"brand": "BP Shop", "brand:wikidata": "Q152057", "brand:wikipedia": "en:BP", "name": "BP Shop", "shop": "convenience"}, "removeTags": {"brand": "BP Shop", "brand:wikidata": "Q152057", "brand:wikipedia": "en:BP", "name": "BP Shop", "shop": "convenience"}, "matchScore": 2, "suggestion": true}, @@ -2425,9 +2425,9 @@ "shop/furniture/Rent-A-Center": {"name": "Rent-A-Center", "icon": "fas-couch", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "furniture", "brand:wikidata": "Q7313497"}, "addTags": {"brand": "Rent-A-Center", "brand:wikidata": "Q7313497", "brand:wikipedia": "en:Rent-A-Center", "name": "Rent-A-Center", "shop": "furniture"}, "removeTags": {"brand": "Rent-A-Center", "brand:wikidata": "Q7313497", "brand:wikipedia": "en:Rent-A-Center", "name": "Rent-A-Center", "shop": "furniture"}, "matchScore": 2, "suggestion": true}, "shop/furniture/The Brick": {"name": "The Brick", "icon": "fas-couch", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "furniture", "brand:wikidata": "Q7720000"}, "addTags": {"brand": "The Brick", "brand:wikidata": "Q7720000", "brand:wikipedia": "en:The Brick", "name": "The Brick", "shop": "furniture"}, "removeTags": {"brand": "The Brick", "brand:wikidata": "Q7720000", "brand:wikipedia": "en:The Brick", "name": "The Brick", "shop": "furniture"}, "matchScore": 2, "suggestion": true}, "shop/furniture/ニトリ": {"name": "ニトリ", "icon": "fas-couch", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "furniture", "brand:wikidata": "Q10801453"}, "addTags": {"brand": "ニトリ", "brand:en": "Nitori", "brand:wikidata": "Q10801453", "brand:wikipedia": "en:Nitori", "name": "ニトリ", "name:en": "Nitori", "shop": "furniture"}, "removeTags": {"brand": "ニトリ", "brand:en": "Nitori", "brand:wikidata": "Q10801453", "brand:wikipedia": "en:Nitori", "name": "ニトリ", "name:en": "Nitori", "shop": "furniture"}, "matchScore": 2, "suggestion": true}, - "shop/garden_centre/Gamm Vert": {"name": "Gamm Vert", "icon": "maki-garden-center", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "garden_centre", "brand:wikidata": "Q3095006"}, "addTags": {"brand": "Gamm Vert", "brand:wikidata": "Q3095006", "brand:wikipedia": "fr:Gamm Vert", "name": "Gamm Vert", "shop": "garden_centre"}, "removeTags": {"brand": "Gamm Vert", "brand:wikidata": "Q3095006", "brand:wikipedia": "fr:Gamm Vert", "name": "Gamm Vert", "shop": "garden_centre"}, "matchScore": 2, "suggestion": true}, - "shop/garden_centre/Jardiland": {"name": "Jardiland", "icon": "maki-garden-center", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "garden_centre", "brand:wikidata": "Q3162276"}, "addTags": {"brand": "Jardiland", "brand:wikidata": "Q3162276", "brand:wikipedia": "fr:Jardiland", "name": "Jardiland", "shop": "garden_centre"}, "removeTags": {"brand": "Jardiland", "brand:wikidata": "Q3162276", "brand:wikipedia": "fr:Jardiland", "name": "Jardiland", "shop": "garden_centre"}, "matchScore": 2, "suggestion": true}, - "shop/garden_centre/Point Vert": {"name": "Point Vert", "icon": "maki-garden-center", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "garden_centre", "brand:wikidata": "Q16661975"}, "addTags": {"brand": "Point Vert", "brand:wikidata": "Q16661975", "brand:wikipedia": "fr:Magasin vert", "name": "Point Vert", "shop": "garden_centre"}, "removeTags": {"brand": "Point Vert", "brand:wikidata": "Q16661975", "brand:wikipedia": "fr:Magasin vert", "name": "Point Vert", "shop": "garden_centre"}, "matchScore": 2, "suggestion": true}, + "shop/garden_centre/Gamm Vert": {"name": "Gamm Vert", "icon": "maki-garden-centre", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "garden_centre", "brand:wikidata": "Q3095006"}, "addTags": {"brand": "Gamm Vert", "brand:wikidata": "Q3095006", "brand:wikipedia": "fr:Gamm Vert", "name": "Gamm Vert", "shop": "garden_centre"}, "removeTags": {"brand": "Gamm Vert", "brand:wikidata": "Q3095006", "brand:wikipedia": "fr:Gamm Vert", "name": "Gamm Vert", "shop": "garden_centre"}, "matchScore": 2, "suggestion": true}, + "shop/garden_centre/Jardiland": {"name": "Jardiland", "icon": "maki-garden-centre", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "garden_centre", "brand:wikidata": "Q3162276"}, "addTags": {"brand": "Jardiland", "brand:wikidata": "Q3162276", "brand:wikipedia": "fr:Jardiland", "name": "Jardiland", "shop": "garden_centre"}, "removeTags": {"brand": "Jardiland", "brand:wikidata": "Q3162276", "brand:wikipedia": "fr:Jardiland", "name": "Jardiland", "shop": "garden_centre"}, "matchScore": 2, "suggestion": true}, + "shop/garden_centre/Point Vert": {"name": "Point Vert", "icon": "maki-garden-centre", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "garden_centre", "brand:wikidata": "Q16661975"}, "addTags": {"brand": "Point Vert", "brand:wikidata": "Q16661975", "brand:wikipedia": "fr:Magasin vert", "name": "Point Vert", "shop": "garden_centre"}, "removeTags": {"brand": "Point Vert", "brand:wikidata": "Q16661975", "brand:wikipedia": "fr:Magasin vert", "name": "Point Vert", "shop": "garden_centre"}, "matchScore": 2, "suggestion": true}, "shop/gift/Card Factory": {"name": "Card Factory", "icon": "maki-gift", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "gift", "brand:wikidata": "Q5038192"}, "addTags": {"brand": "Card Factory", "brand:wikidata": "Q5038192", "brand:wikipedia": "en:Card Factory", "name": "Card Factory", "shop": "gift"}, "removeTags": {"brand": "Card Factory", "brand:wikidata": "Q5038192", "brand:wikipedia": "en:Card Factory", "name": "Card Factory", "shop": "gift"}, "matchScore": 2, "suggestion": true}, "shop/gift/Hallmark": {"name": "Hallmark", "icon": "maki-gift", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "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", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "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}, diff --git a/data/presets/presets/building/greenhouse.json b/data/presets/presets/building/greenhouse.json index dd28771f8..01d5d4616 100644 --- a/data/presets/presets/building/greenhouse.json +++ b/data/presets/presets/building/greenhouse.json @@ -1,5 +1,5 @@ { - "icon": "maki-garden-center", + "icon": "maki-garden-centre", "fields": [ "name", "address", diff --git a/data/presets/presets/craft/confectionery.json b/data/presets/presets/craft/confectionery.json index b9913a6ca..e52826cf3 100644 --- a/data/presets/presets/craft/confectionery.json +++ b/data/presets/presets/craft/confectionery.json @@ -1,5 +1,5 @@ { - "icon": "maki-confectionary", + "icon": "maki-confectionery", "fields": [ "name", "operator", diff --git a/data/presets/presets/craft/gardener.json b/data/presets/presets/craft/gardener.json index 0353a23ea..f48ccb05c 100644 --- a/data/presets/presets/craft/gardener.json +++ b/data/presets/presets/craft/gardener.json @@ -1,5 +1,5 @@ { - "icon": "maki-garden-center", + "icon": "maki-garden-centre", "fields": [ "name", "operator", diff --git a/data/presets/presets/landuse/allotments.json b/data/presets/presets/landuse/allotments.json index fffc78cf9..c81758e0b 100644 --- a/data/presets/presets/landuse/allotments.json +++ b/data/presets/presets/landuse/allotments.json @@ -1,5 +1,5 @@ { - "icon": "maki-garden-center", + "icon": "maki-garden-centre", "geometry": [ "area" ], diff --git a/data/presets/presets/leisure/pitch/american_football.json b/data/presets/presets/leisure/pitch/american_football.json index bf3a869ed..a730713e1 100644 --- a/data/presets/presets/leisure/pitch/american_football.json +++ b/data/presets/presets/leisure/pitch/american_football.json @@ -1,5 +1,5 @@ { - "icon": "maki-america-football", + "icon": "maki-american-football", "fields": [ "name", "surface", diff --git a/data/presets/presets/leisure/pitch/rugby_league.json b/data/presets/presets/leisure/pitch/rugby_league.json index b86732dc6..ceea71a83 100644 --- a/data/presets/presets/leisure/pitch/rugby_league.json +++ b/data/presets/presets/leisure/pitch/rugby_league.json @@ -1,5 +1,5 @@ { - "icon": "maki-america-football", + "icon": "maki-american-football", "fields": [ "name", "surface", diff --git a/data/presets/presets/leisure/pitch/rugby_union.json b/data/presets/presets/leisure/pitch/rugby_union.json index 1c8294328..7909c8bb3 100644 --- a/data/presets/presets/leisure/pitch/rugby_union.json +++ b/data/presets/presets/leisure/pitch/rugby_union.json @@ -1,5 +1,5 @@ { - "icon": "maki-america-football", + "icon": "maki-american-football", "fields": [ "name", "surface", diff --git a/data/presets/presets/shop/confectionery.json b/data/presets/presets/shop/confectionery.json index 331890c27..02c218f14 100644 --- a/data/presets/presets/shop/confectionery.json +++ b/data/presets/presets/shop/confectionery.json @@ -1,5 +1,5 @@ { - "icon": "maki-confectionary", + "icon": "maki-confectionery", "fields": [ "name", "operator", diff --git a/data/presets/presets/shop/garden_centre.json b/data/presets/presets/shop/garden_centre.json index 91aa68d57..f8254c7ea 100644 --- a/data/presets/presets/shop/garden_centre.json +++ b/data/presets/presets/shop/garden_centre.json @@ -1,5 +1,5 @@ { - "icon": "maki-garden-center", + "icon": "maki-garden-centre", "fields": [ "name", "operator", diff --git a/data/taginfo.json b/data/taginfo.json index 09ed36729..952309792 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -1869,7 +1869,7 @@ "value": "greenhouse", "description": "🄿 Greenhouse", "object_types": ["area"], - "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/garden-center-15.svg?sanitize=true" + "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/garden-centre-15.svg?sanitize=true" }, { "key": "building", @@ -2175,7 +2175,7 @@ "value": "confectionery", "description": "🄿 Candy Maker", "object_types": ["node", "area"], - "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/confectionary-15.svg?sanitize=true" + "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/confectionery-15.svg?sanitize=true" }, { "key": "craft", @@ -2210,7 +2210,7 @@ "value": "gardener", "description": "🄿 Gardener", "object_types": ["node", "area"], - "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/garden-center-15.svg?sanitize=true" + "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/garden-centre-15.svg?sanitize=true" }, { "key": "craft", @@ -3160,7 +3160,7 @@ "value": "allotments", "description": "🄿 Community Garden", "object_types": ["area"], - "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/garden-center-15.svg?sanitize=true" + "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/garden-centre-15.svg?sanitize=true" }, { "key": "landuse", @@ -3720,7 +3720,7 @@ "value": "american_football", "description": "🄿 American Football Field", "object_types": ["node", "area"], - "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/america-football-15.svg?sanitize=true" + "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/american-football-15.svg?sanitize=true" }, { "key": "sport", @@ -3783,14 +3783,14 @@ "value": "rugby_league", "description": "🄿 Rugby League Field", "object_types": ["node", "area"], - "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/america-football-15.svg?sanitize=true" + "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/american-football-15.svg?sanitize=true" }, { "key": "sport", "value": "rugby_union", "description": "🄿 Rugby Union Field", "object_types": ["node", "area"], - "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/america-football-15.svg?sanitize=true" + "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/american-football-15.svg?sanitize=true" }, { "key": "sport", @@ -5587,7 +5587,7 @@ "value": "confectionery", "description": "🄿 Candy Store", "object_types": ["node", "area"], - "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/confectionary-15.svg?sanitize=true" + "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/confectionery-15.svg?sanitize=true" }, { "key": "shop", @@ -5741,7 +5741,7 @@ "value": "garden_centre", "description": "🄿 Garden Center", "object_types": ["node", "area"], - "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/garden-center-15.svg?sanitize=true" + "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/garden-centre-15.svg?sanitize=true" }, { "key": "shop", diff --git a/package.json b/package.json index 56bf43111..2f73c01d0 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,7 @@ "@fortawesome/free-brands-svg-icons": "~5.6.0", "@fortawesome/free-regular-svg-icons": "~5.6.0", "@fortawesome/free-solid-svg-icons": "~5.6.0", - "@mapbox/maki": "^5.0.0", + "@mapbox/maki": "^6.0.0", "chai": "^4.1.0", "colors": "^1.1.2", "concat-files": "^0.1.1",