Merge branch 'chips' of https://github.com/kepta/iD into kepta-chips

data/presets.yaml

@@ -773,32 +773,9 @@ en:
       railway:
         # 'railway=*'
         label: Type
-      recycling/cans:
-        # 'recycling:cans=*'
-        label: Accepts Cans
-      recycling/clothes:
-        # 'recycling:clothes=*'
-        label: Accepts Clothes
-      recycling/glass:
-        # 'recycling:glass=*'
-        label: Accepts Glass
-      recycling/glass_bottles:
-        # 'recycling:glass_bottles=*'
-        label: Accepts Glass Bottles
-      recycling/paper:
-        # 'recycling:paper=*'
-        label: Accepts Paper
-      recycling/plastic:
-        # 'recycling:plastic=*'
-        label: Accepts Plastic
-      recycling/type:
-        # 'recycling_type=*'
-        label: Recycling Type
-        options:
-          # recycling_type=centre
-          centre: Recycling Center
-          # recycling_type=container
-          container: Container
+      recycling/recycling_choices:
+        # 'recycling=*'
+        label: Accepts
       ref:
         # 'ref=*'
         label: Reference

data/presets/fields.json

@@ -653,7 +653,7 @@
     },
     "internet_access": {
         "key": "internet_access",
-        "type": "combo",
+        "type": "multiselect",
         "label": "Internet Access",
         "strings": {
             "options": {
@@ -1020,46 +1020,10 @@
         "type": "typeCombo",
         "label": "Type"
     },
-    "recycling/cans": {
-        "key": "recycling:cans",
-        "type": "check",
-        "label": "Accepts Cans"
-    },
-    "recycling/clothes": {
-        "key": "recycling:clothes",
-        "type": "check",
-        "label": "Accepts Clothes"
-    },
-    "recycling/glass": {
-        "key": "recycling:glass",
-        "type": "check",
-        "label": "Accepts Glass"
-    },
-    "recycling/glass_bottles": {
-        "key": "recycling:glass_bottles",
-        "type": "check",
-        "label": "Accepts Glass Bottles"
-    },
-    "recycling/paper": {
-        "key": "recycling:paper",
-        "type": "check",
-        "label": "Accepts Paper"
-    },
-    "recycling/plastic": {
-        "key": "recycling:plastic",
-        "type": "check",
-        "label": "Accepts Plastic"
-    },
-    "recycling/type": {
-        "key": "recycling_type",
-        "type": "combo",
-        "label": "Recycling Type",
-        "strings": {
-            "options": {
-                "container": "Container",
-                "centre": "Recycling Center"
-            }
-        }
+    "recycling/recycling_choices": {
+        "key": "recycling",
+        "type": "multiselect",
+        "label": "Accepts"
     },
     "ref": {
         "key": "ref",
@@ -1270,7 +1234,7 @@
     },
     "sport_ice": {
         "key": "sport",
-        "type": "combo",
+        "type": "multiselect",
         "label": "Sport",
         "options": [
             "skating",

data/presets/fields/internet_access.json

@@ -1,6 +1,6 @@
 {
     "key": "internet_access",
-    "type": "combo",
+    "type": "multiselect",
     "label": "Internet Access",
     "strings": {
         "options": {

data/presets/fields/recycling/cans.json

@@ -1,5 +0,0 @@
-{
-    "key": "recycling:cans",
-    "type": "check",
-    "label": "Accepts Cans"
-}

data/presets/fields/recycling/clothes.json

@@ -1,5 +0,0 @@
-{
-    "key": "recycling:clothes",
-    "type": "check",
-    "label": "Accepts Clothes"
-}

data/presets/fields/recycling/glass.json

@@ -1,5 +0,0 @@
-{
-    "key": "recycling:glass",
-    "type": "check",
-    "label": "Accepts Glass"
-}

data/presets/fields/recycling/glass_bottles.json

@@ -1,5 +0,0 @@
-{
-    "key": "recycling:glass_bottles",
-    "type": "check",
-    "label": "Accepts Glass Bottles"
-}

data/presets/fields/recycling/paper.json

@@ -1,5 +0,0 @@
-{
-    "key": "recycling:paper",
-    "type": "check",
-    "label": "Accepts Paper"
-}

data/presets/fields/recycling/plastic.json

@@ -1,5 +0,0 @@
-{
-    "key": "recycling:plastic",
-    "type": "check",
-    "label": "Accepts Plastic"
-}

data/presets/fields/recycling/recycling_choices.json

@@ -0,0 +1,5 @@
+{
+    "key": "recycling",
+    "type": "multiselect",
+    "label": "Accepts"
+}

data/presets/fields/recycling/type.json

@@ -1,11 +0,0 @@
-{
-    "key": "recycling_type",
-    "type": "combo",
-    "label": "Recycling Type",
-    "strings": {
-        "options": {
-            "container": "Container",
-            "centre": "Recycling Center"
-        }
-    }
-}

data/presets/fields/sport_ice.json

@@ -1,6 +1,6 @@
 {
     "key": "sport",
-    "type": "combo",
+    "type": "multiselect",
     "label": "Sport",
     "options": [
         "skating",

data/presets/presets.json

@@ -1581,13 +1581,7 @@
         "fields": [
             "operator",
             "address",
-            "recycling/type",
-            "recycling/cans",
-            "recycling/glass_bottles",
-            "recycling/paper",
-            "recycling/glass",
-            "recycling/plastic",
-            "recycling/clothes"
+            "recycling/recycling_choices"
         ],
         "geometry": [
             "point",

data/presets/presets/amenity/recycling.json

@@ -3,13 +3,7 @@
     "fields": [
         "operator",
         "address",
-        "recycling/type",
-        "recycling/cans",
-        "recycling/glass_bottles",
-        "recycling/paper",
-        "recycling/glass",
-        "recycling/plastic",
-        "recycling/clothes"
+        "recycling/recycling_choices"
     ],
     "geometry": [
         "point",

data/presets/schema/field.json

@@ -56,6 +56,7 @@
                 "defaultcheck",
                 "text",
                 "maxspeed",
+                "multiselect",
                 "number",
                 "tel",
                 "email",