From 60af39c7da0be3df17ee2b8257469bbbaeff283f Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Wed, 23 Jul 2014 13:54:48 -0400 Subject: [PATCH] add mtb:scale, mtb:scale:uphill, mtb:scale:imba (closes #2244) --- data/presets.yaml | 34 ++++++++++++++- data/presets/fields.json | 52 ++++++++++++++++++++++- data/presets/fields/mtb/scale.json | 17 ++++++++ data/presets/fields/mtb/scale/imba.json | 15 +++++++ data/presets/fields/mtb/scale/uphill.json | 16 +++++++ data/presets/fields/sac_scale.json | 2 +- data/presets/fields/tracktype.json | 2 +- data/presets/presets.json | 18 +++++--- data/presets/presets/highway/path.json | 5 ++- data/presets/presets/highway/track.json | 13 +++--- dist/locales/en.json | 40 ++++++++++++++++- 11 files changed, 194 insertions(+), 20 deletions(-) create mode 100644 data/presets/fields/mtb/scale.json create mode 100644 data/presets/fields/mtb/scale/imba.json create mode 100644 data/presets/fields/mtb/scale/uphill.json diff --git a/data/presets.yaml b/data/presets.yaml index e5122ab3c..87630d658 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -281,6 +281,36 @@ en: maxspeed: label: Speed Limit placeholder: "40, 50, 60..." + mtb/scale: + label: Mountain Biking Difficulty + placeholder: "0, 1, 2, 3..." + options: + "0": "0: Solid gravel/packed earth, no obstacles, wide curves" + "1": "1: Some loose surface, small obstacles, wide curves" + "2": "2: Much loose surface, large obstacles, easy hairpins" + "3": "3: Slippery surface, large obstacles, tight hairpins" + "4": "4: Loose surface or boulders, dangerous hairpins" + "5": "5: Maximum difficulty, boulder fields, landslides" + "6": "6: Not rideable except by the very best mountain bikers" + mtb/scale/imba: + label: IMBA Trail Difficulty + placeholder: "Easy, Medium, Difficult..." + options: + "0": Easiest (white circle) + "1": Easy (green circle) + "2": Medium (blue square) + "3": Difficult (black diamond) + "4": Extremely Difficult (double black diamond) + mtb/scale/uphill: + label: Mountain Biking Uphill Difficulty + placeholder: "0, 1, 2, 3..." + options: + "0": "0: Avg. incline <10%, gravel/packed earth, no obstacles" + "1": "1: Avg. incline <15%, gravel/packed earth, few small objects" + "2": "2: Avg. incline <20%, stable surface, fistsize rocks/roots" + "3": "3: Avg. incline <25%, variable surface, fistsize rocks/branches" + "4": "4: Avg. incline <30%, poor condition, big rocks/branches" + "5": "5: Very steep, bike generally needs to be pushed or carried" name: label: Name placeholder: Common name (if any) @@ -389,7 +419,7 @@ en: route_master: label: Type sac_scale: - label: Path Difficulty + label: Hiking Difficulty placeholder: "Mountain Hiking, Alpine Hiking..." options: hiking: "T1: Hiking" @@ -470,7 +500,7 @@ en: towertype: label: Tower type tracktype: - label: Type + label: Track Type placeholder: "Solid, Mostly Solid, Soft..." options: grade1: "Solid: paved or heavily compacted hardcore surface" diff --git a/data/presets/fields.json b/data/presets/fields.json index cf554ae8d..1e05e06ee 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -571,6 +571,54 @@ "label": "Speed Limit", "placeholder": "40, 50, 60..." }, + "mtb/scale": { + "key": "mtb:scale", + "type": "combo", + "label": "Mountain Biking Difficulty", + "placeholder": "0, 1, 2, 3...", + "strings": { + "options": { + "0": "0: Solid gravel/packed earth, no obstacles, wide curves", + "1": "1: Some loose surface, small obstacles, wide curves", + "2": "2: Much loose surface, large obstacles, easy hairpins", + "3": "3: Slippery surface, large obstacles, tight hairpins", + "4": "4: Loose surface or boulders, dangerous hairpins", + "5": "5: Maximum difficulty, boulder fields, landslides", + "6": "6: Not rideable except by the very best mountain bikers" + } + } + }, + "mtb/scale/imba": { + "key": "mtb:scale:imba", + "type": "combo", + "label": "IMBA Trail Difficulty", + "placeholder": "Easy, Medium, Difficult...", + "strings": { + "options": { + "0": "Easiest (white circle)", + "1": "Easy (green circle)", + "2": "Medium (blue square)", + "3": "Difficult (black diamond)", + "4": "Extremely Difficult (double black diamond)" + } + } + }, + "mtb/scale/uphill": { + "key": "mtb:scale:uphill", + "type": "combo", + "label": "Mountain Biking Uphill Difficulty", + "placeholder": "0, 1, 2, 3...", + "strings": { + "options": { + "0": "0: Avg. incline <10%, gravel/packed earth, no obstacles", + "1": "1: Avg. incline <15%, gravel/packed earth, few small objects", + "2": "2: Avg. incline <20%, stable surface, fistsize rocks/roots", + "3": "3: Avg. incline <25%, variable surface, fistsize rocks/branches", + "4": "4: Avg. incline <30%, poor condition, big rocks/branches", + "5": "5: Very steep, bike generally needs to be pushed or carried" + } + } + }, "name": { "key": "name", "type": "localized", @@ -800,7 +848,7 @@ "sac_scale": { "key": "sac_scale", "type": "combo", - "label": "Path Difficulty", + "label": "Hiking Difficulty", "placeholder": "Mountain Hiking, Alpine Hiking...", "strings": { "options": { @@ -1001,7 +1049,7 @@ "tracktype": { "key": "tracktype", "type": "combo", - "label": "Type", + "label": "Track Type", "placeholder": "Solid, Mostly Solid, Soft...", "strings": { "options": { diff --git a/data/presets/fields/mtb/scale.json b/data/presets/fields/mtb/scale.json new file mode 100644 index 000000000..c7dbb6507 --- /dev/null +++ b/data/presets/fields/mtb/scale.json @@ -0,0 +1,17 @@ +{ + "key": "mtb:scale", + "type": "combo", + "label": "Mountain Biking Difficulty", + "placeholder": "0, 1, 2, 3...", + "strings": { + "options": { + "0": "0: Solid gravel/packed earth, no obstacles, wide curves", + "1": "1: Some loose surface, small obstacles, wide curves", + "2": "2: Much loose surface, large obstacles, easy hairpins", + "3": "3: Slippery surface, large obstacles, tight hairpins", + "4": "4: Loose surface or boulders, dangerous hairpins", + "5": "5: Maximum difficulty, boulder fields, landslides", + "6": "6: Not rideable except by the very best mountain bikers" + } + } +} diff --git a/data/presets/fields/mtb/scale/imba.json b/data/presets/fields/mtb/scale/imba.json new file mode 100644 index 000000000..a71234bf6 --- /dev/null +++ b/data/presets/fields/mtb/scale/imba.json @@ -0,0 +1,15 @@ +{ + "key": "mtb:scale:imba", + "type": "combo", + "label": "IMBA Trail Difficulty", + "placeholder": "Easy, Medium, Difficult...", + "strings": { + "options": { + "0": "Easiest (white circle)", + "1": "Easy (green circle)", + "2": "Medium (blue square)", + "3": "Difficult (black diamond)", + "4": "Extremely Difficult (double black diamond)" + } + } +} diff --git a/data/presets/fields/mtb/scale/uphill.json b/data/presets/fields/mtb/scale/uphill.json new file mode 100644 index 000000000..fdfb0c0b3 --- /dev/null +++ b/data/presets/fields/mtb/scale/uphill.json @@ -0,0 +1,16 @@ +{ + "key": "mtb:scale:uphill", + "type": "combo", + "label": "Mountain Biking Uphill Difficulty", + "placeholder": "0, 1, 2, 3...", + "strings": { + "options": { + "0": "0: Avg. incline <10%, gravel/packed earth, no obstacles", + "1": "1: Avg. incline <15%, gravel/packed earth, few small objects", + "2": "2: Avg. incline <20%, stable surface, fistsize rocks/roots", + "3": "3: Avg. incline <25%, variable surface, fistsize rocks/branches", + "4": "4: Avg. incline <30%, poor condition, big rocks/branches", + "5": "5: Very steep, bike generally needs to be pushed or carried" + } + } +} diff --git a/data/presets/fields/sac_scale.json b/data/presets/fields/sac_scale.json index c8f17e4ea..e3f792b34 100644 --- a/data/presets/fields/sac_scale.json +++ b/data/presets/fields/sac_scale.json @@ -1,7 +1,7 @@ { "key": "sac_scale", "type": "combo", - "label": "Path Difficulty", + "label": "Hiking Difficulty", "placeholder": "Mountain Hiking, Alpine Hiking...", "strings": { "options": { diff --git a/data/presets/fields/tracktype.json b/data/presets/fields/tracktype.json index 41277c4f6..b234fa79d 100644 --- a/data/presets/fields/tracktype.json +++ b/data/presets/fields/tracktype.json @@ -1,7 +1,7 @@ { "key": "tracktype", "type": "combo", - "label": "Type", + "label": "Track Type", "placeholder": "Solid, Mostly Solid, Soft...", "strings": { "options": { diff --git a/data/presets/presets.json b/data/presets/presets.json index c7caa57f2..bc4615013 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -3951,9 +3951,12 @@ "width", "structure", "access", - "sac_scale", "incline", + "sac_scale", "trail_visibility", + "mtb/scale", + "mtb/scale/uphill", + "mtb/scale/imba", "ref" ], "geometry": [ @@ -4336,13 +4339,16 @@ "highway/track": { "icon": "highway-track", "fields": [ - "tracktype", - "smoothness", - "oneway", - "maxspeed", + "surface", + "width", "structure", "access", - "surface" + "incline", + "tracktype", + "smoothness", + "mtb/scale", + "mtb/scale/uphill", + "mtb/scale/imba" ], "geometry": [ "line" diff --git a/data/presets/presets/highway/path.json b/data/presets/presets/highway/path.json index 20a76a453..3746e5be4 100644 --- a/data/presets/presets/highway/path.json +++ b/data/presets/presets/highway/path.json @@ -5,9 +5,12 @@ "width", "structure", "access", - "sac_scale", "incline", + "sac_scale", "trail_visibility", + "mtb/scale", + "mtb/scale/uphill", + "mtb/scale/imba", "ref" ], "geometry": [ diff --git a/data/presets/presets/highway/track.json b/data/presets/presets/highway/track.json index 1b921a928..bc6024626 100644 --- a/data/presets/presets/highway/track.json +++ b/data/presets/presets/highway/track.json @@ -1,13 +1,16 @@ { "icon": "highway-track", "fields": [ - "tracktype", - "smoothness", - "oneway", - "maxspeed", + "surface", + "width", "structure", "access", - "surface" + "incline", + "tracktype", + "smoothness", + "mtb/scale", + "mtb/scale/uphill", + "mtb/scale/imba" ], "geometry": [ "line" diff --git a/dist/locales/en.json b/dist/locales/en.json index e929c90c7..6e86ab332 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -805,6 +805,42 @@ "label": "Speed Limit", "placeholder": "40, 50, 60..." }, + "mtb/scale": { + "label": "Mountain Biking Difficulty", + "placeholder": "0, 1, 2, 3...", + "options": { + "0": "0: Solid gravel/packed earth, no obstacles, wide curves", + "1": "1: Some loose surface, small obstacles, wide curves", + "2": "2: Much loose surface, large obstacles, easy hairpins", + "3": "3: Slippery surface, large obstacles, tight hairpins", + "4": "4: Loose surface or boulders, dangerous hairpins", + "5": "5: Maximum difficulty, boulder fields, landslides", + "6": "6: Not rideable except by the very best mountain bikers" + } + }, + "mtb/scale/imba": { + "label": "IMBA Trail Difficulty", + "placeholder": "Easy, Medium, Difficult...", + "options": { + "0": "Easiest (white circle)", + "1": "Easy (green circle)", + "2": "Medium (blue square)", + "3": "Difficult (black diamond)", + "4": "Extremely Difficult (double black diamond)" + } + }, + "mtb/scale/uphill": { + "label": "Mountain Biking Uphill Difficulty", + "placeholder": "0, 1, 2, 3...", + "options": { + "0": "0: Avg. incline <10%, gravel/packed earth, no obstacles", + "1": "1: Avg. incline <15%, gravel/packed earth, few small objects", + "2": "2: Avg. incline <20%, stable surface, fistsize rocks/roots", + "3": "3: Avg. incline <25%, variable surface, fistsize rocks/branches", + "4": "4: Avg. incline <30%, poor condition, big rocks/branches", + "5": "5: Very steep, bike generally needs to be pushed or carried" + } + }, "name": { "label": "Name", "placeholder": "Common name (if any)" @@ -950,7 +986,7 @@ "label": "Type" }, "sac_scale": { - "label": "Path Difficulty", + "label": "Hiking Difficulty", "placeholder": "Mountain Hiking, Alpine Hiking...", "options": { "hiking": "T1: Hiking", @@ -1057,7 +1093,7 @@ "label": "Tower type" }, "tracktype": { - "label": "Type", + "label": "Track Type", "placeholder": "Solid, Mostly Solid, Soft...", "options": { "grade1": "Solid: paved or heavily compacted hardcore surface",