From e73ca637db0989dc10b7ba250e36c2f26725bb5b Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Fri, 8 Nov 2019 17:58:41 +0100 Subject: [PATCH] Add preset for office=consulting to support new NSI entry (re: #7022) --- data/deprecated.json | 16 ++++++++++++++++ data/presets.yaml | 8 ++++++++ data/presets/fields.json | 1 + data/presets/fields/consulting.json | 5 +++++ data/presets/presets.json | 2 ++ data/presets/presets/office/consulting.json | 19 +++++++++++++++++++ data/taginfo.json | 6 ++++++ dist/locales/en.json | 7 +++++++ 8 files changed, 64 insertions(+) create mode 100644 data/presets/fields/consulting.json create mode 100644 data/presets/presets/office/consulting.json diff --git a/data/deprecated.json b/data/deprecated.json index b99aead66..1ffdf1dfb 100644 --- a/data/deprecated.json +++ b/data/deprecated.json @@ -232,6 +232,10 @@ "old": {"color": "*"}, "replace": {"colour": "$1"} }, + { + "old": {"company": "consulting"}, + "replace": {"office": "consulting"} + }, { "old": {"craft": "glass"}, "replace": {"craft": "glaziery"} @@ -703,6 +707,14 @@ "old": {"office": "administrative"}, "replace": {"office": "government"} }, + { + "old": {"office": "consultancy"}, + "replace": {"office": "consulting"} + }, + { + "old": {"office": "consultant"}, + "replace": {"office": "consulting"} + }, { "old": {"office": "real_estate"}, "replace": {"office": "estate_agent"} @@ -845,6 +857,10 @@ "old": {"shop": "cafe"}, "replace": {"amenity": "cafe"} }, + { + "old": {"shop": "consulting"}, + "replace": {"office": "consulting"} + }, { "old": {"shop": "dive"}, "replace": {"shop": "scuba_diving"} diff --git a/data/presets.yaml b/data/presets.yaml index ed56e425c..93d545032 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -442,6 +442,9 @@ en: consulate: # consulate=* label: Type + consulting: + # consulting=* + label: Expertise contact/webcam: # 'contact:webcam=*' label: Webcam URL @@ -6351,6 +6354,11 @@ en: # office=company name: Corporate Office terms: '' + office/consulting: + # office=consulting + name: Consultancy Office + # 'terms: consulting firm office' + terms: '' office/coworking: # office=coworking name: Coworking Space diff --git a/data/presets/fields.json b/data/presets/fields.json index f308d08af..78d74a015 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -74,6 +74,7 @@ "communication_multi": {"key": "communication:", "type": "multiCombo", "label": "Communication Types"}, "construction": {"key": "construction", "type": "combo", "label": "Type"}, "consulate": {"key": "consulate", "type": "combo", "label": "Type"}, + "consulting": {"key": "consulting", "type": "semiCombo", "label": "Expertise"}, "contact/webcam": {"key": "contact:webcam", "type": "url", "icon": "website", "label": "Webcam URL", "placeholder": "http://example.com/"}, "content": {"key": "content", "type": "combo", "label": "Content", "options": ["silage", "water", "oil", "fuel", "slurry", "gas", "manure", "sewage"]}, "conveying_escalator": {"key": "conveying", "type": "check", "label": "Escalator"}, diff --git a/data/presets/fields/consulting.json b/data/presets/fields/consulting.json new file mode 100644 index 000000000..527c710b1 --- /dev/null +++ b/data/presets/fields/consulting.json @@ -0,0 +1,5 @@ +{ + "key": "consulting", + "type": "semiCombo", + "label": "Expertise" +} diff --git a/data/presets/presets.json b/data/presets/presets.json index 4e1bf69f1..6bb0b095d 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -832,6 +832,7 @@ "office/bail_bond_agent": {"icon": "maki-bank", "moreFields": ["{office}", "currency_multi", "payment_multi"], "geometry": ["point", "area"], "tags": {"office": "bail_bond_agent"}, "terms": ["bail bond dealer", "bail bond man", "bail bondsman", "bail bondsperson"], "name": "Bail Bond Agent"}, "office/charity": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "charity"}, "terms": ["charitable organization"], "name": "Charity Office"}, "office/company": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "company"}, "terms": [], "name": "Corporate Office"}, + "office/consulting": {"icon": "maki-suitcase", "fields": ["name", "consulting", "{office}"], "geometry": ["point", "area"], "tags": {"office": "consulting"}, "terms": ["consulting firm office"], "name": "Consultancy Office"}, "office/coworking": {"icon": "maki-suitcase", "fields": ["{office}", "internet_access"], "moreFields": ["internet_access/fee", "internet_access/ssid"], "geometry": ["point", "area"], "terms": ["coworking", "office"], "tags": {"office": "coworking"}, "reference": {"key": "amenity", "value": "coworking_space"}, "name": "Coworking Space"}, "office/diplomatic": {"icon": "maki-embassy", "fields": ["name", "diplomatic", "country", "target", "diplomatic/services", "{office}"], "geometry": ["point", "area"], "tags": {"office": "diplomatic"}, "terms": [], "name": "Diplomatic Office"}, "office/diplomatic/consulate": {"icon": "maki-embassy", "fields": ["name", "consulate", "{office/diplomatic}"], "geometry": ["point", "area"], "tags": {"office": "diplomatic", "diplomatic": "consulate"}, "reference": {"key": "diplomatic", "value": "consulate"}, "terms": [], "name": "Consulate"}, @@ -3344,6 +3345,7 @@ "leisure/sports_centre/YMCA": {"name": "YMCA", "icon": "maki-pitch", "imageURL": "https://graph.facebook.com/YMCA/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q157169", "leisure": "sports_centre"}, "addTags": {"brand": "YMCA", "brand:wikidata": "Q157169", "brand:wikipedia": "en:YMCA", "leisure": "sports_centre", "name": "YMCA"}, "terms": [], "matchScore": 2, "suggestion": true}, "leisure/sports_centre/iFLY": {"name": "iFLY", "icon": "maki-pitch", "imageURL": "https://graph.facebook.com/iFLYUS/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q64767105", "leisure": "sports_centre"}, "addTags": {"brand": "iFLY", "brand:wikidata": "Q64767105", "leisure": "sports_centre", "name": "iFLY", "sport": "indoor_skydiving"}, "terms": [], "matchScore": 2, "suggestion": true}, "office/bail_bond_agent/Aladdin Bail Bonds": {"name": "Aladdin Bail Bonds", "icon": "maki-bank", "imageURL": "https://commons.wikimedia.org/w/index.php?title=Special%3ARedirect%2Ffile%2FAladdin%20Bail%20Bonds%20logo.png&width=100", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q64166257", "office": "bail_bond_agent"}, "addTags": {"brand": "Aladdin Bail Bonds", "brand:wikidata": "Q64166257", "brand:wikipedia": "en:Aladdin Bail Bonds", "name": "Aladdin Bail Bonds", "office": "bail_bond_agent", "opening_hours": "24/7"}, "countryCodes": ["us"], "terms": ["aladdin", "aladin bail bonds", "alladin bail bonds"], "matchScore": 2, "suggestion": true}, + "office/consulting/Indra": {"name": "Indra", "icon": "maki-suitcase", "imageURL": "https://commons.wikimedia.org/w/index.php?title=Special%3ARedirect%2Ffile%2FIndra-Sistemas-Logo.svg&width=100", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1661823", "office": "consulting"}, "addTags": {"brand": "Indra", "brand:wikidata": "Q1661823", "brand:wikipedia": "es:Indra Sistemas", "name": "Indra", "office": "consulting", "official_name": "Indra Sistemas, S.A."}, "terms": [], "matchScore": 2, "suggestion": true}, "office/coworking/Awfis": {"name": "Awfis", "icon": "maki-suitcase", "imageURL": "https://graph.facebook.com/myawfis/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q60747757", "office": "coworking"}, "addTags": {"brand": "Awfis", "brand:wikidata": "Q60747757", "brand:wikipedia": "en:Awfis", "fee": "yes", "name": "Awfis", "office": "coworking"}, "reference": {"key": "amenity", "value": "coworking_space"}, "countryCodes": ["in"], "terms": [], "matchScore": 2, "suggestion": true}, "office/coworking/Ucommune (China)": {"name": "Ucommune (China)", "icon": "maki-suitcase", "imageURL": "https://graph.facebook.com/ucommunes/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q60785187", "office": "coworking"}, "addTags": {"brand": "优客工场", "brand:en": "Ucommune", "brand:wikidata": "Q60785187", "brand:wikipedia": "en:Ucommune", "brand:zh": "优客工场", "brand:zh-Hans": "优客工场", "fee": "yes", "name": "优客工场", "name:en": "Ucommune", "name:zh": "优客工场", "name:zh-Hans": "优客工场", "office": "coworking"}, "reference": {"key": "amenity", "value": "coworking_space"}, "countryCodes": ["cn"], "terms": [], "matchScore": 2, "suggestion": true}, "office/coworking/Ucommune (Hong Kong)": {"name": "Ucommune (Hong Kong)", "icon": "maki-suitcase", "imageURL": "https://graph.facebook.com/ucommunes/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q60785187", "office": "coworking"}, "addTags": {"brand": "優客工場 Ucommune", "brand:en": "Ucommune", "brand:wikidata": "Q60785187", "brand:wikipedia": "en:Ucommune", "brand:zh": "優客工場", "brand:zh-Hans": "优客工场", "brand:zh-Hant": "優客工場", "fee": "yes", "name": "優客工場 Ucommune", "name:en": "Ucommune", "name:zh": "優客工場", "name:zh-Hans": "优客工场", "name:zh-Hant": "優客工場", "office": "coworking"}, "reference": {"key": "amenity", "value": "coworking_space"}, "countryCodes": ["hk"], "terms": [], "matchScore": 2, "suggestion": true}, diff --git a/data/presets/presets/office/consulting.json b/data/presets/presets/office/consulting.json new file mode 100644 index 000000000..4b33090f7 --- /dev/null +++ b/data/presets/presets/office/consulting.json @@ -0,0 +1,19 @@ +{ + "icon": "maki-suitcase", + "fields": [ + "name", + "consulting", + "{office}" + ], + "geometry": [ + "point", + "area" + ], + "tags": { + "office": "consulting" + }, + "terms": [ + "consulting firm office" + ], + "name": "Consultancy Office" +} diff --git a/data/taginfo.json b/data/taginfo.json index 69ae07d46..2cfa69fdd 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -808,6 +808,7 @@ {"key": "office", "value": "bail_bond_agent", "description": "🄿 Bail Bond Agent", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/bank-15.svg"}, {"key": "office", "value": "charity", "description": "🄿 Charity Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"}, {"key": "office", "value": "company", "description": "🄿 Corporate Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"}, + {"key": "office", "value": "consulting", "description": "🄿 Consultancy Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"}, {"key": "office", "value": "coworking", "description": "🄿 Coworking Space", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"}, {"key": "office", "value": "diplomatic", "description": "🄿 Diplomatic Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/embassy-15.svg"}, {"key": "diplomatic", "value": "consulate", "description": "🄿 Consulate", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/embassy-15.svg"}, @@ -1331,6 +1332,7 @@ {"key": "communication:", "description": "🄵 Communication Types"}, {"key": "construction", "description": "🄵 Type"}, {"key": "consulate", "description": "🄵 Type"}, + {"key": "consulting", "description": "🄵 Expertise"}, {"key": "contact:webcam", "description": "🄵 Webcam URL"}, {"key": "content", "description": "🄵 Content"}, {"key": "conveying", "value": "forward", "description": "🄵 Movement Direction"}, @@ -1920,6 +1922,7 @@ {"key": "building:type", "description": "🄳 ➜ building=*"}, {"key": "camp_site", "value": "camp_pitch", "description": "🄳 ➜ tourism=camp_pitch"}, {"key": "color", "description": "🄳 ➜ colour=*"}, + {"key": "company", "value": "consulting", "description": "🄳 ➜ office=consulting"}, {"key": "craft", "value": "glass", "description": "🄳 ➜ craft=glaziery"}, {"key": "craft", "value": "catering", "description": "🄳 ➜ craft=caterer"}, {"key": "craft", "value": "sculpter", "description": "🄳 ➜ craft=sculptor"}, @@ -2021,6 +2024,8 @@ {"key": "natural", "value": "waterfall", "description": "🄳 ➜ waterway=waterfall"}, {"key": "NOTE", "description": "🄳 ➜ note=*"}, {"key": "nosquare", "description": "🄳 ➜ nonsquare=*"}, + {"key": "office", "value": "consultancy", "description": "🄳 ➜ office=consulting"}, + {"key": "office", "value": "consultant", "description": "🄳 ➜ office=consulting"}, {"key": "office", "value": "real_estate", "description": "🄳 ➜ office=estate_agent"}, {"key": "oneway", "value": "1", "description": "🄳 ➜ oneway=yes"}, {"key": "oneway", "value": "alternate", "description": "🄳 ➜ oneway=alternating"}, @@ -2052,6 +2057,7 @@ {"key": "shop", "value": "bail_bonds", "description": "🄳 ➜ office=bail_bond_agent"}, {"key": "shop", "value": "betting", "description": "🄳 ➜ shop=bookmaker"}, {"key": "shop", "value": "cafe", "description": "🄳 ➜ amenity=cafe"}, + {"key": "shop", "value": "consulting", "description": "🄳 ➜ office=consulting"}, {"key": "shop", "value": "dive", "description": "🄳 ➜ shop=scuba_diving"}, {"key": "shop", "value": "fish", "description": "🄳 ➜ shop=seafood"}, {"key": "shop", "value": "gallery", "description": "🄳 ➜ shop=art"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 4001f7bab..a4ba6f4ed 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -2847,6 +2847,9 @@ "consulate": { "label": "Type" }, + "consulting": { + "label": "Expertise" + }, "contact/webcam": { "label": "Webcam URL", "placeholder": "http://example.com/" @@ -7905,6 +7908,10 @@ "name": "Corporate Office", "terms": "" }, + "office/consulting": { + "name": "Consultancy Office", + "terms": "consulting firm office" + }, "office/coworking": { "name": "Coworking Space", "terms": "coworking,office"