Merge branch 'master' into edit_menu

This commit is contained in:
Bryan Housel
2017-02-10 10:02:34 -05:00
9 changed files with 133 additions and 16 deletions

View File

@@ -1541,7 +1541,7 @@ en:
name: Courthouse
terms: '<translate with synonyms or related terms for ''Courthouse'', separated by commas>'
amenity/coworking_space:
# office=coworking
# amenity=coworking_space
name: Coworking Space
amenity/crematorium:
# amenity=crematorium
@@ -1611,7 +1611,7 @@ en:
amenity/hospital:
# amenity=hospital
name: Hospital Grounds
# 'terms: clinic,doctor,emergency room,health service,hospice,infirmary,institution,nursing home,sanatorium,sanitarium,sick,surgery,ward'
# 'terms: clinic,doctor,emergency room,health,infirmary,institution,sanatorium,sanitarium,sick,surgery,ward'
terms: '<translate with synonyms or related terms for ''Hospital Grounds'', separated by commas>'
amenity/hunting_stand:
# amenity=hunting_stand
@@ -1651,6 +1651,9 @@ en:
name: Nightclub
# 'terms: disco*,night club,dancing,dance club'
terms: '<translate with synonyms or related terms for ''Nightclub'', separated by commas>'
amenity/nursing_home:
# amenity=nursing_home
name: Nursing Home
amenity/parking:
# amenity=parking
name: Car Parking
@@ -1789,6 +1792,11 @@ en:
name: Homeless Shelter
# 'terms: houseless,unhoused,displaced'
terms: '<translate with synonyms or related terms for ''Homeless Shelter'', separated by commas>'
amenity/social_facility/nursing_home:
# 'amenity=social_facility, social_facility=nursing_home, social_facility:for=senior'
name: Nursing Home
# 'terms: elderly,living,nursing,old,senior'
terms: '<translate with synonyms or related terms for ''Nursing Home'', separated by commas>'
amenity/studio:
# amenity=studio
name: Studio

View File

@@ -507,11 +507,32 @@
"area"
],
"tags": {
"office": "coworking"
"amenity": "coworking_space"
},
"name": "Coworking Space",
"searchable": false
},
"amenity/nursing_home": {
"icon": "wheelchair",
"fields": [
"operator",
"address",
"building_area",
"social_facility",
"social_facility_for",
"opening_hours",
"wheelchair"
],
"geometry": [
"point",
"area"
],
"tags": {
"amenity": "nursing_home"
},
"name": "Nursing Home",
"searchable": false
},
"amenity/register_office": {
"icon": "town-hall",
"fields": [
@@ -524,7 +545,6 @@
"point",
"area"
],
"terms": [],
"tags": {
"amenity": "register_office"
},
@@ -1365,11 +1385,9 @@
"clinic",
"doctor",
"emergency room",
"health service",
"hospice",
"health",
"infirmary",
"institution",
"nursing home",
"sanatorium",
"sanitarium",
"sick",
@@ -2245,6 +2263,35 @@
},
"name": "Homeless Shelter"
},
"amenity/social_facility/nursing_home": {
"icon": "wheelchair",
"fields": [
"operator",
"address",
"building_area",
"social_facility",
"social_facility_for",
"opening_hours",
"wheelchair"
],
"geometry": [
"point",
"area"
],
"terms": [
"elderly",
"living",
"nursing",
"old",
"senior"
],
"tags": {
"amenity": "social_facility",
"social_facility": "nursing_home",
"social_facility:for": "senior"
},
"name": "Nursing Home"
},
"amenity/studio": {
"icon": "karaoke",
"fields": [

View File

@@ -13,7 +13,7 @@
"area"
],
"tags": {
"office": "coworking"
"amenity": "coworking_space"
},
"name": "Coworking Space",
"searchable": false

View File

@@ -0,0 +1,21 @@
{
"icon": "wheelchair",
"fields": [
"operator",
"address",
"building_area",
"social_facility",
"social_facility_for",
"opening_hours",
"wheelchair"
],
"geometry": [
"point",
"area"
],
"tags": {
"amenity": "nursing_home"
},
"name": "Nursing Home",
"searchable": false
}

View File

@@ -10,8 +10,6 @@
"point",
"area"
],
"terms": [
],
"tags": {
"amenity": "register_office"
},

View File

@@ -13,11 +13,9 @@
"clinic",
"doctor",
"emergency room",
"health service",
"hospice",
"health",
"infirmary",
"institution",
"nursing home",
"sanatorium",
"sanitarium",
"sick",

View File

@@ -0,0 +1,29 @@
{
"icon": "wheelchair",
"fields": [
"operator",
"address",
"building_area",
"social_facility",
"social_facility_for",
"opening_hours",
"wheelchair"
],
"geometry": [
"point",
"area"
],
"terms": [
"elderly",
"living",
"nursing",
"old",
"senior"
],
"tags": {
"amenity": "social_facility",
"social_facility": "nursing_home",
"social_facility:for": "senior"
},
"name": "Nursing Home"
}

View File

@@ -128,8 +128,12 @@
"value": "terminal"
},
{
"key": "office",
"value": "coworking"
"key": "amenity",
"value": "coworking_space"
},
{
"key": "amenity",
"value": "nursing_home"
},
{
"key": "amenity",
@@ -451,6 +455,10 @@
"key": "social_facility:for",
"value": "homeless"
},
{
"key": "social_facility:for",
"value": "senior"
},
{
"key": "amenity",
"value": "studio"

10
dist/locales/en.json vendored
View File

@@ -1956,6 +1956,10 @@
"name": "Coworking Space",
"terms": ""
},
"amenity/nursing_home": {
"name": "Nursing Home",
"terms": ""
},
"amenity/register_office": {
"name": "Register Office",
"terms": ""
@@ -2130,7 +2134,7 @@
},
"amenity/hospital": {
"name": "Hospital Grounds",
"terms": "clinic,doctor,emergency room,health service,hospice,infirmary,institution,nursing home,sanatorium,sanitarium,sick,surgery,ward"
"terms": "clinic,doctor,emergency room,health,infirmary,institution,sanatorium,sanitarium,sick,surgery,ward"
},
"amenity/hunting_stand": {
"name": "Hunting Stand",
@@ -2276,6 +2280,10 @@
"name": "Homeless Shelter",
"terms": "houseless,unhoused,displaced"
},
"amenity/social_facility/nursing_home": {
"name": "Nursing Home",
"terms": "elderly,living,nursing,old,senior"
},
"amenity/studio": {
"name": "Studio",
"terms": "recording,radio,television"