Merge branch 'recycling_type' of https://github.com/ebrelsford/iD into ebrelsford-recycling_type

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

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",

data/presets/fields/recycling/type.json

@@ -0,0 +1,5 @@
+{
+    "key": "recycling_type",
+    "type": "combo",
+    "label": "Recycling Type"
+}

data/presets/presets.json

@@ -1482,6 +1482,7 @@
         "fields": [
             "operator",
             "address",
+            "recycling/type",
             "recycling/cans",
             "recycling/glass",
             "recycling/paper",

data/presets/presets/amenity/recycling.json

@@ -3,6 +3,7 @@
     "fields": [
         "operator",
         "address",
+        "recycling/type",
         "recycling/cans",
         "recycling/glass",
         "recycling/paper",

dist/locales/en.json

@@ -1199,6 +1199,9 @@
             "recycling/paper": {
                 "label": "Accepts Paper"
             },
+            "recycling/type": {
+                "label": "Recycling Type"
+            },
             "ref": {
                 "label": "Reference"
             },