From 1f1e80711c317f6ab3f9184d9ecfb3d5edead1bc Mon Sep 17 00:00:00 2001
From: arch0345 <archpdx@pm.me>
Date: Sun, 6 Mar 2022 14:59:08 -0800
Subject: [PATCH 1/4] Add Trolley Bay preset and `trolley:deposit` field

---
 data/fields/deposit/trolley.json      |  5 +++++
 data/presets/amenity/trolley_bay.json | 28 +++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 data/fields/deposit/trolley.json
 create mode 100644 data/presets/amenity/trolley_bay.json

diff --git a/data/fields/deposit/trolley.json b/data/fields/deposit/trolley.json
new file mode 100644
index 00000000..c2d22a35
--- /dev/null
+++ b/data/fields/deposit/trolley.json
@@ -0,0 +1,5 @@
+{
+    "key": "trolley:deposit",
+    "type": "check",
+    "label": "Deposit"
+}
diff --git a/data/presets/amenity/trolley_bay.json b/data/presets/amenity/trolley_bay.json
new file mode 100644
index 00000000..d3fbf70b
--- /dev/null
+++ b/data/presets/amenity/trolley_bay.json
@@ -0,0 +1,28 @@
+{
+    "icon": "fas-cart-shopping",
+    "fields": [
+        "capacity",
+        "deposit/trolley",
+        "payment_multi_fee"
+    ],
+    "moreFields": [
+        "brand",
+        "covered",
+        "fee",
+        "indoor",
+        "opening_hours",
+        "operator"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "amenity": "trolley_bay"
+    },
+    "terms": [
+        "cart return",
+        "shopping cart"
+    ],
+    "name": "Trolley Bay"
+}

From d201d86938caf071c0e718970dc147c9d657fc2a Mon Sep 17 00:00:00 2001
From: archpdx <archpdx@pm.me>
Date: Mon, 7 Mar 2022 12:08:19 -0800
Subject: [PATCH 2/4] Rename preset to `Cart Corral`

Also added some terms found in https://en.wikipedia.org/wiki/Shopping_cart
---
 data/presets/amenity/trolley_bay.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/data/presets/amenity/trolley_bay.json b/data/presets/amenity/trolley_bay.json
index d3fbf70b..53ff1188 100644
--- a/data/presets/amenity/trolley_bay.json
+++ b/data/presets/amenity/trolley_bay.json
@@ -21,8 +21,10 @@
         "amenity": "trolley_bay"
     },
     "terms": [
+        "carriage return"
+        "cart corral",
         "cart return",
         "shopping cart"
     ],
-    "name": "Trolley Bay"
+    "name": "Cart Corral"
 }

From c5566fe0ed52ca3432201ea9f25379a7b46c27e8 Mon Sep 17 00:00:00 2001
From: archpdx <archpdx@pm.me>
Date: Mon, 7 Mar 2022 12:25:09 -0800
Subject: [PATCH 3/4] Add missing comma

---
 data/presets/amenity/trolley_bay.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/presets/amenity/trolley_bay.json b/data/presets/amenity/trolley_bay.json
index 53ff1188..a1ad8071 100644
--- a/data/presets/amenity/trolley_bay.json
+++ b/data/presets/amenity/trolley_bay.json
@@ -21,7 +21,7 @@
         "amenity": "trolley_bay"
     },
     "terms": [
-        "carriage return"
+        "carriage return",
         "cart corral",
         "cart return",
         "shopping cart"

From a77f84af8341ed70c9bedd8e50a19ec8679c3416 Mon Sep 17 00:00:00 2001
From: Martin Raifer <martin@raifer.tech>
Date: Wed, 11 May 2022 16:15:01 +0200
Subject: [PATCH 4/4] add name from wiki page as search term

---
 data/presets/amenity/trolley_bay.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/data/presets/amenity/trolley_bay.json b/data/presets/amenity/trolley_bay.json
index a1ad8071..86aa9079 100644
--- a/data/presets/amenity/trolley_bay.json
+++ b/data/presets/amenity/trolley_bay.json
@@ -24,7 +24,8 @@
         "carriage return",
         "cart corral",
         "cart return",
-        "shopping cart"
+        "shopping cart",
+        "trolley bay"
     ],
     "name": "Cart Corral"
 }