Fill in preset list for relations

Fixes #1541

data/presets.yaml

@@ -9,6 +9,8 @@ en:
         name: Rail
       "category-road": 
         name: Road
+      "category-route": 
+        name: Route
       "category-water": 
         name: Water
     fields: 
@@ -175,6 +177,8 @@ en:
         label: Type
       ref: 
         label: Reference
+      relation: 
+        label: Type
       religion: 
         label: Religion
         options: 
@@ -185,6 +189,8 @@ en:
           hindu: Hindu
           shinto: Shinto
           taoist: Taoist
+      route: 
+        label: Type
       sac_scale: 
         label: Path Difficulty
       service: 

data/presets/categories.json

@@ -62,6 +62,24 @@
             "highway/road"
         ]
     },
+    "category-route": {
+        "geometry": "relation",
+        "name": "Route",
+        "icon": "route",
+        "members": [
+            "type/route/road",
+            "type/route/foot",
+            "type/route/bicycle",
+            "type/route/bus",
+            "type/route/train",
+            "type/route/tram",
+            "type/route/ferry",
+            "type/route/power",
+            "type/route/pipeline",
+            "type/route/detour",
+            "type/route"
+        ]
+    },
     "category-water": {
         "geometry": "line",
         "name": "Water",

data/presets/categories/route.json

@@ -0,0 +1,18 @@
+{
+    "geometry": "relation",
+    "name": "Route",
+    "icon": "route",
+    "members": [
+        "type/route/road",
+        "type/route/foot",
+        "type/route/bicycle",
+        "type/route/bus",
+        "type/route/train",
+        "type/route/tram",
+        "type/route/ferry",
+        "type/route/power",
+        "type/route/pipeline",
+        "type/route/detour",
+        "type/route"
+    ]
+}

data/presets/defaults.json

@@ -37,5 +37,12 @@
         "highway/mini_roundabout",
         "highway/motorway_junction",
         "vertex"
+    ],
+    "relation": [
+        "category-route",
+        "type/boundary",
+        "type/restriction",
+        "type/multipolygon",
+        "relation"
     ]
 }

data/presets/fields.json

@@ -417,6 +417,11 @@
         "type": "text",
         "label": "Reference"
     },
+    "relation": {
+        "key": "type",
+        "type": "combo",
+        "label": "Type"
+    },
     "religion": {
         "key": "religion",
         "type": "combo",
@@ -442,6 +447,11 @@
             }
         }
     },
+    "route": {
+        "key": "route",
+        "type": "combo",
+        "label": "Type"
+    },
     "sac_scale": {
         "key": "sac_scale",
         "type": "combo",

data/presets/fields/relation.json

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

data/presets/fields/route.json

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

data/presets/presets.json

@@ -3280,6 +3280,9 @@
         "tags": {},
         "geometry": [
             "relation"
+        ],
+        "fields": [
+            "relation"
         ]
     },
     "route/ferry": {
@@ -4527,7 +4530,10 @@
             "type": "route"
         },
         "name": "Route",
-        "icon": "route"
+        "icon": "route",
+        "fields": [
+            "route"
+        ]
     },
     "type/route/bicycle": {
         "geometry": [

data/presets/presets/relation.json

@@ -2,5 +2,8 @@
     "name": "Relation",
     "icon": "relation",
     "tags": {},
-    "geometry": ["relation"]
+    "geometry": ["relation"],
+    "fields": [
+        "relation"
+    ]
 }

data/presets/presets/type/route.json

@@ -6,5 +6,8 @@
         "type": "route"
     },
     "name": "Route",
-    "icon": "route"
+    "icon": "route",
+    "fields": [
+        "route"
+    ]
 }

dist/locales/en.json

@@ -366,6 +366,9 @@
             "category-road": {
                 "name": "Road"
             },
+            "category-route": {
+                "name": "Route"
+            },
             "category-water": {
                 "name": "Water"
             }
@@ -603,6 +606,9 @@
             "ref": {
                 "label": "Reference"
             },
+            "relation": {
+                "label": "Type"
+            },
             "religion": {
                 "label": "Religion",
                 "options": {
@@ -615,6 +621,9 @@
                     "taoist": "Taoist"
                 }
             },
+            "route": {
+                "label": "Type"
+            },
             "sac_scale": {
                 "label": "Path Difficulty"
             },

js/id/presets.js

@@ -4,7 +4,7 @@ iD.presets = function() {
     // loading new data and returning defaults
 
     var all = iD.presets.Collection([]),
-        defaults = { area: all, line: all, point: all, vertex: all },
+        defaults = { area: all, line: all, point: all, vertex: all, relation: all },
         fields = {},
         universal = [],
         recent = iD.presets.Collection([]);
@@ -67,7 +67,8 @@ iD.presets = function() {
                 area: iD.presets.Collection(d.defaults.area.map(getItem)),
                 line: iD.presets.Collection(d.defaults.line.map(getItem)),
                 point: iD.presets.Collection(d.defaults.point.map(getItem)),
-                vertex: iD.presets.Collection(d.defaults.vertex.map(getItem))
+                vertex: iD.presets.Collection(d.defaults.vertex.map(getItem)),
+                relation: iD.presets.Collection(d.defaults.relation.map(getItem))
             };
         }