From 8e6dd17cfc176eb66826c7ebcf9bb9373928ffcc Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Wed, 29 May 2013 10:21:45 -0700 Subject: [PATCH] Fill in preset list for relations Fixes #1541 --- data/presets.yaml | 6 ++++++ data/presets/categories.json | 18 ++++++++++++++++++ data/presets/categories/route.json | 18 ++++++++++++++++++ data/presets/defaults.json | 7 +++++++ data/presets/fields.json | 10 ++++++++++ data/presets/fields/relation.json | 5 +++++ data/presets/fields/route.json | 5 +++++ data/presets/presets.json | 8 +++++++- data/presets/presets/relation.json | 5 ++++- data/presets/presets/type/route.json | 5 ++++- dist/locales/en.json | 9 +++++++++ js/id/presets.js | 5 +++-- 12 files changed, 96 insertions(+), 5 deletions(-) create mode 100644 data/presets/categories/route.json create mode 100644 data/presets/fields/relation.json create mode 100644 data/presets/fields/route.json diff --git a/data/presets.yaml b/data/presets.yaml index 862d0c0cc..366a4984a 100644 --- a/data/presets.yaml +++ b/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: diff --git a/data/presets/categories.json b/data/presets/categories.json index d1ccc3a75..e83e5bd9e 100644 --- a/data/presets/categories.json +++ b/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", diff --git a/data/presets/categories/route.json b/data/presets/categories/route.json new file mode 100644 index 000000000..e9f288356 --- /dev/null +++ b/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" + ] +} \ No newline at end of file diff --git a/data/presets/defaults.json b/data/presets/defaults.json index afc0062ba..c3039206f 100644 --- a/data/presets/defaults.json +++ b/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" ] } diff --git a/data/presets/fields.json b/data/presets/fields.json index 9130dda1f..755ece5e0 100644 --- a/data/presets/fields.json +++ b/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", diff --git a/data/presets/fields/relation.json b/data/presets/fields/relation.json new file mode 100644 index 000000000..ef52e3931 --- /dev/null +++ b/data/presets/fields/relation.json @@ -0,0 +1,5 @@ +{ + "key": "type", + "type": "combo", + "label": "Type" +} \ No newline at end of file diff --git a/data/presets/fields/route.json b/data/presets/fields/route.json new file mode 100644 index 000000000..9d1919993 --- /dev/null +++ b/data/presets/fields/route.json @@ -0,0 +1,5 @@ +{ + "key": "route", + "type": "combo", + "label": "Type" +} \ No newline at end of file diff --git a/data/presets/presets.json b/data/presets/presets.json index 13725fc50..73ab2550c 100644 --- a/data/presets/presets.json +++ b/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": [ diff --git a/data/presets/presets/relation.json b/data/presets/presets/relation.json index 30cd6aa81..96f61c798 100644 --- a/data/presets/presets/relation.json +++ b/data/presets/presets/relation.json @@ -2,5 +2,8 @@ "name": "Relation", "icon": "relation", "tags": {}, - "geometry": ["relation"] + "geometry": ["relation"], + "fields": [ + "relation" + ] } \ No newline at end of file diff --git a/data/presets/presets/type/route.json b/data/presets/presets/type/route.json index 4adc4b98d..0f9f50f99 100644 --- a/data/presets/presets/type/route.json +++ b/data/presets/presets/type/route.json @@ -6,5 +6,8 @@ "type": "route" }, "name": "Route", - "icon": "route" + "icon": "route", + "fields": [ + "route" + ] } \ No newline at end of file diff --git a/dist/locales/en.json b/dist/locales/en.json index 0c845d584..d679c0931 100644 --- a/dist/locales/en.json +++ b/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" }, diff --git a/js/id/presets.js b/js/id/presets.js index db97f9420..b9b318ea1 100644 --- a/js/id/presets.js +++ b/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)) }; }