From 051540a7bd298bc70a2864730d41868c219a958e Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Fri, 13 Sep 2019 09:09:57 -0400 Subject: [PATCH] Add icon and terms to Research Office preset --- data/presets.yaml | 1 + data/presets/presets.json | 2 +- data/presets/presets/office/research.json | 8 ++++++-- data/taginfo.json | 2 +- dist/locales/en.json | 2 +- svg/fontawesome/fas-flask.svg | 1 + 6 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 svg/fontawesome/fas-flask.svg diff --git a/data/presets.yaml b/data/presets.yaml index e50b8d74c..13fbd8cad 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -6314,6 +6314,7 @@ en: office/research: # office=research name: Research Office + # 'terms: R and D,research and development,research lab' terms: '' office/surveyor: # office=surveyor diff --git a/data/presets/presets.json b/data/presets/presets.json index 8775dab27..c64ab4968 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -839,7 +839,7 @@ "office/private_investigator": {"icon": "fas-user-secret", "geometry": ["point", "area"], "tags": {"office": "private_investigator"}, "terms": ["PI", "private eye", "private detective"], "name": "Private Investigator Office"}, "office/quango": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "quango"}, "terms": ["ngo", "non government", "non-government", "organization", "organisation", "quasi autonomous", "quasi-autonomous"], "name": "Quasi-NGO Office"}, "office/religion": {"icon": "maki-suitcase", "fields": ["{office}", "religion", "denomination"], "geometry": ["point", "area"], "tags": {"office": "religion"}, "terms": [], "name": "Religious Office"}, - "office/research": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "research"}, "terms": [], "name": "Research Office"}, + "office/research": {"icon": "fas-flask", "geometry": ["point", "area"], "tags": {"office": "research"}, "terms": ["R and D", "research and development", "research lab"], "name": "Research Office"}, "office/surveyor": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "surveyor"}, "terms": [], "name": "Surveyor Office"}, "office/tax_advisor": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "tax_advisor"}, "terms": ["tax", "tax consultant"], "name": "Tax Advisor Office"}, "office/telecommunication": {"icon": "maki-telephone", "geometry": ["point", "area"], "tags": {"office": "telecommunication"}, "terms": ["communication", "internet service provider", "isp", "network", "telephone", "voice"], "name": "Telecom Office"}, diff --git a/data/presets/presets/office/research.json b/data/presets/presets/office/research.json index f00d6784b..2a18457ee 100644 --- a/data/presets/presets/office/research.json +++ b/data/presets/presets/office/research.json @@ -1,5 +1,5 @@ { - "icon": "maki-suitcase", + "icon": "fas-flask", "geometry": [ "point", "area" @@ -7,6 +7,10 @@ "tags": { "office": "research" }, - "terms": [], + "terms": [ + "R and D", + "research and development", + "research lab" + ], "name": "Research Office" } diff --git a/data/taginfo.json b/data/taginfo.json index 567d042a3..e00f04067 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -816,7 +816,7 @@ {"key": "office", "value": "private_investigator", "description": "🄿 Private Investigator Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-user-secret.svg"}, {"key": "office", "value": "quango", "description": "🄿 Quasi-NGO Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"}, {"key": "office", "value": "religion", "description": "🄿 Religious Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"}, - {"key": "office", "value": "research", "description": "🄿 Research Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"}, + {"key": "office", "value": "research", "description": "🄿 Research Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-flask.svg"}, {"key": "office", "value": "surveyor", "description": "🄿 Surveyor Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"}, {"key": "office", "value": "tax_advisor", "description": "🄿 Tax Advisor Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"}, {"key": "office", "value": "telecommunication", "description": "🄿 Telecom Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/telephone-15.svg"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 7dc2c5c3a..ab650aea5 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -8187,7 +8187,7 @@ }, "office/research": { "name": "Research Office", - "terms": "" + "terms": "R and D,research and development,research lab" }, "office/surveyor": { "name": "Surveyor Office", diff --git a/svg/fontawesome/fas-flask.svg b/svg/fontawesome/fas-flask.svg new file mode 100644 index 000000000..69275dd1f --- /dev/null +++ b/svg/fontawesome/fas-flask.svg @@ -0,0 +1 @@ + \ No newline at end of file