From 812271e5ea2cf4a0d459d30f1381fe826e063b9b Mon Sep 17 00:00:00 2001
From: Tobias Zwick <newton@openclonk.org>
Date: Sun, 28 Apr 2019 23:24:38 +0200
Subject: [PATCH 1/4] add preset for coin laundry

---
 .../shop/laundry/self_service_laundry.json    | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 data/presets/presets/shop/laundry/self_service_laundry.json

diff --git a/data/presets/presets/shop/laundry/self_service_laundry.json b/data/presets/presets/shop/laundry/self_service_laundry.json
new file mode 100644
index 000000000..d47b61e41
--- /dev/null
+++ b/data/presets/presets/shop/laundry/self_service_laundry.json
@@ -0,0 +1,19 @@
+{
+    "icon": "maki-laundry",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "shop": "laundry",
+        "self_service": "yes"
+    },
+    "terms": [
+        "coin laundry",
+        "laundromat",
+        "coin wash",
+        "launderette",
+        "washateria"
+    ],
+    "name": "Self-service laundry"
+}

From 28ab9194f257a5f24cbec23d089850248ea2e038 Mon Sep 17 00:00:00 2001
From: Tobias Zwick <newton@openclonk.org>
Date: Sun, 28 Apr 2019 23:35:53 +0200
Subject: [PATCH 2/4] Add self_service field to presets

---
 data/presets/fields/self_service.json      | 5 +++++
 data/presets/presets/amenity/car_wash.json | 3 ++-
 data/presets/presets/amenity/fuel.json     | 3 ++-
 data/presets/presets/shop/laundry.json     | 4 ++++
 4 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 data/presets/fields/self_service.json

diff --git a/data/presets/fields/self_service.json b/data/presets/fields/self_service.json
new file mode 100644
index 000000000..7c454ab13
--- /dev/null
+++ b/data/presets/fields/self_service.json
@@ -0,0 +1,5 @@
+{
+    "key": "self_service",
+    "type": "check",
+    "label": "Self-service"
+}
\ No newline at end of file
diff --git a/data/presets/presets/amenity/car_wash.json b/data/presets/presets/amenity/car_wash.json
index 28c05c4b3..71191c521 100644
--- a/data/presets/presets/amenity/car_wash.json
+++ b/data/presets/presets/amenity/car_wash.json
@@ -6,7 +6,8 @@
         "address",
         "building_area",
         "opening_hours",
-        "payment_multi"
+        "payment_multi",
+        "self_service"
     ],
     "moreFields": [
         "website",
diff --git a/data/presets/presets/amenity/fuel.json b/data/presets/presets/amenity/fuel.json
index 852bd1db3..97370c581 100644
--- a/data/presets/presets/amenity/fuel.json
+++ b/data/presets/presets/amenity/fuel.json
@@ -5,7 +5,8 @@
         "brand",
         "operator",
         "address",
-        "fuel_multi"
+        "fuel_multi",
+        "self_service"
     ],
     "moreFields": [
         "opening_hours",
diff --git a/data/presets/presets/shop/laundry.json b/data/presets/presets/shop/laundry.json
index c838fe70e..9f085df43 100644
--- a/data/presets/presets/shop/laundry.json
+++ b/data/presets/presets/shop/laundry.json
@@ -1,5 +1,9 @@
 {
     "icon": "maki-laundry",
+    "fields": [
+        "{shop}",
+        "self_service"
+    ],
     "geometry": [
         "point",
         "area"

From 3b82c4e3c1d84e07f17bd88167c2df73d97ad661 Mon Sep 17 00:00:00 2001
From: Tobias Zwick <newton@westnordost.de>
Date: Mon, 29 Apr 2019 00:16:32 +0200
Subject: [PATCH 3/4] capitalize names

---
 .../presets/shop/laundry/self_service_laundry.json   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/data/presets/presets/shop/laundry/self_service_laundry.json b/data/presets/presets/shop/laundry/self_service_laundry.json
index d47b61e41..7b49c8677 100644
--- a/data/presets/presets/shop/laundry/self_service_laundry.json
+++ b/data/presets/presets/shop/laundry/self_service_laundry.json
@@ -9,11 +9,11 @@
         "self_service": "yes"
     },
     "terms": [
-        "coin laundry",
-        "laundromat",
-        "coin wash",
-        "launderette",
-        "washateria"
+        "Coin Laundry",
+        "Laundromat",
+        "Coin Wash",
+        "Launderette",
+        "Washateria"
     ],
-    "name": "Self-service laundry"
+    "name": "Self-service Laundry"
 }

From f21a259144e10f09a6a62d7b6a7c15fde11aacc9 Mon Sep 17 00:00:00 2001
From: Tobias Zwick <newton@westnordost.de>
Date: Mon, 29 Apr 2019 19:40:09 +0200
Subject: [PATCH 4/4] capitalize Self-Service

---
 data/presets/fields/self_service.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/presets/fields/self_service.json b/data/presets/fields/self_service.json
index 7c454ab13..062f88b09 100644
--- a/data/presets/fields/self_service.json
+++ b/data/presets/fields/self_service.json
@@ -1,5 +1,5 @@
 {
     "key": "self_service",
     "type": "check",
-    "label": "Self-service"
-}
\ No newline at end of file
+    "label": "Self-Service"
+}