From dbaf8a146521a3838008ecaa68f76548ab827305 Mon Sep 17 00:00:00 2001
From: Eric Brelsford <ebrelsford@gmail.com>
Date: Wed, 17 Jun 2015 14:18:30 -0400
Subject: [PATCH 1/2] Add recycling_type preset field

Fixes #2689
---
 data/presets.yaml                           | 3 +++
 data/presets/fields.json                    | 5 +++++
 data/presets/presets.json                   | 1 +
 data/presets/presets/amenity/recycling.json | 1 +
 dist/locales/en.json                        | 3 +++
 5 files changed, 13 insertions(+)

diff --git a/data/presets.yaml b/data/presets.yaml
index edd40cebd..8ae1d83d1 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -739,6 +739,9 @@ en:
       recycling/paper:
         # 'recycling:paper=*'
         label: Accepts Paper
+      recycling/type:
+        # 'recycling_type=*'
+        label: Recycling Type
       ref:
         # 'ref=*'
         label: Reference
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 4648669ad..644467052 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -944,6 +944,11 @@
         "type": "check",
         "label": "Accepts Paper"
     },
+    "recycling/type": {
+        "key": "recycling_type",
+        "type": "combo",
+        "label": "Recycling Type"
+    },
     "ref": {
         "key": "ref",
         "type": "text",
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 29f2a3ef8..e7ac0392c 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -1482,6 +1482,7 @@
         "fields": [
             "operator",
             "address",
+            "recycling/type",
             "recycling/cans",
             "recycling/glass",
             "recycling/paper",
diff --git a/data/presets/presets/amenity/recycling.json b/data/presets/presets/amenity/recycling.json
index f69730690..07685e18e 100644
--- a/data/presets/presets/amenity/recycling.json
+++ b/data/presets/presets/amenity/recycling.json
@@ -3,6 +3,7 @@
     "fields": [
         "operator",
         "address",
+        "recycling/type",
         "recycling/cans",
         "recycling/glass",
         "recycling/paper",
diff --git a/dist/locales/en.json b/dist/locales/en.json
index f50c68a23..305453914 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1195,6 +1195,9 @@
             "recycling/paper": {
                 "label": "Accepts Paper"
             },
+            "recycling/type": {
+                "label": "Recycling Type"
+            },
             "ref": {
                 "label": "Reference"
             },

From 7fa70da14005c5a6021fa3136b6eef79bd7e8f78 Mon Sep 17 00:00:00 2001
From: Eric Brelsford <ebrelsford@gmail.com>
Date: Wed, 17 Jun 2015 16:02:15 -0400
Subject: [PATCH 2/2] Include recycling_type field

---
 data/presets/fields/recycling/type.json | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 data/presets/fields/recycling/type.json

diff --git a/data/presets/fields/recycling/type.json b/data/presets/fields/recycling/type.json
new file mode 100644
index 000000000..1e35805f1
--- /dev/null
+++ b/data/presets/fields/recycling/type.json
@@ -0,0 +1,5 @@
+{
+    "key": "recycling_type",
+    "type": "combo",
+    "label": "Recycling Type"
+}