From 2211e7be1d73dd5c6ff307acd12d0a60cdff8efc Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Mon, 21 Oct 2019 22:42:00 -0400 Subject: [PATCH] Swqp `temaki-gas` -> `temaki-propane_tank` icon (the one breaking change from v2.0.0) --- data/presets/presets.json | 10 +++++----- data/presets/presets/shop/fuel.json | 2 +- data/presets/presets/shop/gas.json | 2 +- data/taginfo.json | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/data/presets/presets.json b/data/presets/presets.json index e59655540..dc4935f06 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -1057,12 +1057,12 @@ "shop/florist": {"icon": "maki-florist", "geometry": ["point", "area"], "terms": ["flower"], "tags": {"shop": "florist"}, "name": "Florist"}, "shop/frame": {"icon": "fas-vector-square", "geometry": ["point", "area"], "tags": {"shop": "frame"}, "terms": ["art*", "paint*", "photo*", "frame"], "name": "Framing Shop"}, "shop/frozen_food": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "frozen_food"}, "name": "Frozen Food"}, - "shop/fuel": {"icon": "temaki-gas", "fields": ["{shop}", "fuel_multi"], "geometry": ["point", "area"], "tags": {"shop": "fuel"}, "name": "Fuel Shop", "matchScore": 0.5}, + "shop/fuel": {"icon": "temaki-propane_tank", "fields": ["{shop}", "fuel_multi"], "geometry": ["point", "area"], "tags": {"shop": "fuel"}, "name": "Fuel Shop", "matchScore": 0.5}, "shop/funeral_directors": {"icon": "maki-cemetery", "fields": ["{shop}", "religion", "denomination"], "geometry": ["point", "area"], "terms": ["undertaker", "memorial home"], "tags": {"shop": "funeral_directors"}, "name": "Funeral Home"}, "shop/furniture": {"icon": "fas-couch", "geometry": ["point", "area"], "terms": ["chair", "sofa", "table"], "tags": {"shop": "furniture"}, "name": "Furniture Store"}, "shop/games": {"icon": "fas-dice", "geometry": ["point", "area"], "tags": {"shop": "games"}, "terms": ["board game", "card game", "dice game", "game shop", "live action role-playing game", "miniatures wargame", "strategy game"], "name": "Tabletop Game Store"}, "shop/garden_centre": {"icon": "maki-garden-centre", "geometry": ["point", "area"], "terms": ["landscape", "mulch", "shrub", "tree"], "tags": {"shop": "garden_centre"}, "name": "Garden Center"}, - "shop/gas": {"icon": "temaki-gas", "geometry": ["point", "area"], "terms": ["cng", "lpg", "natural gas", "propane", "refill", "tank"], "tags": {"shop": "gas"}, "name": "Bottled Gas Shop"}, + "shop/gas": {"icon": "temaki-propane_tank", "geometry": ["point", "area"], "terms": ["cng", "lpg", "natural gas", "propane", "refill", "tank"], "tags": {"shop": "gas"}, "name": "Bottled Gas Shop"}, "shop/general": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "general"}, "terms": ["village shop"], "name": "General Store"}, "shop/gift": {"icon": "maki-gift", "geometry": ["point", "area"], "terms": ["souvenir"], "tags": {"shop": "gift"}, "name": "Gift Shop"}, "shop/greengrocer": {"icon": "fas-carrot", "geometry": ["point", "area"], "terms": ["fruit", "produce", "vegetable"], "tags": {"shop": "greengrocer"}, "name": "Greengrocer"}, @@ -4264,9 +4264,9 @@ "shop/garden_centre/Jardiland": {"name": "Jardiland", "icon": "maki-garden-centre", "imageURL": "https://graph.facebook.com/Jardiland/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3162276", "shop": "garden_centre"}, "addTags": {"brand": "Jardiland", "brand:wikidata": "Q3162276", "brand:wikipedia": "fr:Jardiland", "name": "Jardiland", "shop": "garden_centre"}, "countryCodes": ["fr"], "terms": [], "matchScore": 2, "suggestion": true}, "shop/garden_centre/Point Vert": {"name": "Point Vert", "icon": "maki-garden-centre", "imageURL": "https://graph.facebook.com/444739795728913/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q16661975", "shop": "garden_centre"}, "addTags": {"brand": "Point Vert", "brand:wikidata": "Q16661975", "brand:wikipedia": "fr:Magasin vert", "name": "Point Vert", "shop": "garden_centre"}, "countryCodes": ["fr"], "terms": [], "matchScore": 2, "suggestion": true}, "shop/garden_centre/Truffaut": {"name": "Truffaut", "icon": "maki-garden-centre", "imageURL": "https://graph.facebook.com/truffautfr/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3162640", "shop": "garden_centre"}, "addTags": {"brand": "Truffaut", "brand:wikidata": "Q3162640", "brand:wikipedia": "fr:Jardineries Truffaut", "name": "Truffaut", "shop": "garden_centre"}, "countryCodes": ["fr"], "terms": [], "matchScore": 2, "suggestion": true}, - "shop/gas/Airgas": {"name": "Airgas", "icon": "temaki-gas", "imageURL": "https://graph.facebook.com/airgasusa/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q80635", "shop": "gas"}, "addTags": {"brand": "Airgas", "brand:wikidata": "Q80635", "brand:wikipedia": "en:Airgas", "name": "Airgas", "shop": "gas"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true}, - "shop/gas/AmeriGas": {"name": "AmeriGas", "icon": "temaki-gas", "imageURL": "https://graph.facebook.com/AmeriGas/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q23130318", "shop": "gas"}, "addTags": {"brand": "AmeriGas", "brand:wikidata": "Q23130318", "brand:wikipedia": "en:AmeriGas", "fuel:lpg": "yes", "name": "AmeriGas", "shop": "gas"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true}, - "shop/gas/Ferrellgas": {"name": "Ferrellgas", "icon": "temaki-gas", "imageURL": "https://graph.facebook.com/Ferrellgas/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5445299", "shop": "gas"}, "addTags": {"brand": "Ferrellgas", "brand:wikidata": "Q5445299", "brand:wikipedia": "en:Ferrellgas", "fuel:lpg": "yes", "name": "Ferrellgas", "shop": "gas"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true}, + "shop/gas/Airgas": {"name": "Airgas", "icon": "temaki-propane_tank", "imageURL": "https://graph.facebook.com/airgasusa/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q80635", "shop": "gas"}, "addTags": {"brand": "Airgas", "brand:wikidata": "Q80635", "brand:wikipedia": "en:Airgas", "name": "Airgas", "shop": "gas"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true}, + "shop/gas/AmeriGas": {"name": "AmeriGas", "icon": "temaki-propane_tank", "imageURL": "https://graph.facebook.com/AmeriGas/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q23130318", "shop": "gas"}, "addTags": {"brand": "AmeriGas", "brand:wikidata": "Q23130318", "brand:wikipedia": "en:AmeriGas", "fuel:lpg": "yes", "name": "AmeriGas", "shop": "gas"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true}, + "shop/gas/Ferrellgas": {"name": "Ferrellgas", "icon": "temaki-propane_tank", "imageURL": "https://graph.facebook.com/Ferrellgas/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5445299", "shop": "gas"}, "addTags": {"brand": "Ferrellgas", "brand:wikidata": "Q5445299", "brand:wikipedia": "en:Ferrellgas", "fuel:lpg": "yes", "name": "Ferrellgas", "shop": "gas"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true}, "shop/gift/American Greetings": {"name": "American Greetings", "icon": "maki-gift", "imageURL": "https://graph.facebook.com/AmericanGreetings/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q464767", "shop": "gift"}, "addTags": {"brand": "American Greetings", "brand:wikidata": "Q464767", "brand:wikipedia": "en:American Greetings", "name": "American Greetings", "shop": "gift"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true}, "shop/gift/Card Factory": {"name": "Card Factory", "icon": "maki-gift", "imageURL": "https://graph.facebook.com/cardfactoryplc/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5038192", "shop": "gift"}, "addTags": {"brand": "Card Factory", "brand:wikidata": "Q5038192", "brand:wikipedia": "en:Card Factory", "name": "Card Factory", "shop": "gift"}, "countryCodes": ["gb", "im"], "terms": [], "matchScore": 2, "suggestion": true}, "shop/gift/Carlton Cards": {"name": "Carlton Cards", "icon": "maki-gift", "imageURL": "https://graph.facebook.com/Carltoncards.ca/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5042968", "shop": "gift"}, "addTags": {"brand": "Carlton Cards", "brand:wikidata": "Q5042968", "brand:wikipedia": "en:Carlton Cards", "name": "Carlton Cards", "shop": "gift"}, "countryCodes": ["ca"], "terms": ["carlton"], "matchScore": 2, "suggestion": true}, diff --git a/data/presets/presets/shop/fuel.json b/data/presets/presets/shop/fuel.json index efa07c12f..3e7012f9c 100644 --- a/data/presets/presets/shop/fuel.json +++ b/data/presets/presets/shop/fuel.json @@ -1,5 +1,5 @@ { - "icon": "temaki-gas", + "icon": "temaki-propane_tank", "fields": [ "{shop}", "fuel_multi" diff --git a/data/presets/presets/shop/gas.json b/data/presets/presets/shop/gas.json index de683ca73..f13de04a7 100644 --- a/data/presets/presets/shop/gas.json +++ b/data/presets/presets/shop/gas.json @@ -1,5 +1,5 @@ { - "icon": "temaki-gas", + "icon": "temaki-propane_tank", "geometry": [ "point", "area" diff --git a/data/taginfo.json b/data/taginfo.json index 002b358fc..9518c688a 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -1000,12 +1000,12 @@ {"key": "shop", "value": "florist", "description": "🄿 Florist", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/florist-15.svg"}, {"key": "shop", "value": "frame", "description": "🄿 Framing Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-vector-square.svg"}, {"key": "shop", "value": "frozen_food", "description": "🄿 Frozen Food", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"}, - {"key": "shop", "value": "fuel", "description": "🄿 Fuel Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/gas.svg"}, + {"key": "shop", "value": "fuel", "description": "🄿 Fuel Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/propane_tank.svg"}, {"key": "shop", "value": "funeral_directors", "description": "🄿 Funeral Home", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/cemetery-15.svg"}, {"key": "shop", "value": "furniture", "description": "🄿 Furniture Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-couch.svg"}, {"key": "shop", "value": "games", "description": "🄿 Tabletop Game Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-dice.svg"}, {"key": "shop", "value": "garden_centre", "description": "🄿 Garden Center", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/garden-centre-15.svg"}, - {"key": "shop", "value": "gas", "description": "🄿 Bottled Gas Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/gas.svg"}, + {"key": "shop", "value": "gas", "description": "🄿 Bottled Gas Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/propane_tank.svg"}, {"key": "shop", "value": "general", "description": "🄿 General Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"}, {"key": "shop", "value": "gift", "description": "🄿 Gift Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/gift-15.svg"}, {"key": "shop", "value": "greengrocer", "description": "🄿 Greengrocer", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-carrot.svg"},