From ef0dcf09909537ea33c7ba87b7240afcc68ff85e Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Wed, 23 Dec 2015 15:29:34 -0500
Subject: [PATCH] More search terms for several amenity presets (closes #2880)

---
 data/presets.yaml                              | 7 ++++---
 data/presets/presets.json                      | 6 ++++++
 data/presets/presets/amenity/bench.json        | 3 +++
 data/presets/presets/amenity/cafe.json         | 1 +
 data/presets/presets/amenity/fuel.json         | 1 +
 data/presets/presets/amenity/waste_basket.json | 1 +
 dist/locales/en.json                           | 8 ++++----
 7 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/data/presets.yaml b/data/presets.yaml
index ec7d5155e..b5795da42 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -1195,6 +1195,7 @@ en:
       amenity/bench:
         # amenity=bench
         name: Bench
+        # 'terms: seat'
         terms: "<translate with synonyms or related terms for 'Bench', separated by commas>"
       amenity/bicycle_parking:
         # amenity=bicycle_parking
@@ -1232,7 +1233,7 @@ en:
       amenity/cafe:
         # amenity=cafe
         name: Cafe
-        # 'terms: coffee,tea'
+        # 'terms: bistro,coffee,tea'
         terms: "<translate with synonyms or related terms for 'Cafe', separated by commas>"
       amenity/car_rental:
         # amenity=car_rental
@@ -1333,7 +1334,7 @@ en:
       amenity/fuel:
         # amenity=fuel
         name: Gas Station
-        # 'terms: petrol,fuel,propane,diesel,lng,cng,biodiesel'
+        # 'terms: petrol,fuel,gasoline,propane,diesel,lng,cng,biodiesel'
         terms: "<translate with synonyms or related terms for 'Gas Station', separated by commas>"
       amenity/grave_yard:
         # amenity=grave_yard
@@ -1583,7 +1584,7 @@ en:
       amenity/waste_basket:
         # amenity=waste_basket
         name: Waste Basket
-        # 'terms: rubbish,litter,trash,garbage'
+        # 'terms: bin,rubbish,litter,trash,garbage'
         terms: "<translate with synonyms or related terms for 'Waste Basket', separated by commas>"
       area:
         # area=yes
diff --git a/data/presets/presets.json b/data/presets/presets.json
index d7c630e63..ff63584fe 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -456,6 +456,9 @@
             "vertex",
             "line"
         ],
+        "terms": [
+            "seat"
+        ],
         "tags": {
             "amenity": "bench"
         },
@@ -612,6 +615,7 @@
             "area"
         ],
         "terms": [
+            "bistro",
             "coffee",
             "tea"
         ],
@@ -1007,6 +1011,7 @@
         "terms": [
             "petrol",
             "fuel",
+            "gasoline",
             "propane",
             "diesel",
             "lng",
@@ -2137,6 +2142,7 @@
             "amenity": "waste_basket"
         },
         "terms": [
+            "bin",
             "rubbish",
             "litter",
             "trash",
diff --git a/data/presets/presets/amenity/bench.json b/data/presets/presets/amenity/bench.json
index 32c74dfc3..59e531fea 100644
--- a/data/presets/presets/amenity/bench.json
+++ b/data/presets/presets/amenity/bench.json
@@ -7,6 +7,9 @@
         "vertex",
         "line"
     ],
+    "terms": [
+        "seat"
+    ],
     "tags": {
         "amenity": "bench"
     },
diff --git a/data/presets/presets/amenity/cafe.json b/data/presets/presets/amenity/cafe.json
index b4fe166da..7e55e4f5e 100644
--- a/data/presets/presets/amenity/cafe.json
+++ b/data/presets/presets/amenity/cafe.json
@@ -13,6 +13,7 @@
         "area"
     ],
     "terms": [
+        "bistro",
         "coffee",
         "tea"
     ],
diff --git a/data/presets/presets/amenity/fuel.json b/data/presets/presets/amenity/fuel.json
index 332a2d48a..a0c55a889 100644
--- a/data/presets/presets/amenity/fuel.json
+++ b/data/presets/presets/amenity/fuel.json
@@ -12,6 +12,7 @@
     "terms": [
         "petrol",
         "fuel",
+        "gasoline",
         "propane",
         "diesel",
         "lng",
diff --git a/data/presets/presets/amenity/waste_basket.json b/data/presets/presets/amenity/waste_basket.json
index a98fb15f2..eaf32591a 100644
--- a/data/presets/presets/amenity/waste_basket.json
+++ b/data/presets/presets/amenity/waste_basket.json
@@ -8,6 +8,7 @@
         "amenity": "waste_basket"
     },
     "terms": [
+        "bin",
         "rubbish",
         "litter",
         "trash",
diff --git a/dist/locales/en.json b/dist/locales/en.json
index acc70c02e..b18d563cc 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1620,7 +1620,7 @@
             },
             "amenity/bench": {
                 "name": "Bench",
-                "terms": ""
+                "terms": "seat"
             },
             "amenity/bicycle_parking": {
                 "name": "Bicycle Parking",
@@ -1652,7 +1652,7 @@
             },
             "amenity/cafe": {
                 "name": "Cafe",
-                "terms": "coffee,tea"
+                "terms": "bistro,coffee,tea"
             },
             "amenity/car_rental": {
                 "name": "Car Rental",
@@ -1740,7 +1740,7 @@
             },
             "amenity/fuel": {
                 "name": "Gas Station",
-                "terms": "petrol,fuel,propane,diesel,lng,cng,biodiesel"
+                "terms": "petrol,fuel,gasoline,propane,diesel,lng,cng,biodiesel"
             },
             "amenity/grave_yard": {
                 "name": "Graveyard",
@@ -1948,7 +1948,7 @@
             },
             "amenity/waste_basket": {
                 "name": "Waste Basket",
-                "terms": "rubbish,litter,trash,garbage"
+                "terms": "bin,rubbish,litter,trash,garbage"
             },
             "area": {
                 "name": "Area",