From 995bfc3f1bfcd8ab0b6250969c6e5c1e374f3b0c Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Mon, 2 Dec 2019 09:41:25 -0500 Subject: [PATCH] Add preset for amenity=research_institute (close #7078) Deprecate amenity=research_institution --- css/25_areas.css | 9 +++-- data/deprecated.json | 4 ++ data/presets.yaml | 5 +++ data/presets/presets.json | 1 + .../presets/amenity/research_institute.json | 38 +++++++++++++++++++ data/taginfo.json | 2 + dist/locales/en.json | 4 ++ 7 files changed, 60 insertions(+), 3 deletions(-) create mode 100644 data/presets/presets/amenity/research_institute.json diff --git a/css/25_areas.css b/css/25_areas.css index abc744c01..5d7593125 100644 --- a/css/25_areas.css +++ b/css/25_areas.css @@ -99,7 +99,8 @@ path.stroke.tag-amenity-childcare, path.stroke.tag-amenity-kindergarten, path.stroke.tag-amenity-school, path.stroke.tag-amenity-college, -path.stroke.tag-amenity-university { +path.stroke.tag-amenity-university, +path.stroke.tag-amenity-research_institute { stroke: rgba(255, 255, 148, 0.75); } path.fill.tag-leisure-pitch.tag-sport-beachvolleyball, @@ -113,7 +114,8 @@ path.fill.tag-amenity-childcare, path.fill.tag-amenity-kindergarten, path.fill.tag-amenity-school, path.fill.tag-amenity-college, -path.fill.tag-amenity-university { +path.fill.tag-amenity-university, +path.fill.tag-amenity-research_institute { stroke: rgba(255, 255, 148, 0.25); fill: rgba(255, 255, 148, 0.25); } @@ -128,7 +130,8 @@ path.fill.tag-amenity-university { .preset-icon-fill path.area.stroke.tag-amenity-kindergarten, .preset-icon-fill path.area.stroke.tag-amenity-school, .preset-icon-fill path.area.stroke.tag-amenity-college, -.preset-icon-fill path.area.stroke.tag-amenity-university { +.preset-icon-fill path.area.stroke.tag-amenity-university, +.preset-icon-fill path.area.stroke.tag-amenity-research_institute { stroke: rgb(232, 232, 0); } .pattern-color-beach, diff --git a/data/deprecated.json b/data/deprecated.json index a7ecbd27b..7166f4bb5 100644 --- a/data/deprecated.json +++ b/data/deprecated.json @@ -116,6 +116,10 @@ "old": {"amenity": "register_office"}, "replace": {"office": "government", "government": "register_office"} }, + { + "old": {"amenity": "research_institution"}, + "replace": {"amenity": "research_institute"} + }, { "old": {"amenity": "sauna"}, "replace": {"leisure": "sauna"} diff --git a/data/presets.yaml b/data/presets.yaml index 4cb6ad694..0cd49103d 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -3397,6 +3397,11 @@ en: amenity/register_office: # amenity=register_office name: Register Office + amenity/research_institute: + # amenity=research_institute + name: Research Institute Grounds + # 'terms: applied research,experimentation,r&d,r & d,r and d,research and development,research institution,research laboratory,research labs' + terms: '' amenity/restaurant: # amenity=restaurant name: Restaurant diff --git a/data/presets/presets.json b/data/presets/presets.json index 03f12e73d..8545776fe 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -188,6 +188,7 @@ "amenity/recycling_container": {"icon": "maki-recycling", "fields": ["operator", "recycling_accepts", "collection_times"], "moreFields": ["colour", "covered", "indoor", "level", "manufacturer", "material", "opening_hours"], "geometry": ["point", "area"], "terms": ["bin", "can", "bottle", "glass", "garbage", "rubbish", "scrap", "trash"], "tags": {"amenity": "recycling", "recycling_type": "container"}, "reference": {"key": "amenity", "value": "recycling"}, "name": "Recycling Container"}, "amenity/recycling/container/electrical_items": {"icon": "maki-recycling", "fields": ["{amenity/recycling_container}"], "moreFields": ["{amenity/recycling_container}"], "geometry": ["point", "area"], "terms": ["computers", "electronic waste", "electronics recycling", "ewaste bin", "phones", "tablets"], "tags": {"amenity": "recycling", "recycling_type": "container", "recycling:electrical_items": "yes"}, "reference": {"key": "recycling:electrical_items", "value": "yes"}, "name": "E-Waste Container"}, "amenity/recycling/container/green_waste": {"icon": "maki-recycling", "fields": ["{amenity/recycling_container}"], "moreFields": ["{amenity/recycling_container}"], "geometry": ["point", "area"], "terms": ["biodegradable", "biological", "compost", "decomposable", "garbage bin", "garden waste", "organic", "rubbish", "food scrap"], "tags": {"amenity": "recycling", "recycling_type": "container", "recycling:green_waste": "yes"}, "reference": {"key": "recycling:green_waste", "value": "yes"}, "name": "Green Waste Container"}, + "amenity/research_institute": {"icon": "fas-flask", "fields": ["name", "operator", "operator/type", "address", "website", "internet_access", "internet_access/fee"], "moreFields": ["email", "fax", "internet_access/ssid", "phone", "wheelchair"], "geometry": ["point", "area"], "terms": ["applied research", "experimentation", "r&d", "r & d", "r and d", "research and development", "research institution", "research laboratory", "research labs"], "tags": {"amenity": "research_institute"}, "name": "Research Institute Grounds"}, "amenity/restaurant": {"icon": "maki-restaurant", "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "phone"], "moreFields": ["air_conditioning", "bar", "brewery", "capacity", "delivery", "diet_multi", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "microbrewery", "min_age", "not/name", "outdoor_seating", "reservation", "smoking", "stars", "takeaway", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "coffee", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant"}, "name": "Restaurant"}, "amenity/restaurant/american": {"icon": "maki-restaurant", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "coffee", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant", "cuisine": "american"}, "reference": {"key": "cuisine", "value": "american"}, "name": "American Restaurant"}, "amenity/restaurant/asian": {"icon": "maki-restaurant-noodle", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant", "cuisine": "asian"}, "reference": {"key": "cuisine", "value": "asian"}, "name": "Asian Restaurant"}, diff --git a/data/presets/presets/amenity/research_institute.json b/data/presets/presets/amenity/research_institute.json new file mode 100644 index 000000000..768f7c8a4 --- /dev/null +++ b/data/presets/presets/amenity/research_institute.json @@ -0,0 +1,38 @@ +{ + "icon": "fas-flask", + "fields": [ + "name", + "operator", + "operator/type", + "address", + "website", + "internet_access", + "internet_access/fee" + ], + "moreFields": [ + "email", + "fax", + "internet_access/ssid", + "phone", + "wheelchair" + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "applied research", + "experimentation", + "r&d", + "r & d", + "r and d", + "research and development", + "research institution", + "research laboratory", + "research labs" + ], + "tags": { + "amenity": "research_institute" + }, + "name": "Research Institute Grounds" +} diff --git a/data/taginfo.json b/data/taginfo.json index 9bd3b40ab..fd5fce0dd 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -188,6 +188,7 @@ {"key": "recycling_type", "value": "container", "description": "🄿 Recycling Container, 🄵 Type", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/recycling-15.svg"}, {"key": "recycling:electrical_items", "value": "yes", "description": "🄿 E-Waste Container", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/recycling-15.svg"}, {"key": "recycling:green_waste", "value": "yes", "description": "🄿 Green Waste Container", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/recycling-15.svg"}, + {"key": "amenity", "value": "research_institute", "description": "🄿 Research Institute Grounds", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-flask.svg"}, {"key": "amenity", "value": "restaurant", "description": "🄿 Restaurant", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/restaurant-15.svg"}, {"key": "cuisine", "value": "american", "description": "🄿 American Restaurant", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/restaurant-15.svg"}, {"key": "cuisine", "value": "asian", "description": "🄿 Asian Restaurant", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/restaurant-noodle-15.svg"}, @@ -1913,6 +1914,7 @@ {"key": "amenity", "value": "preschool", "description": "🄳 ➜ amenity=kindergarten + preschool=yes"}, {"key": "amenity", "value": "public_building", "description": "🄳 ➜ building=public"}, {"key": "amenity", "value": "real_estate", "description": "🄳 ➜ office=estate_agent"}, + {"key": "amenity", "value": "research_institution", "description": "🄳 ➜ amenity=research_institute"}, {"key": "amenity", "value": "sauna", "description": "🄳 ➜ leisure=sauna"}, {"key": "amenity", "value": "shop", "description": "🄳 ➜ shop=*"}, {"key": "amenity", "value": "sloped_curb", "description": "🄳 ➜ kerb=lowered"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index ed5894843..e8c44f24b 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -5403,6 +5403,10 @@ "name": "Green Waste Container", "terms": "biodegradable,biological,compost,decomposable,garbage bin,garden waste,organic,rubbish,food scrap" }, + "amenity/research_institute": { + "name": "Research Institute Grounds", + "terms": "applied research,experimentation,r&d,r & d,r and d,research and development,research institution,research laboratory,research labs" + }, "amenity/restaurant": { "name": "Restaurant", "terms": "bar,breakfast,cafe,café,canteen,coffee,dine,dining,dinner,drive-in,eat,grill,lunch,table"