From 52142c1ba52fa83441e1c7858cba3e8e0862436f Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Mon, 6 Jan 2020 11:31:34 -0500 Subject: [PATCH] Add government=prosector preset (close #7225) Add terms to office=lawyer preset --- data/presets.yaml | 6 +++++ data/presets/presets.json | 3 ++- .../presets/office/government/prosecutor.json | 25 +++++++++++++++++++ data/presets/presets/office/lawyer.json | 12 ++++++++- data/taginfo.json | 1 + dist/locales/en.json | 6 ++++- 6 files changed, 50 insertions(+), 3 deletions(-) create mode 100644 data/presets/presets/office/government/prosecutor.json diff --git a/data/presets.yaml b/data/presets.yaml index f19ea48bb..f0b5e2be6 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -6625,6 +6625,11 @@ en: # office=government name: Government Office terms: '' + office/government/prosecutor: + # 'office=government, government=prosecutor' + name: Public Prosecutor's Office + # 'terms: attorney general,district attorney,prosecution' + terms: '' office/government/register_office: # 'office=government, government=register_office' name: Register Office @@ -6652,6 +6657,7 @@ en: office/lawyer: # office=lawyer name: Law Office + # 'terms: advocate,attorney,barrister,counsellor,counselor,defender,lawyer,legal,prosecutor' terms: '' office/lawyer/notary: # 'office=lawyer, lawyer=notary' diff --git a/data/presets/presets.json b/data/presets/presets.json index 62c4e51b5..1cef37a5f 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -861,12 +861,13 @@ "office/forestry": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "forestry"}, "terms": ["forest", "ranger"], "name": "Forestry Office"}, "office/foundation": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "foundation"}, "terms": [], "name": "Foundation Office"}, "office/government": {"icon": "maki-town-hall", "fields": ["name", "government", "{office}"], "geometry": ["point", "area"], "tags": {"office": "government"}, "terms": [], "name": "Government Office"}, + "office/government/prosecutor": {"icon": "maki-suitcase", "fields": ["{office}", "operator"], "geometry": ["point", "area"], "terms": ["attorney general", "district attorney", "prosecution"], "tags": {"office": "government", "government": "prosecutor"}, "reference": {"key": "government", "value": "prosecutor"}, "name": "Public Prosecutor's Office"}, "office/government/register_office": {"icon": "maki-town-hall", "fields": ["{office}", "operator"], "geometry": ["point", "area"], "terms": ["clerk", "marriage", "death", "birth", "certificate"], "tags": {"office": "government", "government": "register_office"}, "reference": {"key": "government", "value": "register_office"}, "name": "Register Office"}, "office/government/tax": {"icon": "maki-town-hall", "fields": ["{office}", "operator"], "geometry": ["point", "area"], "terms": ["fiscal authorities", "revenue office", "tax office"], "tags": {"office": "government", "government": "tax"}, "reference": {"key": "government", "value": "tax"}, "name": "Tax and Revenue Office"}, "office/guide": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "guide"}, "terms": ["dive guide", "mountain guide", "tour guide"], "name": "Tour Guide Office"}, "office/insurance": {"icon": "temaki-briefcase_shield", "moreFields": ["brand", "{office}"], "geometry": ["point", "area"], "tags": {"office": "insurance"}, "terms": [], "name": "Insurance Office"}, "office/it": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "it"}, "terms": ["computer", "information", "software", "technology"], "name": "Information Technology Office"}, - "office/lawyer": {"icon": "fas-balance-scale", "geometry": ["point", "area"], "tags": {"office": "lawyer"}, "terms": [], "name": "Law Office"}, + "office/lawyer": {"icon": "fas-balance-scale", "geometry": ["point", "area"], "tags": {"office": "lawyer"}, "terms": ["advocate", "attorney", "barrister", "counsellor", "counselor", "defender", "lawyer", "legal", "prosecutor"], "name": "Law Office"}, "office/lawyer/notary": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "lawyer", "lawyer": "notary"}, "reference": {"key": "office", "value": "notary"}, "searchable": false, "name": "Notary Office"}, "office/moving_company": {"icon": "fas-people-carry", "geometry": ["point", "area"], "tags": {"office": "moving_company"}, "terms": ["relocation"], "name": "Moving Company Office"}, "office/newspaper": {"icon": "fas-newspaper", "geometry": ["point", "area"], "tags": {"office": "newspaper"}, "terms": [], "name": "Newspaper Office"}, diff --git a/data/presets/presets/office/government/prosecutor.json b/data/presets/presets/office/government/prosecutor.json new file mode 100644 index 000000000..07775ad51 --- /dev/null +++ b/data/presets/presets/office/government/prosecutor.json @@ -0,0 +1,25 @@ +{ + "icon": "maki-suitcase", + "fields": [ + "{office}", + "operator" + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "attorney general", + "district attorney", + "prosecution" + ], + "tags": { + "office": "government", + "government": "prosecutor" + }, + "reference": { + "key": "government", + "value": "prosecutor" + }, + "name": "Public Prosecutor's Office" +} diff --git a/data/presets/presets/office/lawyer.json b/data/presets/presets/office/lawyer.json index 4a39d0988..636fb23ed 100644 --- a/data/presets/presets/office/lawyer.json +++ b/data/presets/presets/office/lawyer.json @@ -7,6 +7,16 @@ "tags": { "office": "lawyer" }, - "terms": [], + "terms": [ + "advocate", + "attorney", + "barrister", + "counsellor", + "counselor", + "defender", + "lawyer", + "legal", + "prosecutor" + ], "name": "Law Office" } diff --git a/data/taginfo.json b/data/taginfo.json index 06fcfb3c8..48e6f2894 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -836,6 +836,7 @@ {"key": "office", "value": "forestry", "description": "🄿 Forestry Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"}, {"key": "office", "value": "foundation", "description": "🄿 Foundation Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"}, {"key": "office", "value": "government", "description": "🄿 Government Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/town-hall-15.svg"}, + {"key": "government", "value": "prosecutor", "description": "🄿 Public Prosecutor's Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"}, {"key": "government", "value": "register_office", "description": "🄿 Register Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/town-hall-15.svg"}, {"key": "government", "value": "tax", "description": "🄿 Tax and Revenue Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/town-hall-15.svg"}, {"key": "office", "value": "guide", "description": "🄿 Tour Guide Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 4081a12a6..3b939437b 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -8233,6 +8233,10 @@ "name": "Government Office", "terms": "" }, + "office/government/prosecutor": { + "name": "Public Prosecutor's Office", + "terms": "attorney general,district attorney,prosecution" + }, "office/government/register_office": { "name": "Register Office", "terms": "clerk,marriage,death,birth,certificate" @@ -8255,7 +8259,7 @@ }, "office/lawyer": { "name": "Law Office", - "terms": "" + "terms": "advocate,attorney,barrister,counsellor,counselor,defender,lawyer,legal,prosecutor" }, "office/lawyer/notary": { "name": "Notary Office"