From 093f0491c4ca006804b3e1a5958e5172f22b0b40 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Wed, 23 Dec 2015 15:21:04 -0500
Subject: [PATCH] Disambiguate shop=bicycle and amenity=bicycle_repair_station
 presets (closes #2845)

---
 data/presets.yaml                                     |  7 ++++---
 data/presets/presets.json                             | 11 +++++++++--
 .../presets/amenity/bicycle_repair_station.json       |  7 +++++--
 data/presets/presets/shop/bicycle.json                |  4 ++++
 dist/locales/en.json                                  |  6 +++---
 5 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/data/presets.yaml b/data/presets.yaml
index ae4a095d7..ec7d5155e 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -1208,9 +1208,9 @@ en:
         terms: "<translate with synonyms or related terms for 'Bicycle Rental', separated by commas>"
       amenity/bicycle_repair_station:
         # amenity=bicycle_repair_station
-        name: Bicycle Repair Station
-        # 'terms: bike'
-        terms: "<translate with synonyms or related terms for 'Bicycle Repair Station', separated by commas>"
+        name: Bicycle Repair Tool Stand
+        # 'terms: bike,repair,chain,pump'
+        terms: "<translate with synonyms or related terms for 'Bicycle Repair Tool Stand', separated by commas>"
       amenity/biergarten:
         # amenity=biergarten
         name: Beer Garden
@@ -3090,6 +3090,7 @@ en:
       shop/bicycle:
         # shop=bicycle
         name: Bicycle Shop
+        # 'terms: bike,repair'
         terms: "<translate with synonyms or related terms for 'Bicycle Shop', separated by commas>"
       shop/bookmaker:
         # shop=bookmaker
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 67a8a1125..d7c630e63 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -519,12 +519,15 @@
             "area"
         ],
         "terms": [
-            "bike"
+            "bike",
+            "repair",
+            "chain",
+            "pump"
         ],
         "tags": {
             "amenity": "bicycle_repair_station"
         },
-        "name": "Bicycle Repair Station"
+        "name": "Bicycle Repair Tool Stand"
     },
     "amenity/biergarten": {
         "icon": "beer",
@@ -7781,6 +7784,10 @@
             "point",
             "area"
         ],
+        "terms": [
+            "bike",
+            "repair"
+        ],
         "tags": {
             "shop": "bicycle"
         },
diff --git a/data/presets/presets/amenity/bicycle_repair_station.json b/data/presets/presets/amenity/bicycle_repair_station.json
index 559ad9824..f5411582c 100644
--- a/data/presets/presets/amenity/bicycle_repair_station.json
+++ b/data/presets/presets/amenity/bicycle_repair_station.json
@@ -14,10 +14,13 @@
         "area"
     ],
     "terms": [
-        "bike"
+        "bike",
+        "repair",
+        "chain",
+        "pump"
     ],
     "tags": {
         "amenity": "bicycle_repair_station"
     },
-    "name": "Bicycle Repair Station"
+    "name": "Bicycle Repair Tool Stand"
 }
diff --git a/data/presets/presets/shop/bicycle.json b/data/presets/presets/shop/bicycle.json
index f6a062cbb..80a46b8a4 100644
--- a/data/presets/presets/shop/bicycle.json
+++ b/data/presets/presets/shop/bicycle.json
@@ -10,6 +10,10 @@
         "point",
         "area"
     ],
+    "terms": [
+        "bike",
+        "repair"
+    ],
     "tags": {
         "shop": "bicycle"
     },
diff --git a/dist/locales/en.json b/dist/locales/en.json
index fea980322..acc70c02e 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1631,8 +1631,8 @@
                 "terms": "bike"
             },
             "amenity/bicycle_repair_station": {
-                "name": "Bicycle Repair Station",
-                "terms": "bike"
+                "name": "Bicycle Repair Tool Stand",
+                "terms": "bike,repair,chain,pump"
             },
             "amenity/biergarten": {
                 "name": "Beer Garden",
@@ -3360,7 +3360,7 @@
             },
             "shop/bicycle": {
                 "name": "Bicycle Shop",
-                "terms": ""
+                "terms": "bike,repair"
             },
             "shop/bookmaker": {
                 "name": "Bookmaker",