From d4a5db511c3ebe7e06277f977204f9169c2ebeb3 Mon Sep 17 00:00:00 2001
From: JamesKingdom <james@unetworks.org>
Date: Wed, 23 Aug 2017 00:04:26 +0100
Subject: [PATCH] Remove maxspeed field from living street (closes #4260)

---
 data/presets.yaml                               |  2 +-
 data/presets/presets.json                       |  3 +--
 data/presets/presets/highway/living_street.json |  1 -
 dist/locales/en.json                            | 12 ++++++------
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/data/presets.yaml b/data/presets.yaml
index 67c13ffe0..f710a6199 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -1961,7 +1961,7 @@ en:
       amenity/shower:
         # amenity=shower
         name: Shower
-        # 'terms: gelato'
+        # 'terms: rain closet'
         terms: '<translate with synonyms or related terms for ''Shower'', separated by commas>'
       amenity/social_facility:
         # amenity=social_facility
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 87907968d..6c567ea69 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -2581,7 +2581,7 @@
                 "area"
             ],
             "terms": [
-                "gelato"
+                "rain closet"
             ],
             "tags": {
                 "amenity": "shower"
@@ -6230,7 +6230,6 @@
             "fields": [
                 "name",
                 "oneway",
-                "maxspeed",
                 "lanes",
                 "surface",
                 "structure",
diff --git a/data/presets/presets/highway/living_street.json b/data/presets/presets/highway/living_street.json
index 52f78ce74..d02655625 100644
--- a/data/presets/presets/highway/living_street.json
+++ b/data/presets/presets/highway/living_street.json
@@ -3,7 +3,6 @@
     "fields": [
         "name",
         "oneway",
-        "maxspeed",
         "lanes",
         "surface",
         "structure",
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 55b85d35f..a5259e55b 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -2559,7 +2559,7 @@
                 },
                 "amenity/doctors": {
                     "name": "Doctor",
-                    "terms": "medic*"
+                    "terms": "medic*,physician"
                 },
                 "amenity/dojo": {
                     "name": "Dojo / Martial Arts Academy",
@@ -2767,7 +2767,7 @@
                 },
                 "amenity/shower": {
                     "name": "Shower",
-                    "terms": "gelato"
+                    "terms": "rain closet"
                 },
                 "amenity/social_facility": {
                     "name": "Social Facility",
@@ -4293,6 +4293,10 @@
                     "name": "Office",
                     "terms": ""
                 },
+                "office/physician": {
+                    "name": "Physician",
+                    "terms": ""
+                },
                 "office/travel_agent": {
                     "name": "Travel Agency",
                     "terms": ""
@@ -4365,10 +4369,6 @@
                     "name": "NGO Office",
                     "terms": ""
                 },
-                "office/physician": {
-                    "name": "Physician",
-                    "terms": ""
-                },
                 "office/political_party": {
                     "name": "Political Party",
                     "terms": ""