From f078c347ebdfe2bd2e367dd34f15dbdab33f2b6e Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Fri, 6 Dec 2019 14:27:32 -0500 Subject: [PATCH] Update to temaki v3.3.0 (close #7094) --- data/presets/presets.json | 4 ++-- data/presets/presets/office/energy_supplier.json | 2 +- data/taginfo.json | 2 +- package.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/data/presets/presets.json b/data/presets/presets.json index 6644f312a..f64bc9bf1 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -849,7 +849,7 @@ "office/diplomatic/liaison": {"icon": "maki-embassy", "fields": ["name", "liaison", "{office/diplomatic}"], "geometry": ["point", "area"], "tags": {"office": "diplomatic", "diplomatic": "liaison"}, "reference": {"key": "diplomatic", "value": "liaison"}, "terms": [], "name": "Liaison Office"}, "office/educational_institution": {"icon": "maki-school", "geometry": ["point", "area"], "tags": {"office": "educational_institution"}, "terms": [], "name": "Educational Institution"}, "office/employment_agency": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "employment_agency"}, "terms": ["job"], "name": "Employment Agency"}, - "office/energy_supplier": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "energy_supplier"}, "terms": ["electricity", "energy company", "energy utility", "gas utility"], "name": "Energy Supplier Office"}, + "office/energy_supplier": {"icon": "temaki-briefcase_bolt", "geometry": ["point", "area"], "tags": {"office": "energy_supplier"}, "terms": ["electricity", "energy company", "energy utility", "gas utility"], "name": "Energy Supplier Office"}, "office/estate_agent": {"icon": "temaki-real_estate_agency", "geometry": ["point", "area"], "tags": {"office": "estate_agent"}, "terms": ["real estate"], "name": "Real Estate Office"}, "office/financial_advisor": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "financial_advisor"}, "terms": ["401k", "inheritance", "savings", "stocks", "retirement", "wealth management"], "name": "Financial Advisor"}, "office/financial": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "financial"}, "terms": [], "name": "Financial Office"}, @@ -3368,7 +3368,7 @@ "office/employment_agency/Manpower": {"name": "Manpower", "icon": "maki-suitcase", "imageURL": "https://graph.facebook.com/ManpowerGroup/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1472539", "office": "employment_agency"}, "addTags": {"brand": "Manpower", "brand:wikidata": "Q1472539", "brand:wikipedia": "en:ManpowerGroup", "name": "Manpower", "office": "employment_agency"}, "terms": [], "matchScore": 2, "suggestion": true}, "office/employment_agency/Pôle Emploi": {"name": "Pôle Emploi", "icon": "maki-suitcase", "imageURL": "https://graph.facebook.com/poleemploi/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q8901192", "office": "employment_agency"}, "addTags": {"brand": "Pôle Emploi", "brand:wikidata": "Q8901192", "brand:wikipedia": "en:Pôle emploi", "name": "Pôle Emploi", "office": "employment_agency"}, "countryCodes": ["fr"], "terms": [], "matchScore": 2, "suggestion": true}, "office/employment_agency/Randstad": {"name": "Randstad", "icon": "maki-suitcase", "imageURL": "https://graph.facebook.com/Randstad/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q267840", "office": "employment_agency"}, "addTags": {"brand": "Randstad", "brand:wikidata": "Q267840", "brand:wikipedia": "en:Randstad Holding", "name": "Randstad", "office": "employment_agency"}, "terms": [], "matchScore": 2, "suggestion": true}, - "office/energy_supplier/Naturgy": {"name": "Naturgy", "icon": "maki-suitcase", "imageURL": "https://commons.wikimedia.org/w/index.php?title=Special%3ARedirect%2Ffile%2FNaturgy.svg&width=100", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q474690", "office": "energy_supplier"}, "addTags": {"brand": "Naturgy", "brand:wikidata": "Q474690", "brand:wikipedia": "es:Naturgy", "name": "Naturgy", "office": "energy_supplier"}, "countryCodes": ["ar", "au", "be", "br", "cl", "cn", "cr", "de", "do", "dz", "eg", "es", "fr", "ie", "in", "jm", "jo", "jp", "lu", "ma", "mx", "nl", "om", "pa", "pe", "pk", "pr", "pt", "sg", "uk"], "terms": [], "matchScore": 2, "suggestion": true}, + "office/energy_supplier/Naturgy": {"name": "Naturgy", "icon": "temaki-briefcase_bolt", "imageURL": "https://commons.wikimedia.org/w/index.php?title=Special%3ARedirect%2Ffile%2FNaturgy.svg&width=100", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q474690", "office": "energy_supplier"}, "addTags": {"brand": "Naturgy", "brand:wikidata": "Q474690", "brand:wikipedia": "es:Naturgy", "name": "Naturgy", "office": "energy_supplier"}, "countryCodes": ["ar", "au", "be", "br", "cl", "cn", "cr", "de", "do", "dz", "eg", "es", "fr", "ie", "in", "jm", "jo", "jp", "lu", "ma", "mx", "nl", "om", "pa", "pe", "pk", "pr", "pt", "sg", "uk"], "terms": [], "matchScore": 2, "suggestion": true}, "office/estate_agent/Century 21": {"name": "Century 21", "icon": "temaki-real_estate_agency", "imageURL": "https://graph.facebook.com/century21/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1054480", "office": "estate_agent"}, "addTags": {"brand": "Century 21", "brand:wikidata": "Q1054480", "brand:wikipedia": "en:Century 21 (real estate)", "name": "Century 21", "office": "estate_agent"}, "terms": ["century 21 real estate"], "matchScore": 2, "suggestion": true}, "office/estate_agent/Coldwell Banker": {"name": "Coldwell Banker", "icon": "temaki-real_estate_agency", "imageURL": "https://graph.facebook.com/coldwellbanker/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q738853", "office": "estate_agent"}, "addTags": {"brand": "Coldwell Banker", "brand:wikidata": "Q738853", "brand:wikipedia": "en:Coldwell Banker", "name": "Coldwell Banker", "office": "estate_agent"}, "terms": ["coldwell banker real estate"], "matchScore": 2, "suggestion": true}, "office/estate_agent/Connells": {"name": "Connells", "icon": "temaki-real_estate_agency", "imageURL": "https://graph.facebook.com/298744224054963/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5161738", "office": "estate_agent"}, "addTags": {"brand": "Connells", "brand:wikidata": "Q5161738", "brand:wikipedia": "en:Connells Group", "name": "Connells", "office": "estate_agent"}, "countryCodes": ["gb"], "terms": [], "matchScore": 2, "suggestion": true}, diff --git a/data/presets/presets/office/energy_supplier.json b/data/presets/presets/office/energy_supplier.json index 2daf1ec99..3999e25d3 100644 --- a/data/presets/presets/office/energy_supplier.json +++ b/data/presets/presets/office/energy_supplier.json @@ -1,5 +1,5 @@ { - "icon": "maki-suitcase", + "icon": "temaki-briefcase_bolt", "geometry": [ "point", "area" diff --git a/data/taginfo.json b/data/taginfo.json index f06a7aa12..731cae153 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -824,7 +824,7 @@ {"key": "diplomatic", "value": "liaison", "description": "🄿 Liaison Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/embassy-15.svg"}, {"key": "office", "value": "educational_institution", "description": "🄿 Educational Institution", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/school-15.svg"}, {"key": "office", "value": "employment_agency", "description": "🄿 Employment Agency", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"}, - {"key": "office", "value": "energy_supplier", "description": "🄿 Energy Supplier Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"}, + {"key": "office", "value": "energy_supplier", "description": "🄿 Energy Supplier Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/briefcase_bolt.svg"}, {"key": "office", "value": "estate_agent", "description": "🄿 Real Estate Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/real_estate_agency.svg"}, {"key": "office", "value": "financial_advisor", "description": "🄿 Financial Advisor", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"}, {"key": "office", "value": "financial", "description": "🄿 Financial Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"}, diff --git a/package.json b/package.json index 44e35bc44..b172690a0 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.2.0", + "@ideditor/temaki": "~3.3.0", "@mapbox/maki": "^6.0.0", "@rollup/plugin-buble": "^0.20.0", "chai": "^4.1.0",