From 3c50974956a6a5d1a20f7ff05084e7c053d143d0 Mon Sep 17 00:00:00 2001
From: JamesKingdom <james@unetworks.org>
Date: Sun, 6 Aug 2017 15:15:42 +0100
Subject: [PATCH 1/2] Add "care home" term to group home

---
 data/presets.yaml                                            | 2 +-
 data/presets/presets.json                                    | 3 ++-
 data/presets/presets/amenity/social_facility/group_home.json | 3 ++-
 dist/locales/en.json                                         | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/data/presets.yaml b/data/presets.yaml
index 952b018a0..8170df8b9 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -1931,7 +1931,7 @@ en:
       amenity/social_facility/group_home:
         # 'amenity=social_facility, social_facility=group_home, social_facility:for=senior'
         name: Elderly Group Home
-        # 'terms: old,senior,living'
+        # 'terms: old,senior,living,care home'
         terms: '<translate with synonyms or related terms for ''Elderly Group Home'', separated by commas>'
       amenity/social_facility/homeless_shelter:
         # 'amenity=social_facility, social_facility=shelter, social_facility:for=homeless'
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 92c966b3c..ea568d5c1 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -2632,7 +2632,8 @@
             "terms": [
                 "old",
                 "senior",
-                "living"
+                "living",
+                "care home"
             ],
             "tags": {
                 "amenity": "social_facility",
diff --git a/data/presets/presets/amenity/social_facility/group_home.json b/data/presets/presets/amenity/social_facility/group_home.json
index c5bdad2b6..ee4fd7d70 100644
--- a/data/presets/presets/amenity/social_facility/group_home.json
+++ b/data/presets/presets/amenity/social_facility/group_home.json
@@ -17,7 +17,8 @@
     "terms": [
         "old",
         "senior",
-        "living"
+        "living",
+        "care home"
     ],
     "tags": {
         "amenity": "social_facility",
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 586169767..2bb409342 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -2746,7 +2746,7 @@
                 },
                 "amenity/social_facility/group_home": {
                     "name": "Elderly Group Home",
-                    "terms": "old,senior,living"
+                    "terms": "old,senior,living,care home"
                 },
                 "amenity/social_facility/homeless_shelter": {
                     "name": "Homeless Shelter",

From e64ff2407fe2dc0cb0c6279ff9c3fbfe58f101c5 Mon Sep 17 00:00:00 2001
From: JamesKingdom <james@unetworks.org>
Date: Sun, 6 Aug 2017 21:59:06 +0100
Subject: [PATCH 2/2] Adding assisted living term to social_facility

---
 data/presets.yaml                                           | 4 ++--
 data/presets/presets.json                                   | 6 ++++--
 .../presets/presets/amenity/social_facility/group_home.json | 3 ++-
 .../presets/amenity/social_facility/nursing_home.json       | 3 ++-
 dist/locales/en.json                                        | 4 ++--
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/data/presets.yaml b/data/presets.yaml
index 8170df8b9..96ecd6e88 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -1931,7 +1931,7 @@ en:
       amenity/social_facility/group_home:
         # 'amenity=social_facility, social_facility=group_home, social_facility:for=senior'
         name: Elderly Group Home
-        # 'terms: old,senior,living,care home'
+        # 'terms: old,senior,living,care home,assisted living'
         terms: '<translate with synonyms or related terms for ''Elderly Group Home'', separated by commas>'
       amenity/social_facility/homeless_shelter:
         # 'amenity=social_facility, social_facility=shelter, social_facility:for=homeless'
@@ -1941,7 +1941,7 @@ en:
       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: elderly,living,nursing,old,senior,assisted living'
         terms: '<translate with synonyms or related terms for ''Nursing Home'', separated by commas>'
       amenity/studio:
         # amenity=studio
diff --git a/data/presets/presets.json b/data/presets/presets.json
index ea568d5c1..c3fcccfbb 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -2633,7 +2633,8 @@
                 "old",
                 "senior",
                 "living",
-                "care home"
+                "care home",
+                "assisted living"
             ],
             "tags": {
                 "amenity": "social_facility",
@@ -2702,7 +2703,8 @@
                 "living",
                 "nursing",
                 "old",
-                "senior"
+                "senior",
+                "assisted living"
             ],
             "tags": {
                 "amenity": "social_facility",
diff --git a/data/presets/presets/amenity/social_facility/group_home.json b/data/presets/presets/amenity/social_facility/group_home.json
index ee4fd7d70..e615ed06a 100644
--- a/data/presets/presets/amenity/social_facility/group_home.json
+++ b/data/presets/presets/amenity/social_facility/group_home.json
@@ -18,7 +18,8 @@
         "old",
         "senior",
         "living",
-        "care home"
+        "care home",
+        "assisted living"
     ],
     "tags": {
         "amenity": "social_facility",
diff --git a/data/presets/presets/amenity/social_facility/nursing_home.json b/data/presets/presets/amenity/social_facility/nursing_home.json
index 54e0dc0a2..8a83260f3 100644
--- a/data/presets/presets/amenity/social_facility/nursing_home.json
+++ b/data/presets/presets/amenity/social_facility/nursing_home.json
@@ -19,7 +19,8 @@
         "living",
         "nursing",
         "old",
-        "senior"
+        "senior",
+        "assisted living"
     ],
     "tags": {
         "amenity": "social_facility",
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 2bb409342..252c7e729 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -2746,7 +2746,7 @@
                 },
                 "amenity/social_facility/group_home": {
                     "name": "Elderly Group Home",
-                    "terms": "old,senior,living,care home"
+                    "terms": "old,senior,living,care home,assisted living"
                 },
                 "amenity/social_facility/homeless_shelter": {
                     "name": "Homeless Shelter",
@@ -2754,7 +2754,7 @@
                 },
                 "amenity/social_facility/nursing_home": {
                     "name": "Nursing Home",
-                    "terms": "elderly,living,nursing,old,senior"
+                    "terms": "elderly,living,nursing,old,senior,assisted living"
                 },
                 "amenity/studio": {
                     "name": "Studio",