From 4e14d3e235692616b1cadb77cc0a7d51af15241f Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Mon, 18 Nov 2019 21:29:19 -0500 Subject: [PATCH] Switch icon for shop=chocolate (closes #7051) --- data/presets/presets.json | 20 ++++++++++---------- data/presets/presets/shop/chocolate.json | 2 +- data/taginfo.json | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/data/presets/presets.json b/data/presets/presets.json index 9e7c05991..62bacfc98 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -1037,7 +1037,7 @@ "shop/charity": {"icon": "maki-shop", "fields": ["{shop}", "second_hand"], "geometry": ["point", "area"], "terms": ["thrift", "op shop", "nonprofit"], "tags": {"shop": "charity"}, "name": "Charity Store"}, "shop/cheese": {"icon": "fas-cheese", "geometry": ["point", "area"], "tags": {"shop": "cheese"}, "name": "Cheese Store"}, "shop/chemist": {"icon": "fas-shopping-basket", "geometry": ["point", "area"], "tags": {"shop": "chemist"}, "terms": ["apothecary", "beauty", "drug store", "drugstore", "gift", "hair", "med*", "pharmacy", "prescription", "tooth"], "name": "Drugstore"}, - "shop/chocolate": {"icon": "temaki-chocolate", "geometry": ["point", "area"], "tags": {"shop": "chocolate"}, "terms": ["cocoa"], "name": "Chocolate Store"}, + "shop/chocolate": {"icon": "maki-confectionery", "geometry": ["point", "area"], "tags": {"shop": "chocolate"}, "terms": ["cocoa"], "name": "Chocolate Store"}, "shop/clothes": {"icon": "maki-clothing-store", "fields": ["name", "clothes", "{shop}"], "geometry": ["point", "area"], "tags": {"shop": "clothes"}, "terms": ["blouses", "boutique", "bras", "clothes", "dresses", "fashion", "pants", "shirts", "shorts", "skirts", "slacks", "socks", "suits", "underwear"], "name": "Clothing Store"}, "shop/clothes/underwear": {"icon": "maki-clothing-store", "geometry": ["point", "area"], "tags": {"shop": "clothes", "clothes": "underwear"}, "reference": {"key": "clothes", "value": "underwear"}, "terms": ["boutique", "bras", "brassieres", "briefs", "boxers", "fashion", "lingerie", "panties", "slips", "socks", "stockings", "underclothes", "undergarments", "underpants", "undies"], "name": "Underwear Store"}, "shop/coffee": {"icon": "temaki-coffee", "geometry": ["point", "area"], "tags": {"shop": "coffee"}, "name": "Coffee Store"}, @@ -3775,15 +3775,15 @@ "shop/chemist/dm": {"name": "dm", "icon": "fas-shopping-basket", "imageURL": "https://graph.facebook.com/dm.Deutschland/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q266572", "shop": "chemist"}, "addTags": {"brand": "dm", "brand:wikidata": "Q266572", "brand:wikipedia": "en:Dm-drogerie markt", "name": "dm", "shop": "chemist"}, "countryCodes": ["at", "ba", "bg", "cz", "de", "hr", "hu", "it", "mk", "ro", "rs", "si", "sk"], "terms": ["dm drogerie markt"], "matchScore": 2, "suggestion": true}, "shop/chemist/屈臣氏": {"name": "屈臣氏", "icon": "fas-shopping-basket", "imageURL": "https://graph.facebook.com/WatsonsPH/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7974785", "shop": "chemist"}, "addTags": {"brand": "屈臣氏", "brand:wikidata": "Q7974785", "brand:wikipedia": "zh:屈臣氏", "name": "屈臣氏", "shop": "chemist"}, "countryCodes": ["cn", "hk", "tw"], "terms": [], "matchScore": 2, "suggestion": true}, "shop/chemist/康是美": {"name": "康是美", "icon": "fas-shopping-basket", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q11063876", "shop": "chemist"}, "addTags": {"brand": "康是美", "brand:wikidata": "Q11063876", "brand:wikipedia": "zh:康是美藥妝店", "name": "康是美", "shop": "chemist"}, "countryCodes": ["tw"], "terms": [], "matchScore": 2, "suggestion": true}, - "shop/chocolate/Cacau Show": {"name": "Cacau Show", "icon": "temaki-chocolate", "imageURL": "https://graph.facebook.com/CacauShow/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q9671713", "shop": "chocolate"}, "addTags": {"brand": "Cacau Show", "brand:wikidata": "Q9671713", "brand:wikipedia": "en:Cacau Show", "name": "Cacau Show", "shop": "chocolate"}, "countryCodes": ["br"], "terms": [], "matchScore": 2, "suggestion": true}, - "shop/chocolate/Chocolates Brasil Cacau": {"name": "Chocolates Brasil Cacau", "icon": "temaki-chocolate", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q9750569", "shop": "chocolate"}, "addTags": {"brand": "Chocolates Brasil Cacau", "brand:wikidata": "Q9750569", "brand:wikipedia": "pt:Chocolates Brasil Cacau", "name": "Chocolates Brasil Cacau", "shop": "chocolate", "short_name": "Brasil Cacau"}, "countryCodes": ["br"], "terms": [], "matchScore": 2, "suggestion": true}, - "shop/chocolate/Gertrude Hawk Chocolates": {"name": "Gertrude Hawk Chocolates", "icon": "temaki-chocolate", "imageURL": "https://graph.facebook.com/gertrudehawkchocolates/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5553326", "shop": "chocolate"}, "addTags": {"brand": "Gertrude Hawk Chocolates", "brand:wikidata": "Q5553326", "brand:wikipedia": "en:Gertrude Hawk Chocolates", "name": "Gertrude Hawk Chocolates", "shop": "chocolate", "short_name": "Gertrude Hawk"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true}, - "shop/chocolate/Godiva Chocolatier": {"name": "Godiva Chocolatier", "icon": "temaki-chocolate", "imageURL": "https://graph.facebook.com/Godiva/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q931084", "shop": "chocolate"}, "addTags": {"brand": "Godiva Chocolatier", "brand:wikidata": "Q931084", "brand:wikipedia": "en:Godiva Chocolatier", "name": "Godiva Chocolatier", "shop": "chocolate", "short_name": "Godiva"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true}, - "shop/chocolate/Jeff de Bruges": {"name": "Jeff de Bruges", "icon": "temaki-chocolate", "imageURL": "https://graph.facebook.com/JeffdeBrugesofficiel/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3176626", "shop": "chocolate"}, "addTags": {"brand": "Jeff de Bruges", "brand:wikidata": "Q3176626", "brand:wikipedia": "fr:Jeff de Bruges", "name": "Jeff de Bruges", "shop": "chocolate"}, "countryCodes": ["ca", "cz", "fr", "gb"], "terms": [], "matchScore": 2, "suggestion": true}, - "shop/chocolate/Laura Secord": {"name": "Laura Secord", "icon": "temaki-chocolate", "imageURL": "https://graph.facebook.com/laurasecord.ca/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q6499418", "shop": "chocolate"}, "addTags": {"brand": "Laura Secord", "brand:wikidata": "Q6499418", "brand:wikipedia": "en:Laura Secord Chocolates", "name": "Laura Secord", "shop": "chocolate"}, "countryCodes": ["ca"], "terms": [], "matchScore": 2, "suggestion": true}, - "shop/chocolate/Leonidas": {"name": "Leonidas", "icon": "temaki-chocolate", "imageURL": "https://graph.facebook.com/Leonidas.Official/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q80335", "shop": "chocolate"}, "addTags": {"brand": "Leonidas", "brand:wikidata": "Q80335", "brand:wikipedia": "en:Leonidas (chocolate maker)", "name": "Leonidas", "shop": "chocolate"}, "countryCodes": ["be", "cz", "fr", "gb", "gr", "nl"], "terms": [], "matchScore": 2, "suggestion": true}, - "shop/chocolate/Lindt": {"name": "Lindt", "icon": "temaki-chocolate", "imageURL": "https://graph.facebook.com/lindtchocolateusa/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q152822", "shop": "chocolate"}, "addTags": {"brand": "Lindt", "brand:wikidata": "Q152822", "brand:wikipedia": "en:Lindt & Sprüngli", "name": "Lindt", "shop": "chocolate"}, "terms": [], "matchScore": 2, "suggestion": true}, - "shop/chocolate/Purdys Chocolatier": {"name": "Purdys Chocolatier", "icon": "temaki-chocolate", "imageURL": "https://graph.facebook.com/PurdysChocolatier/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7261007", "shop": "chocolate"}, "addTags": {"brand": "Purdys Chocolatier", "brand:wikidata": "Q7261007", "brand:wikipedia": "en:Purdy's Chocolates", "name": "Purdys Chocolatier", "shop": "chocolate"}, "countryCodes": ["ca"], "terms": [], "matchScore": 2, "suggestion": true}, + "shop/chocolate/Cacau Show": {"name": "Cacau Show", "icon": "maki-confectionery", "imageURL": "https://graph.facebook.com/CacauShow/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q9671713", "shop": "chocolate"}, "addTags": {"brand": "Cacau Show", "brand:wikidata": "Q9671713", "brand:wikipedia": "en:Cacau Show", "name": "Cacau Show", "shop": "chocolate"}, "countryCodes": ["br"], "terms": [], "matchScore": 2, "suggestion": true}, + "shop/chocolate/Chocolates Brasil Cacau": {"name": "Chocolates Brasil Cacau", "icon": "maki-confectionery", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q9750569", "shop": "chocolate"}, "addTags": {"brand": "Chocolates Brasil Cacau", "brand:wikidata": "Q9750569", "brand:wikipedia": "pt:Chocolates Brasil Cacau", "name": "Chocolates Brasil Cacau", "shop": "chocolate", "short_name": "Brasil Cacau"}, "countryCodes": ["br"], "terms": [], "matchScore": 2, "suggestion": true}, + "shop/chocolate/Gertrude Hawk Chocolates": {"name": "Gertrude Hawk Chocolates", "icon": "maki-confectionery", "imageURL": "https://graph.facebook.com/gertrudehawkchocolates/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5553326", "shop": "chocolate"}, "addTags": {"brand": "Gertrude Hawk Chocolates", "brand:wikidata": "Q5553326", "brand:wikipedia": "en:Gertrude Hawk Chocolates", "name": "Gertrude Hawk Chocolates", "shop": "chocolate", "short_name": "Gertrude Hawk"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true}, + "shop/chocolate/Godiva Chocolatier": {"name": "Godiva Chocolatier", "icon": "maki-confectionery", "imageURL": "https://graph.facebook.com/Godiva/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q931084", "shop": "chocolate"}, "addTags": {"brand": "Godiva Chocolatier", "brand:wikidata": "Q931084", "brand:wikipedia": "en:Godiva Chocolatier", "name": "Godiva Chocolatier", "shop": "chocolate", "short_name": "Godiva"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true}, + "shop/chocolate/Jeff de Bruges": {"name": "Jeff de Bruges", "icon": "maki-confectionery", "imageURL": "https://graph.facebook.com/JeffdeBrugesofficiel/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3176626", "shop": "chocolate"}, "addTags": {"brand": "Jeff de Bruges", "brand:wikidata": "Q3176626", "brand:wikipedia": "fr:Jeff de Bruges", "name": "Jeff de Bruges", "shop": "chocolate"}, "countryCodes": ["ca", "cz", "fr", "gb"], "terms": [], "matchScore": 2, "suggestion": true}, + "shop/chocolate/Laura Secord": {"name": "Laura Secord", "icon": "maki-confectionery", "imageURL": "https://graph.facebook.com/laurasecord.ca/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q6499418", "shop": "chocolate"}, "addTags": {"brand": "Laura Secord", "brand:wikidata": "Q6499418", "brand:wikipedia": "en:Laura Secord Chocolates", "name": "Laura Secord", "shop": "chocolate"}, "countryCodes": ["ca"], "terms": [], "matchScore": 2, "suggestion": true}, + "shop/chocolate/Leonidas": {"name": "Leonidas", "icon": "maki-confectionery", "imageURL": "https://graph.facebook.com/Leonidas.Official/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q80335", "shop": "chocolate"}, "addTags": {"brand": "Leonidas", "brand:wikidata": "Q80335", "brand:wikipedia": "en:Leonidas (chocolate maker)", "name": "Leonidas", "shop": "chocolate"}, "countryCodes": ["be", "cz", "fr", "gb", "gr", "nl"], "terms": [], "matchScore": 2, "suggestion": true}, + "shop/chocolate/Lindt": {"name": "Lindt", "icon": "maki-confectionery", "imageURL": "https://graph.facebook.com/lindtchocolateusa/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q152822", "shop": "chocolate"}, "addTags": {"brand": "Lindt", "brand:wikidata": "Q152822", "brand:wikipedia": "en:Lindt & Sprüngli", "name": "Lindt", "shop": "chocolate"}, "terms": [], "matchScore": 2, "suggestion": true}, + "shop/chocolate/Purdys Chocolatier": {"name": "Purdys Chocolatier", "icon": "maki-confectionery", "imageURL": "https://graph.facebook.com/PurdysChocolatier/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7261007", "shop": "chocolate"}, "addTags": {"brand": "Purdys Chocolatier", "brand:wikidata": "Q7261007", "brand:wikipedia": "en:Purdy's Chocolates", "name": "Purdys Chocolatier", "shop": "chocolate"}, "countryCodes": ["ca"], "terms": [], "matchScore": 2, "suggestion": true}, "shop/clothes/AOKI": {"name": "AOKI", "icon": "maki-clothing-store", "imageURL": "https://graph.facebook.com/aokistyle/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q11189480", "shop": "clothes"}, "addTags": {"brand": "AOKI", "brand:wikidata": "Q11189480", "brand:wikipedia": "ja:AOKIホールディングス", "clothes": "men", "name": "AOKI", "name:ja": "アオキ", "shop": "clothes"}, "countryCodes": ["jp"], "terms": [], "matchScore": 2, "suggestion": true}, "shop/clothes/Abercrombie & Fitch": {"name": "Abercrombie & Fitch", "icon": "maki-clothing-store", "imageURL": "https://graph.facebook.com/abercrombieofficial/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q319344", "shop": "clothes"}, "addTags": {"brand": "Abercrombie & Fitch", "brand:wikidata": "Q319344", "brand:wikipedia": "en:Abercrombie & Fitch", "clothes": "men;women", "name": "Abercrombie & Fitch", "shop": "clothes"}, "countryCodes": ["de", "us"], "terms": [], "matchScore": 2, "suggestion": true}, "shop/clothes/Abercrombie Kids": {"name": "Abercrombie Kids", "icon": "maki-clothing-store", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q429856", "shop": "clothes"}, "addTags": {"brand": "Abercrombie Kids", "brand:wikidata": "Q429856", "brand:wikipedia": "en:Abercrombie Kids", "clothes": "children", "name": "Abercrombie Kids", "shop": "clothes"}, "countryCodes": ["ca", "de", "it", "uk", "us"], "terms": [], "matchScore": 2, "suggestion": true}, diff --git a/data/presets/presets/shop/chocolate.json b/data/presets/presets/shop/chocolate.json index 6009e60d5..df2b9b438 100644 --- a/data/presets/presets/shop/chocolate.json +++ b/data/presets/presets/shop/chocolate.json @@ -1,5 +1,5 @@ { - "icon": "temaki-chocolate", + "icon": "maki-confectionery", "geometry": [ "point", "area" diff --git a/data/taginfo.json b/data/taginfo.json index 714dca0c8..fe64bf391 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -982,7 +982,7 @@ {"key": "shop", "value": "charity", "description": "🄿 Charity Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"}, {"key": "shop", "value": "cheese", "description": "🄿 Cheese Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-cheese.svg"}, {"key": "shop", "value": "chemist", "description": "🄿 Drugstore", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-shopping-basket.svg"}, - {"key": "shop", "value": "chocolate", "description": "🄿 Chocolate Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/chocolate.svg"}, + {"key": "shop", "value": "chocolate", "description": "🄿 Chocolate Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/confectionery-15.svg"}, {"key": "shop", "value": "clothes", "description": "🄿 Clothing Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/clothing-store-15.svg"}, {"key": "clothes", "value": "underwear", "description": "🄿 Underwear Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/clothing-store-15.svg"}, {"key": "shop", "value": "coffee", "description": "🄿 Coffee Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/coffee.svg"},