diff --git a/data/presets/presets.json b/data/presets/presets.json index d4cb5cd37..d989c544a 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -1105,7 +1105,7 @@ "shop/hunting": {"icon": "temaki-binoculars", "geometry": ["point", "area"], "tags": {"shop": "hunting"}, "terms": ["arrows", "bows", "bullets", "crossbows", "rifles", "traps"], "name": "Hunting Shop"}, "shop/interior_decoration": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "interior_decoration"}, "name": "Interior Decoration Store"}, "shop/jewelry": {"icon": "maki-jewelry-store", "geometry": ["point", "area"], "terms": ["bracelet", "diamond", "earrings", "gem", "gold", "jeweler", "jewellery", "jeweller", "necklace", "pins", "ring", "silver"], "tags": {"shop": "jewelry"}, "name": "Jewelry Store"}, - "shop/kiosk": {"icon": "maki-shop", "fields": ["{shop}", "levels"], "geometry": ["point", "area"], "tags": {"shop": "kiosk"}, "name": "Kiosk"}, + "shop/kiosk": {"icon": "fas-store", "fields": ["{shop}", "levels"], "geometry": ["point", "area"], "tags": {"shop": "kiosk"}, "name": "Kiosk"}, "shop/kitchen": {"icon": "temaki-kitchen_sink", "geometry": ["point", "area"], "tags": {"shop": "kitchen"}, "terms": ["cabinets", "countertops", "sinks"], "name": "Kitchen Design Store"}, "shop/laundry": {"icon": "temaki-laundry", "fields": ["{shop}", "self_service"], "geometry": ["point", "area"], "tags": {"shop": "laundry"}, "name": "Laundry"}, "shop/laundry/self_service": {"icon": "temaki-laundry", "geometry": ["point", "area"], "tags": {"shop": "laundry", "self_service": "yes"}, "terms": ["Coin Laundry", "Laundromat", "Coin Wash", "Launderette", "Washateria"], "name": "Self-Service Laundry"}, @@ -4877,14 +4877,14 @@ "shop/jewelry/Warren James": {"name": "Warren James", "icon": "maki-jewelry-store", "imageURL": "https://graph.facebook.com/warrenjamesjewellers/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q19604616", "shop": "jewelry"}, "addTags": {"brand": "Warren James", "brand:wikidata": "Q19604616", "brand:wikipedia": "en:Warren James Jewellers", "name": "Warren James", "shop": "jewelry"}, "countryCodes": ["gb"], "terms": [], "matchScore": 2, "suggestion": true}, "shop/jewelry/Zales": {"name": "Zales", "icon": "maki-jewelry-store", "imageURL": "https://graph.facebook.com/Zales/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q8065305", "shop": "jewelry"}, "addTags": {"brand": "Zales", "brand:wikidata": "Q8065305", "brand:wikipedia": "en:Zale Corporation", "name": "Zales", "shop": "jewelry"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true}, "shop/jewelry/Адамас": {"name": "Адамас", "icon": "maki-jewelry-store", "imageURL": "https://graph.facebook.com/adamas.club/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q62393709", "shop": "jewelry"}, "addTags": {"brand": "Адамас", "brand:en": "Adamas", "brand:ru": "Адамас", "brand:wikidata": "Q62393709", "name": "Адамас", "name:en": "Adamas", "name:ru": "Адамас", "shop": "jewelry"}, "countryCodes": ["ru"], "terms": [], "matchScore": 2, "suggestion": true}, - "shop/kiosk/Lietuvos spauda": {"name": "Lietuvos spauda", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/narvesen.no/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q6514414", "shop": "kiosk"}, "addTags": {"brand": "Lietuvos spauda", "brand:wikidata": "Q6514414", "brand:wikipedia": "lt:Lietuvos spauda", "name": "Lietuvos spauda", "shop": "kiosk"}, "countryCodes": ["lt"], "terms": [], "matchScore": 2, "suggestion": true}, - "shop/kiosk/Narvesen": {"name": "Narvesen", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/narvesen.no/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q6514414", "shop": "kiosk"}, "addTags": {"brand": "Narvesen", "brand:wikidata": "Q6514414", "brand:wikipedia": "en:Narvesen", "name": "Narvesen", "shop": "kiosk"}, "countryCodes": ["lt", "lv", "no"], "terms": [], "matchScore": 2, "suggestion": true}, - "shop/kiosk/Pressbyrån": {"name": "Pressbyrån", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/Pressbyran/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q2489072", "shop": "kiosk"}, "addTags": {"brand": "Pressbyrån", "brand:wikidata": "Q2489072", "brand:wikipedia": "en:Pressbyrån", "name": "Pressbyrån", "shop": "kiosk"}, "countryCodes": ["se"], "terms": [], "matchScore": 2, "suggestion": true}, - "shop/kiosk/R-Kioski": {"name": "R-Kioski", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/rkioski/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1571400", "shop": "kiosk"}, "addTags": {"brand": "R-Kioski", "brand:wikidata": "Q1571400", "brand:wikipedia": "en:R-kioski", "name": "R-Kioski", "shop": "kiosk"}, "countryCodes": ["fi"], "terms": [], "matchScore": 2, "suggestion": true}, - "shop/kiosk/Ruch": {"name": "Ruch", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/ruch/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1260314", "shop": "kiosk"}, "addTags": {"brand": "Ruch", "brand:wikidata": "Q1260314", "brand:wikipedia": "pl:Ruch (przedsiębiorstwo)", "name": "Ruch", "shop": "kiosk"}, "countryCodes": ["pl"], "terms": [], "matchScore": 2, "suggestion": true}, - "shop/kiosk/Tisak": {"name": "Tisak", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/tisakmedia/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q12643627", "shop": "kiosk"}, "addTags": {"brand": "Tisak", "brand:wikidata": "Q12643627", "brand:wikipedia": "hr:Tisak (tvrtka)", "name": "Tisak", "shop": "kiosk"}, "countryCodes": ["hr"], "terms": [], "matchScore": 2, "suggestion": true}, - "shop/kiosk/k kiosk": {"name": "k kiosk", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/kkiosk/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q60381703", "shop": "kiosk"}, "addTags": {"brand": "k kiosk", "brand:wikidata": "Q60381703", "brand:wikipedia": "it:K Kiosk", "name": "k kiosk", "shop": "kiosk"}, "countryCodes": ["ch"], "terms": [], "matchScore": 2, "suggestion": true}, - "shop/kiosk/キヨスク": {"name": "キヨスク", "icon": "maki-shop", "imageURL": "https://commons.wikimedia.org/w/index.php?title=Special%3ARedirect%2Ffile%2FKiosk%20logos.svg&width=100", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1334796", "shop": "kiosk"}, "addTags": {"brand": "キヨスク", "brand:en": "KIOSK", "brand:ja": "キヨスク", "brand:wikidata": "Q1334796", "brand:wikipedia": "ja:キヨスク", "name": "キヨスク", "name:en": "KIOSK", "name:ja": "キヨスク", "shop": "kiosk"}, "countryCodes": ["jp"], "terms": [], "matchScore": 2, "suggestion": true}, + "shop/kiosk/Lietuvos spauda": {"name": "Lietuvos spauda", "icon": "fas-store", "imageURL": "https://graph.facebook.com/narvesen.no/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q6514414", "shop": "kiosk"}, "addTags": {"brand": "Lietuvos spauda", "brand:wikidata": "Q6514414", "brand:wikipedia": "lt:Lietuvos spauda", "name": "Lietuvos spauda", "shop": "kiosk"}, "countryCodes": ["lt"], "terms": [], "matchScore": 2, "suggestion": true}, + "shop/kiosk/Narvesen": {"name": "Narvesen", "icon": "fas-store", "imageURL": "https://graph.facebook.com/narvesen.no/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q6514414", "shop": "kiosk"}, "addTags": {"brand": "Narvesen", "brand:wikidata": "Q6514414", "brand:wikipedia": "en:Narvesen", "name": "Narvesen", "shop": "kiosk"}, "countryCodes": ["lt", "lv", "no"], "terms": [], "matchScore": 2, "suggestion": true}, + "shop/kiosk/Pressbyrån": {"name": "Pressbyrån", "icon": "fas-store", "imageURL": "https://graph.facebook.com/Pressbyran/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q2489072", "shop": "kiosk"}, "addTags": {"brand": "Pressbyrån", "brand:wikidata": "Q2489072", "brand:wikipedia": "en:Pressbyrån", "name": "Pressbyrån", "shop": "kiosk"}, "countryCodes": ["se"], "terms": [], "matchScore": 2, "suggestion": true}, + "shop/kiosk/R-Kioski": {"name": "R-Kioski", "icon": "fas-store", "imageURL": "https://graph.facebook.com/rkioski/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1571400", "shop": "kiosk"}, "addTags": {"brand": "R-Kioski", "brand:wikidata": "Q1571400", "brand:wikipedia": "en:R-kioski", "name": "R-Kioski", "shop": "kiosk"}, "countryCodes": ["fi"], "terms": [], "matchScore": 2, "suggestion": true}, + "shop/kiosk/Ruch": {"name": "Ruch", "icon": "fas-store", "imageURL": "https://graph.facebook.com/ruch/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1260314", "shop": "kiosk"}, "addTags": {"brand": "Ruch", "brand:wikidata": "Q1260314", "brand:wikipedia": "pl:Ruch (przedsiębiorstwo)", "name": "Ruch", "shop": "kiosk"}, "countryCodes": ["pl"], "terms": [], "matchScore": 2, "suggestion": true}, + "shop/kiosk/Tisak": {"name": "Tisak", "icon": "fas-store", "imageURL": "https://graph.facebook.com/tisakmedia/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q12643627", "shop": "kiosk"}, "addTags": {"brand": "Tisak", "brand:wikidata": "Q12643627", "brand:wikipedia": "hr:Tisak (tvrtka)", "name": "Tisak", "shop": "kiosk"}, "countryCodes": ["hr"], "terms": [], "matchScore": 2, "suggestion": true}, + "shop/kiosk/k kiosk": {"name": "k kiosk", "icon": "fas-store", "imageURL": "https://graph.facebook.com/kkiosk/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q60381703", "shop": "kiosk"}, "addTags": {"brand": "k kiosk", "brand:wikidata": "Q60381703", "brand:wikipedia": "it:K Kiosk", "name": "k kiosk", "shop": "kiosk"}, "countryCodes": ["ch"], "terms": [], "matchScore": 2, "suggestion": true}, + "shop/kiosk/キヨスク": {"name": "キヨスク", "icon": "fas-store", "imageURL": "https://commons.wikimedia.org/w/index.php?title=Special%3ARedirect%2Ffile%2FKiosk%20logos.svg&width=100", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1334796", "shop": "kiosk"}, "addTags": {"brand": "キヨスク", "brand:en": "KIOSK", "brand:ja": "キヨスク", "brand:wikidata": "Q1334796", "brand:wikipedia": "ja:キヨスク", "name": "キヨスク", "name:en": "KIOSK", "name:ja": "キヨスク", "shop": "kiosk"}, "countryCodes": ["jp"], "terms": [], "matchScore": 2, "suggestion": true}, "shop/kitchen/Cuisinella": {"name": "Cuisinella", "icon": "temaki-kitchen_sink", "imageURL": "https://graph.facebook.com/CuisinellaFR/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3007012", "shop": "kitchen"}, "addTags": {"brand": "Cuisinella", "brand:wikidata": "Q3007012", "brand:wikipedia": "fr:Cuisinella", "name": "Cuisinella", "shop": "kitchen"}, "countryCodes": ["fr", "tn"], "terms": [], "matchScore": 2, "suggestion": true}, "shop/kitchen/Ixina": {"name": "Ixina", "icon": "temaki-kitchen_sink", "imageURL": "https://commons.wikimedia.org/w/index.php?title=Special%3ARedirect%2Ffile%2FIxina.png&width=100", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3156424", "shop": "kitchen"}, "addTags": {"brand": "Ixina", "brand:wikidata": "Q3156424", "brand:wikipedia": "fr:Ixina", "name": "Ixina", "shop": "kitchen"}, "countryCodes": ["ae", "au", "be", "bf", "bh", "bj", "ca", "ci", "cm", "cn", "cz", "dz", "ee", "eg", "fr", "gh", "hr", "ke", "kw", "lu", "ly", "ma", "mu", "nl", "pl", "qa", "ro", "ru", "sa", "se", "sn", "tg", "th", "tn", "vn"], "terms": [], "matchScore": 2, "suggestion": true}, "shop/kitchen/Magnet": {"name": "Magnet", "icon": "temaki-kitchen_sink", "imageURL": "https://graph.facebook.com/MagnetKitchens/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q6731427", "shop": "kitchen"}, "addTags": {"brand": "Magnet", "brand:wikidata": "Q6731427", "brand:wikipedia": "en:Magnet Kitchens", "name": "Magnet", "shop": "kitchen"}, "countryCodes": ["gb"], "terms": ["magnet kitchens"], "matchScore": 2, "suggestion": true}, diff --git a/data/presets/presets/shop/kiosk.json b/data/presets/presets/shop/kiosk.json index d10bb9ae4..ff94a98a0 100644 --- a/data/presets/presets/shop/kiosk.json +++ b/data/presets/presets/shop/kiosk.json @@ -1,5 +1,5 @@ { - "icon": "maki-shop", + "icon": "fas-store", "fields": [ "{shop}", "levels" diff --git a/data/taginfo.json b/data/taginfo.json index 0a38bde1d..c7fef39a2 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -1048,7 +1048,7 @@ {"key": "shop", "value": "hunting", "description": "🄿 Hunting Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/binoculars.svg"}, {"key": "shop", "value": "interior_decoration", "description": "🄿 Interior Decoration Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"}, {"key": "shop", "value": "jewelry", "description": "🄿 Jewelry Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/jewelry-store-15.svg"}, - {"key": "shop", "value": "kiosk", "description": "🄿 Kiosk", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"}, + {"key": "shop", "value": "kiosk", "description": "🄿 Kiosk", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-store.svg"}, {"key": "shop", "value": "kitchen", "description": "🄿 Kitchen Design Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/kitchen_sink.svg"}, {"key": "shop", "value": "laundry", "description": "🄿 Laundry", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/laundry.svg"}, {"key": "self_service", "value": "yes", "description": "🄿 Self-Service Laundry", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/laundry.svg"}, diff --git a/svg/fontawesome/fas-store.svg b/svg/fontawesome/fas-store.svg new file mode 100644 index 000000000..76bdef864 --- /dev/null +++ b/svg/fontawesome/fas-store.svg @@ -0,0 +1 @@ + \ No newline at end of file