Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New Piste presets #5368

Merged
merged 4 commits into from
Oct 7, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
158 changes: 153 additions & 5 deletions data/presets.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,9 @@ en:
collection_times:
# collection_times=*
label: Collection Times
colour:
# colour=*
label: Colour
comment:
# comment=*
label: Changeset Comment
Expand Down Expand Up @@ -1149,6 +1152,26 @@ en:
# phone field placeholder
placeholder: +31 42 123 4567
piste/difficulty:
# 'piste:difficulty=*'
label: Difficulty
options:
# 'piste:difficulty=advanced'
advanced: Advanced
# 'piste:difficulty=easy'
easy: Easy
# 'piste:difficulty=expert'
expert: Expert
# 'piste:difficulty=extreme'
extreme: Extreme
# 'piste:difficulty=freeride'
freeride: Freeride
# 'piste:difficulty=intermediate'
intermediate: Intermediate
# 'piste:difficulty=novice'
novice: Novice
# piste/difficulty field placeholder
placeholder: 'Easy, Intermediate, Advanced...'
piste/difficulty_downhill:
# 'piste:difficulty=*'
label: Difficulty
options:
Expand All @@ -1166,7 +1189,43 @@ en:
intermediate: Intermediate (blue square)
# 'piste:difficulty=novice'
novice: Novice (instructional)
# piste/difficulty field placeholder
# piste/difficulty_downhill field placeholder
placeholder: 'Easy, Intermediate, Advanced...'
piste/difficulty_nordic:
# 'piste:difficulty=*'
label: Difficulty
options:
# 'piste:difficulty=advanced'
advanced: 'Advanced - Narrow, steep or icy section, sharp turn'
# 'piste:difficulty=easy'
easy: 'Easy - Soft hills, short steep section'
# 'piste:difficulty=expert'
expert: Expert - Dangerous terrain around
# 'piste:difficulty=intermediate'
intermediate: Intermediate - Steep section
# 'piste:difficulty=novice'
novice: 'Novice - Flat, no effort needed'
# piste/difficulty_nordic field placeholder
placeholder: 'Easy, Intermediate, Advanced...'
piste/difficulty_skitour:
# 'piste:difficulty=*'
label: Difficulty
options:
# 'piste:difficulty=advanced'
advanced: 'Advanced - S: 40-45° incline'
# 'piste:difficulty=easy'
easy: 'Easy - WS: 30-35° incline'
# 'piste:difficulty=expert'
expert: 'Expert - SS: 45–50° incline'
# 'piste:difficulty=extreme'
extreme: 'Extreme - EX: >55° incline'
# 'piste:difficulty=freeride'
freeride: 'Freeride - AS: 50–55° incline'
# 'piste:difficulty=intermediate'
intermediate: 'Intermediate - ZS: 35-40° incline'
# 'piste:difficulty=novice'
novice: 'Novice - L: <30° incline'
# piste/difficulty_skitour field placeholder
placeholder: 'Easy, Intermediate, Advanced...'
piste/grooming:
# 'piste:grooming=*'
Expand All @@ -1184,6 +1243,38 @@ en:
scooter: Scooter/Snowmobile
# 'piste:grooming=skating'
skating: Skating
piste/grooming_downhill:
# 'piste:grooming=*'
label: Grooming
options:
# 'piste:grooming=backcountry'
backcountry: Backcountry - no grooming
# 'piste:grooming=classic'
classic: Classic
# 'piste:grooming=mogul'
mogul: Mogul
piste/grooming_hike:
# 'piste:grooming=*'
label: Grooming
options:
# 'piste:grooming=backcountry'
backcountry: Backcountry - Snowshoeing
# 'piste:grooming=classic'
classic: Classic - Winter Hiking
piste/grooming_nordic:
# 'piste:grooming=*'
label: Grooming
options:
# 'piste:grooming=backcountry'
backcountry: 'Backcountry, no grooming'
# 'piste:grooming=classic'
classic: Classic
# 'piste:grooming=classic+skating'
classic+skating: Classic and Skating
# 'piste:grooming=scooter'
scooter: Scooter/Snowmobile
# 'piste:grooming=skating'
skating: Skating
piste/type:
# 'piste:type=*'
label: Type
Expand All @@ -1208,6 +1299,28 @@ en:
sleigh: Sleigh
# 'piste:type=snow_park'
snow_park: Snow Park
piste/type_downhill:
# 'piste:type=*'
label: Type
options:
# 'piste:type=connection'
connection: Connection between pistes
# 'piste:type=downhill'
downhill: Downhill
# 'piste:type=playground'
playground: Playground
# 'piste:type=snow_park'
snow_park: Snow Park
piste/type_nordic:
# 'piste:type=*'
label: Type
options:
# 'piste:type=connection'
connection: Connection between pistes
# 'piste:type=downhill'
downhill: Nordic
# 'piste:type=playground'
playground: Playground
place:
# place=*
label: Type
Expand Down Expand Up @@ -4887,11 +5000,46 @@ en:
name: Water Utility Office
# 'terms: water board,utility'
terms: '<translate with synonyms or related terms for ''Water Utility Office'', separated by commas>'
piste:
piste/downhill:
# 'piste:type=downhill'
name: Downhill Piste/Ski Run
# 'terms: ski,alpine,snowboard,downhill,piste'
terms: '<translate with synonyms or related terms for ''Downhill Piste/Ski Run'', separated by commas>'
piste/hike:
# 'piste:type=hike'
name: Snowshoeing or Winter Hiking Trail
# 'terms: hike,winter hiking,snowshoe,snowshoeing,piste,ski'
terms: '<translate with synonyms or related terms for ''Snowshoeing or Winter Hiking Trail'', separated by commas>'
piste/ice_skate:
# 'piste:type=ice_skate'
name: Ice Skating Piste
# 'terms: ice,skating,ski,piste'
terms: '<translate with synonyms or related terms for ''Ice Skating Piste'', separated by commas>'
piste/nordic:
# 'piste:type=nordic'
name: Nordic or Crosscountry Piste/Ski Trail
# 'terms: ski,nordic,crosscountry,skating,piste'
terms: '<translate with synonyms or related terms for ''Nordic or Crosscountry Piste/Ski Trail'', separated by commas>'
piste/piste:
# 'piste:type=*'
name: Piste/Ski Trail
# 'terms: ski,sled,sleigh,snowboard,nordic,downhill,snowmobile'
terms: '<translate with synonyms or related terms for ''Piste/Ski Trail'', separated by commas>'
name: Winter Sport Trails
# 'terms: ski,nordic,crosscountry,downhill,alpine,snowboard,skitour,ski touring,sled,luge,sleigh,sledge,ski-joring,husky,horse,winter hiking,snowshoe,snowshoeing,ice,skating'
terms: '<translate with synonyms or related terms for ''Winter Sport Trails'', separated by commas>'
piste/skitour:
# 'piste:type=skitour'
name: Ski Touring Trail
# 'terms: ski,skitour,crosscountry,ski touring,piste'
terms: '<translate with synonyms or related terms for ''Ski Touring Trail'', separated by commas>'
piste/sled:
# 'piste:type=sled'
name: Sled Piste
# 'terms: ski,sled,luge,sleigh,sledge,piste'
terms: '<translate with synonyms or related terms for ''Sled Piste'', separated by commas>'
piste/sleigh:
# 'piste:type=sleigh'
name: Sleigh Piste
# 'terms: ski,piste,sled,luge,sleigh,sledge,ski-joring,husky,horse'
terms: '<translate with synonyms or related terms for ''Sleigh Piste'', separated by commas>'
place:
# place=*
name: Place
Expand Down
11 changes: 10 additions & 1 deletion data/presets/fields.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
"clothes": {"key": "clothes", "type": "semiCombo", "label": "Clothes"},
"club": {"key": "club", "type": "typeCombo", "label": "Type"},
"collection_times": {"key": "collection_times", "type": "text", "label": "Collection Times"},
"colour": {"key": "colour", "type": "text", "label": "Colour"},
"comment": {"key": "comment", "type": "textarea", "label": "Changeset Comment", "placeholder": "Brief description of your contributions (required)"},
"communication_multi": {"key": "communication:", "type": "multiCombo", "label": "Communication Types"},
"construction": {"key": "construction", "type": "combo", "label": "Type"},
Expand Down Expand Up @@ -201,8 +202,16 @@
"payment_multi": {"key": "payment:", "type": "multiCombo", "label": "Payment Types", "universal": true},
"phases": {"key": "phases", "type": "number", "minValue": 1, "label": "Phases", "placeholder": "1, 2, 3..."},
"phone": {"key": "phone", "type": "tel", "icon": "maki-telephone", "universal": true, "label": "Telephone", "placeholder": "+31 42 123 4567"},
"piste/difficulty": {"key": "piste:difficulty", "type": "combo", "label": "Difficulty", "placeholder": "Easy, Intermediate, Advanced...", "strings": {"options": {"novice": "Novice (instructional)", "easy": "Easy (green circle)", "intermediate": "Intermediate (blue square)", "advanced": "Advanced (black diamond)", "expert": "Expert (double black diamond)", "freeride": "Freeride (off-piste)", "extreme": "Extreme (climbing equipment required)"}}},
"piste/difficulty_downhill": {"key": "piste:difficulty", "type": "combo", "label": "Difficulty", "placeholder": "Easy, Intermediate, Advanced...", "strings": {"options": {"novice": "Novice (instructional)", "easy": "Easy (green circle)", "intermediate": "Intermediate (blue square)", "advanced": "Advanced (black diamond)", "expert": "Expert (double black diamond)", "freeride": "Freeride (off-piste)", "extreme": "Extreme (climbing equipment required)"}}},
"piste/difficulty_nordic": {"key": "piste:difficulty", "type": "combo", "label": "Difficulty", "placeholder": "Easy, Intermediate, Advanced...", "strings": {"options": {"novice": "Novice - Flat, no effort needed", "easy": "Easy - Soft hills, short steep section", "intermediate": "Intermediate - Steep section", "advanced": "Advanced - Narrow, steep or icy section, sharp turn", "expert": "Expert - Dangerous terrain around"}}},
"piste/difficulty_skitour": {"key": "piste:difficulty", "type": "combo", "label": "Difficulty", "placeholder": "Easy, Intermediate, Advanced...", "strings": {"options": {"novice": "Novice - L: <30° incline", "easy": "Easy - WS: 30-35° incline", "intermediate": "Intermediate - ZS: 35-40° incline", "advanced": "Advanced - S: 40-45° incline", "expert": "Expert - SS: 45–50° incline", "freeride": "Freeride - AS: 50–55° incline", "extreme": "Extreme - EX: >55° incline"}}},
"piste/difficulty": {"key": "piste:difficulty", "type": "combo", "label": "Difficulty", "placeholder": "Easy, Intermediate, Advanced...", "strings": {"options": {"novice": "Novice", "easy": "Easy", "intermediate": "Intermediate", "advanced": "Advanced", "expert": "Expert", "freeride": "Freeride", "extreme": "Extreme"}}},
"piste/grooming_downhill": {"key": "piste:grooming", "type": "combo", "label": "Grooming", "strings": {"options": {"classic": "Classic", "mogul": "Mogul", "backcountry": "Backcountry - no grooming"}}},
"piste/grooming_hike": {"key": "piste:grooming", "type": "combo", "label": "Grooming", "strings": {"options": {"classic": "Classic - Winter Hiking", "backcountry": "Backcountry - Snowshoeing"}}},
"piste/grooming_nordic": {"key": "piste:grooming", "type": "combo", "label": "Grooming", "strings": {"options": {"classic": "Classic", "backcountry": "Backcountry, no grooming", "classic+skating": "Classic and Skating", "scooter": "Scooter/Snowmobile", "skating": "Skating"}}},
"piste/grooming": {"key": "piste:grooming", "type": "combo", "label": "Grooming", "strings": {"options": {"classic": "Classic", "mogul": "Mogul", "backcountry": "Backcountry", "classic+skating": "Classic and Skating", "scooter": "Scooter/Snowmobile", "skating": "Skating"}}},
"piste/type_downhill": {"key": "piste:type", "type": "typeCombo", "label": "Type", "strings": {"options": {"downhill": "Downhill", "snow_park": "Snow Park", "playground": "Playground", "connection": "Connection between pistes"}}},
"piste/type_nordic": {"key": "piste:type", "type": "typeCombo", "label": "Type", "strings": {"options": {"downhill": "Nordic", "playground": "Playground", "connection": "Connection between pistes"}}},
"piste/type": {"key": "piste:type", "type": "typeCombo", "label": "Type", "strings": {"options": {"downhill": "Downhill", "nordic": "Nordic", "skitour": "Skitour", "sled": "Sled", "hike": "Hike", "sleigh": "Sleigh", "ice_skate": "Ice Skate", "snow_park": "Snow Park", "playground": "Playground", "connection": "Connection"}}},
"place": {"key": "place", "type": "typeCombo", "label": "Type"},
"plant": {"key": "plant", "type": "combo", "label": "Plant"},
Expand Down
5 changes: 5 additions & 0 deletions data/presets/fields/colour.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"key": "colour",
"type": "text",
"label": "Colour"
}
14 changes: 7 additions & 7 deletions data/presets/fields/piste/difficulty.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
"placeholder": "Easy, Intermediate, Advanced...",
"strings": {
"options": {
"novice": "Novice (instructional)",
"easy": "Easy (green circle)",
"intermediate": "Intermediate (blue square)",
"advanced": "Advanced (black diamond)",
"expert": "Expert (double black diamond)",
"freeride": "Freeride (off-piste)",
"extreme": "Extreme (climbing equipment required)"
"novice": "Novice",
"easy": "Easy",
"intermediate": "Intermediate",
"advanced": "Advanced",
"expert": "Expert",
"freeride": "Freeride",
"extreme": "Extreme"
}
}
}
17 changes: 17 additions & 0 deletions data/presets/fields/piste/difficulty_downhill.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"key": "piste:difficulty",
"type": "combo",
"label": "Difficulty",
"placeholder": "Easy, Intermediate, Advanced...",
"strings": {
"options": {
"novice": "Novice (instructional)",
"easy": "Easy (green circle)",
"intermediate": "Intermediate (blue square)",
"advanced": "Advanced (black diamond)",
"expert": "Expert (double black diamond)",
"freeride": "Freeride (off-piste)",
"extreme": "Extreme (climbing equipment required)"
}
}
}
15 changes: 15 additions & 0 deletions data/presets/fields/piste/difficulty_nordic.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"key": "piste:difficulty",
"type": "combo",
"label": "Difficulty",
"placeholder": "Easy, Intermediate, Advanced...",
"strings": {
"options": {
"novice": "Novice - Flat, no effort needed",
"easy": "Easy - Soft hills, short steep section",
"intermediate": "Intermediate - Steep section",
"advanced": "Advanced - Narrow, steep or icy section, sharp turn",
"expert": "Expert - Dangerous terrain around"
}
}
}
17 changes: 17 additions & 0 deletions data/presets/fields/piste/difficulty_skitour.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"key": "piste:difficulty",
"type": "combo",
"label": "Difficulty",
"placeholder": "Easy, Intermediate, Advanced...",
"strings": {
"options": {
"novice": "Novice - L: <30° incline",
"easy": "Easy - WS: 30-35° incline",
"intermediate": "Intermediate - ZS: 35-40° incline",
"advanced": "Advanced - S: 40-45° incline",
"expert": "Expert - SS: 45–50° incline",
"freeride": "Freeride - AS: 50–55° incline",
"extreme": "Extreme - EX: >55° incline"
}
}
}
12 changes: 12 additions & 0 deletions data/presets/fields/piste/grooming_downhill.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"key": "piste:grooming",
"type": "combo",
"label": "Grooming",
"strings": {
"options": {
"classic": "Classic",
"mogul": "Mogul",
"backcountry": "Backcountry - no grooming"
}
}
}
11 changes: 11 additions & 0 deletions data/presets/fields/piste/grooming_hike.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"key": "piste:grooming",
"type": "combo",
"label": "Grooming",
"strings": {
"options": {
"classic": "Classic - Winter Hiking",
"backcountry": "Backcountry - Snowshoeing"
}
}
}
14 changes: 14 additions & 0 deletions data/presets/fields/piste/grooming_nordic.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"key": "piste:grooming",
"type": "combo",
"label": "Grooming",
"strings": {
"options": {
"classic": "Classic",
"backcountry": "Backcountry, no grooming",
"classic+skating": "Classic and Skating",
"scooter": "Scooter/Snowmobile",
"skating": "Skating"
}
}
}
13 changes: 13 additions & 0 deletions data/presets/fields/piste/type_downhill.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"key": "piste:type",
"type": "typeCombo",
"label": "Type",
"strings": {
"options": {
"downhill": "Downhill",
"snow_park": "Snow Park",
"playground": "Playground",
"connection": "Connection between pistes"
}
}
}
12 changes: 12 additions & 0 deletions data/presets/fields/piste/type_nordic.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"key": "piste:type",
"type": "typeCombo",
"label": "Type",
"strings": {
"options": {
"downhill": "Nordic",
"playground": "Playground",
"connection": "Connection between pistes"
}
}
}
Loading