CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-15 21:48:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Change the piste presets directory structure and other fixes

Browse Source
This commit is contained in:
yves
2018-10-06 08:27:10 +02:00
parent 77f534f497
commit 3296176d7a
29 changed files with 356 additions and 391 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/presets.yaml
+130 -151
View File
@@ -1148,7 +1148,27 @@ en:
label: Telephone
# phone field placeholder
placeholder: +31 42 123 4567
piste_downhill/difficulty:
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:
@@ -1166,59 +1186,9 @@ en:
intermediate: Intermediate (blue square)
# 'piste:difficulty=novice'
novice: Novice (instructional)
# piste_downhill/difficulty field placeholder
# piste/difficulty_downhill field placeholder
placeholder: 'Easy, Intermediate, Advanced...'
piste_downhill/grooming:
# 'piste:grooming=*'
label: Grooming
options:
# 'piste:grooming=backcountry'
backcountry: Backcountry - no grooming
# 'piste:grooming=classic'
classic: Classic
# 'piste:grooming=mogul'
mogul: Mogul
piste_downhill/type:
# '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_hike/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_hike/difficulty field placeholder
placeholder: 'Easy, Intermediate, Advanced...'
piste_hike/grooming:
# 'piste:grooming=*'
label: Grooming
options:
# 'piste:grooming=backcountry'
backcountry: Backcountry - Snowshoeing
# 'piste:grooming=classic'
classic: Classic - Winter Hiking
piste_nordic/difficulty:
piste/difficulty_nordic:
# 'piste:difficulty=*'
label: Difficulty
options:
@@ -1232,9 +1202,63 @@ en:
intermediate: Intermediate - Steep section
# 'piste:difficulty=novice'
novice: 'Novice - Flat, no effort needed'
# piste_nordic/difficulty field placeholder
# piste/difficulty_nordic field placeholder
placeholder: 'Easy, Intermediate, Advanced...'
piste_nordic/grooming:
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=*'
label: Grooming
options:
# 'piste:grooming=backcountry'
backcountry: Backcountry
# 'piste:grooming=classic'
classic: Classic
# 'piste:grooming=classic+skating'
classic+skating: Classic and Skating
# 'piste:grooming=mogul'
mogul: Mogul
# 'piste:grooming=scooter'
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:
@@ -1248,7 +1272,43 @@ en:
scooter: Scooter/Snowmobile
# 'piste:grooming=skating'
skating: Skating
piste_nordic/type:
piste/type:
# 'piste:type=*'
label: Type
options:
# 'piste:type=connection'
connection: Connection
# 'piste:type=downhill'
downhill: Downhill
# 'piste:type=hike'
hike: Hike
# 'piste:type=ice_skate'
ice_skate: Ice Skate
# 'piste:type=nordic'
nordic: Nordic
# 'piste:type=playground'
playground: Playground
# 'piste:type=skitour'
skitour: Skitour
# 'piste:type=sled'
sled: Sled
# 'piste:type=sleigh'
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:
@@ -1258,92 +1318,6 @@ en:
downhill: Nordic
# 'piste:type=playground'
playground: Playground
piste_skitour/difficulty:
# 'piste:difficulty=*'
label: Difficulty
options:
# 'piste:difficulty=advanced'
advanced: 'Advanced - S: inclination 40-45 degree'
# 'piste:difficulty=easy'
easy: 'Easy - WS: inclination 30-35 degree'
# 'piste:difficulty=expert'
expert: 'Expert - SS: inclination 45–50 degree'
# 'piste:difficulty=extreme'
extreme: 'Extreme - EX: inclination >55 degree'
# 'piste:difficulty=freeride'
freeride: 'Freeride - AS: inclination 50–55 degree'
# 'piste:difficulty=intermediate'
intermediate: 'Intermediate - ZS: inclination 35-40 degree'
# 'piste:difficulty=novice'
novice: 'novice - L: inclination <30 degree'
# piste_skitour/difficulty field placeholder
placeholder: 'Easy, Intermediate, Advanced...'
piste_skitour/grooming:
# 'piste:grooming=*'
label: Grooming
options:
# 'piste:grooming=backcountry'
backcountry: Backcountry
# 'piste:grooming=classic'
classic: Classic
# 'piste:grooming=mogul'
mogul: Mogul
piste_sled/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_sled/difficulty field placeholder
placeholder: 'Easy, Intermediate, Advanced...'
piste_sled/grooming:
# 'piste:grooming=*'
label: Grooming
options:
# 'piste:grooming=backcountry'
backcountry: Backcountry - no grooming
# 'piste:grooming=classic'
classic: Classic - prepared
piste_sleigh/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_sleigh/difficulty field placeholder
placeholder: 'Easy, Intermediate, Advanced...'
piste_sleigh/grooming:
# 'piste:grooming=*'
label: Grooming
options:
# 'piste:grooming=backcountry'
backcountry: Backcountry - no grooming
# 'piste:grooming=classic'
classic: Classic - prepared
place:
# place=*
label: Type
@@ -5023,41 +4997,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/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/piste_hike:
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/piste_ice_skate:
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/piste_nordic:
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_skitour:
piste/piste:
# 'piste:type=*'
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/piste_sled:
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/piste_sleigh:
piste/sleigh:
# 'piste:type=sleigh'
name: Animal-pulled Sleigh Piste
name: Sleigh Piste
# 'terms: ski,piste,sled,luge,sleigh,sledge,ski-joring,husky,horse'
terms: '<translate with synonyms or related terms for ''Animal-pulled Sleigh Piste'', separated by commas>'
terms: '<translate with synonyms or related terms for ''Sleigh Piste'', separated by commas>'
place:
# place=*
name: Place
data/presets/fields.json
+11 -14
View File
@@ -201,20 +201,17 @@
"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_downhill/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_downhill/grooming": {"key": "piste:grooming", "type": "combo", "label": "Grooming", "strings": {"options": {"classic": "Classic", "mogul": "Mogul", "backcountry": "Backcountry - no grooming"}}},
"piste_downhill/type": {"key": "piste:type", "type": "typeCombo", "label": "Type", "strings": {"options": {"downhill": "Downhill", "snow_park": "Snow Park", "playground": "Playground", "connection": "Connection between pistes"}}},
"piste_hike/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_hike/grooming": {"key": "piste:grooming", "type": "combo", "label": "Grooming", "strings": {"options": {"classic": "Classic - Winter Hiking", "backcountry": "Backcountry - Snowshoeing"}}},
"piste_nordic/difficulty": {"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_nordic/grooming": {"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_nordic/type": {"key": "piste:type", "type": "typeCombo", "label": "Type", "strings": {"options": {"downhill": "Nordic", "playground": "Playground", "connection": "Connection between pistes"}}},
"piste_skitour/difficulty": {"key": "piste:difficulty", "type": "combo", "label": "Difficulty", "placeholder": "Easy, Intermediate, Advanced...", "strings": {"options": {"novice": "novice - L: inclination <30 degree", "easy": "Easy - WS: inclination 30-35 degree", "intermediate": "Intermediate - ZS: inclination 35-40 degree", "advanced": "Advanced - S: inclination 40-45 degree", "expert": "Expert - SS: inclination 45–50 degree", "freeride": "Freeride - AS: inclination 50–55 degree", "extreme": "Extreme - EX: inclination >55 degree"}}},
"piste_skitour/grooming": {"key": "piste:grooming", "type": "combo", "label": "Grooming", "strings": {"options": {"classic": "Classic", "mogul": "Mogul", "backcountry": "Backcountry"}}},
"piste_sled/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_sled/grooming": {"key": "piste:grooming", "type": "combo", "label": "Grooming", "strings": {"options": {"classic": "Classic - prepared", "backcountry": "Backcountry - no grooming"}}},
"piste_sleigh/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_sleigh/grooming": {"key": "piste:grooming", "type": "combo", "label": "Grooming", "strings": {"options": {"classic": "Classic - prepared", "backcountry": "Backcountry - no grooming"}}},
"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"},
"plant/output/electricity": {"key": "plant:output:electricity", "type": "text", "label": "Power Output", "placeholder": "500 MW, 1000 MW, 2000 MW..."},
data/presets/fields/piste_hike/difficulty.json → data/presets/fields/piste/difficulty.json
View File
data/presets/fields/piste_downhill/difficulty.json → data/presets/fields/piste/difficulty_downhill.json
View File
data/presets/fields/piste_nordic/difficulty.json → data/presets/fields/piste/difficulty_nordic.json
View File
data/presets/fields/piste/difficulty_skitour.json
+17
View File
@@ -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"
}
}
}
data/presets/fields/piste_skitour/grooming.json → data/presets/fields/piste/grooming.json
+4 -1
View File
@@ -6,7 +6,10 @@
"options": {
"classic": "Classic",
"mogul": "Mogul",
"backcountry": "Backcountry"
"backcountry": "Backcountry",
"classic+skating": "Classic and Skating",
"scooter": "Scooter/Snowmobile",
"skating": "Skating"
}
}
}
data/presets/fields/piste_downhill/grooming.json → data/presets/fields/piste/grooming_downhill.json
View File
data/presets/fields/piste_hike/grooming.json → data/presets/fields/piste/grooming_hike.json
View File
data/presets/fields/piste_nordic/grooming.json → data/presets/fields/piste/grooming_nordic.json
View File
data/presets/fields/piste/type.json
+19
View File
@@ -0,0 +1,19 @@
{
"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"
}
}
}
data/presets/fields/piste_downhill/type.json → data/presets/fields/piste/type_downhill.json
View File
data/presets/fields/piste_nordic/type.json → data/presets/fields/piste/type_nordic.json
View File
data/presets/fields/piste_skitour/difficulty.json
-17
View File
@@ -1,17 +0,0 @@
{
"key": "piste:difficulty",
"type": "combo",
"label": "Difficulty",
"placeholder": "Easy, Intermediate, Advanced...",
"strings": {
"options": {
"novice": "novice - L: inclination <30 degree",
"easy": "Easy - WS: inclination 30-35 degree",
"intermediate": "Intermediate - ZS: inclination 35-40 degree",
"advanced": "Advanced - S: inclination 40-45 degree",
"expert": "Expert - SS: inclination 45–50 degree",
"freeride": "Freeride - AS: inclination 50–55 degree",
"extreme": "Extreme - EX: inclination >55 degree"
}
}
}
data/presets/fields/piste_sled/difficulty.json
-17
View File
@@ -1,17 +0,0 @@
{
"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"
}
}
}
data/presets/fields/piste_sled/grooming.json
-11
View File
@@ -1,11 +0,0 @@
{
"key": "piste:grooming",
"type": "combo",
"label": "Grooming",
"strings": {
"options": {
"classic": "Classic - prepared",
"backcountry": "Backcountry - no grooming"
}
}
}
data/presets/fields/piste_sleigh/difficulty.json
-17
View File
@@ -1,17 +0,0 @@
{
"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"
}
}
}
data/presets/fields/piste_sleigh/grooming.json
-11
View File
@@ -1,11 +0,0 @@
{
"key": "piste:grooming",
"type": "combo",
"label": "Grooming",
"strings": {
"options": {
"classic": "Classic - prepared",
"backcountry": "Backcountry - no grooming"
}
}
}
data/presets/presets.json
+8 -7
View File
@@ -659,13 +659,14 @@
"office/telecommunication": {"icon": "maki-telephone", "fields": ["name", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "tags": {"office": "telecommunication"}, "terms": ["communication", "internet", "phone", "voice"], "name": "Telecom Office"},
"office/therapist": {"icon": "maki-suitcase", "fields": ["name", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "tags": {"office": "therapist"}, "terms": ["therapy"], "name": "Therapist Office"},
"office/water_utility": {"icon": "maki-suitcase", "fields": ["name", "address", "building_area", "opening_hours", "operator"], "geometry": ["point", "area"], "tags": {"office": "water_utility"}, "terms": ["water board", "utility"], "name": "Water Utility Office"},
"piste/piste_downhill": {"icon": "maki-skiing", "fields": ["name", "piste_downhill/type", "piste_downhill/difficulty", "piste_downhill/grooming", "oneway", "lit"], "geometry": ["point", "line", "area"], "terms": ["ski", "alpine", "snowboard", "downhill", "piste"], "tags": {"piste:type": "downhill"}, "name": "Downhill Piste/Ski Run"},
"piste/piste_hike": {"icon": "fas-snowflake", "fields": ["name", "piste_hike/difficulty", "piste_hike/grooming", "oneway", "lit"], "geometry": ["point", "line", "area"], "terms": ["hike", "winter hiking", "snowshoe", "snowshoeing", "piste", "ski"], "tags": {"piste:type": "hike"}, "name": "Snowshoeing or Winter Hiking Trail"},
"piste/piste_ice_skate": {"icon": "fas-snowflake", "fields": ["name", "sport_ice", "oneway", "lit"], "geometry": ["point", "line", "area"], "terms": ["ice", "skating", "ski", "piste"], "tags": {"piste:type": "ice_skate"}, "name": "Ice Skating Piste"},
"piste/piste_nordic": {"icon": "maki-skiing", "fields": ["name", "piste_nordic/type", "piste_nordic/difficulty", "piste_nordic/grooming", "oneway", "lit"], "geometry": ["point", "line", "area"], "terms": ["ski", "nordic", "crosscountry", "skating", "piste"], "tags": {"piste:type": "nordic"}, "name": "Nordic or Crosscountry Piste/Ski Trail"},
"piste/piste_skitour": {"icon": "maki-skiing", "fields": ["name", "piste_skitour/difficulty", "piste_skitour/grooming", "oneway", "lit"], "geometry": ["point", "line", "area"], "terms": ["ski", "skitour", "crosscountry", "ski touring", "piste"], "tags": {"piste:type": "skitour"}, "name": "Ski Touring Trail"},
"piste/piste_sled": {"icon": "fas-snowflake", "fields": ["name", "piste_sled/difficulty", "piste_sled/grooming", "oneway", "lit"], "geometry": ["point", "line", "area"], "terms": ["ski", "sled", "luge", "sleigh", "sledge", "piste"], "tags": {"piste:type": "sled"}, "name": "Sled Piste"},
"piste/piste_sleigh": {"icon": "fas-snowflake", "fields": ["name", "piste_sled/difficulty", "piste_sled/grooming", "oneway", "lit"], "geometry": ["point", "line", "area"], "terms": ["ski", "piste", "sled", "luge", "sleigh", "sledge", "ski-joring", "husky", "horse"], "tags": {"piste:type": "sleigh"}, "name": "Animal-pulled Sleigh Piste"},
"piste/downhill": {"icon": "maki-skiing", "fields": ["name", "piste/type_downhill", "piste/difficulty_downhill", "piste/grooming_downhill", "oneway", "lit"], "geometry": ["line", "area"], "terms": ["ski", "alpine", "snowboard", "downhill", "piste"], "tags": {"piste:type": "downhill"}, "name": "Downhill Piste/Ski Run"},
"piste/hike": {"icon": "fas-snowflake", "fields": ["name", "piste/difficulty", "piste/grooming_hike", "oneway", "lit"], "geometry": ["line", "area"], "terms": ["hike", "winter hiking", "snowshoe", "snowshoeing", "piste", "ski"], "tags": {"piste:type": "hike"}, "name": "Snowshoeing or Winter Hiking Trail"},
"piste/ice_skate": {"icon": "fas-snowflake", "fields": ["name", "sport_ice", "oneway", "lit"], "geometry": ["line", "area"], "terms": ["ice", "skating", "ski", "piste"], "tags": {"piste:type": "ice_skate"}, "name": "Ice Skating Piste"},
"piste/nordic": {"icon": "maki-skiing", "fields": ["name", "piste/type_nordic", "piste/difficulty_nordic", "piste/grooming_nordic", "oneway", "lit"], "geometry": ["line", "area"], "terms": ["ski", "nordic", "crosscountry", "skating", "piste"], "tags": {"piste:type": "nordic"}, "name": "Nordic or Crosscountry Piste/Ski Trail"},
"piste/piste": {"icon": "maki-skiing", "fields": ["name", "piste/type", "piste/difficulty", "piste/grooming", "oneway", "lit"], "geometry": ["line", "area"], "terms": ["ski", "nordic", "crosscountry", "downhill", "alpine", "snowboard", "skitour", "ski touring", "sled", "luge", "sleigh", "sledge", "ski-joring", "husky", "horse", "winter hiking", "snowshoe", "snowshoeing", "ice", "skating"], "tags": {"piste:type": "*"}, "name": "Winter Sport Trails"},
"piste/skitour": {"icon": "maki-skiing", "fields": ["name", "piste/difficulty_skitour", "piste/grooming", "oneway", "lit"], "geometry": ["line", "area"], "terms": ["ski", "skitour", "crosscountry", "ski touring", "piste"], "tags": {"piste:type": "skitour"}, "name": "Ski Touring Trail"},
"piste/sled": {"icon": "fas-snowflake", "fields": ["name", "piste/difficulty", "piste/grooming", "oneway", "lit"], "geometry": ["line", "area"], "terms": ["ski", "sled", "luge", "sleigh", "sledge", "piste"], "tags": {"piste:type": "sled"}, "name": "Sled Piste"},
"piste/sleigh": {"icon": "fas-snowflake", "fields": ["name", "piste/difficulty", "piste/grooming", "oneway", "lit"], "geometry": ["line", "area"], "terms": ["ski", "piste", "sled", "luge", "sleigh", "sledge", "ski-joring", "husky", "horse"], "tags": {"piste:type": "sleigh"}, "name": "Sleigh Piste"},
"place/farm": {"icon": "maki-farm", "geometry": ["point", "area"], "fields": ["name"], "tags": {"place": "farm"}, "name": "Farm", "searchable": false},
"place/city": {"icon": "maki-city", "fields": ["name", "population"], "geometry": ["point", "area"], "tags": {"place": "city"}, "name": "City"},
"place/hamlet": {"icon": "maki-triangle-stroked", "fields": ["name", "population"], "geometry": ["point", "area"], "tags": {"place": "hamlet"}, "name": "Hamlet"},
data/presets/presets/piste/piste_downhill.json → data/presets/presets/piste/downhill.json
+3 -4
View File
@@ -2,14 +2,13 @@
"icon": "maki-skiing",
"fields": [
"name",
"piste_downhill/type",
"piste_downhill/difficulty",
"piste_downhill/grooming",
"piste/type_downhill",
"piste/difficulty_downhill",
"piste/grooming_downhill",
"oneway",
"lit"
],
"geometry": [
"point",
"line",
"area"
],
data/presets/presets/piste/piste_hike.json → data/presets/presets/piste/hike.json
+2 -3
View File
@@ -2,13 +2,12 @@
"icon": "fas-snowflake",
"fields": [
"name",
"piste_hike/difficulty",
"piste_hike/grooming",
"piste/difficulty",
"piste/grooming_hike",
"oneway",
"lit"
],
"geometry": [
"point",
"line",
"area"
],
data/presets/presets/piste/piste_ice_skate.json → data/presets/presets/piste/ice_skate.json
-1
View File
@@ -7,7 +7,6 @@
"lit"
],
"geometry": [
"point",
"line",
"area"
],
data/presets/presets/piste/piste_nordic.json → data/presets/presets/piste/nordic.json
+3 -4
View File
@@ -2,14 +2,13 @@
"icon": "maki-skiing",
"fields": [
"name",
"piste_nordic/type",
"piste_nordic/difficulty",
"piste_nordic/grooming",
"piste/type_nordic",
"piste/difficulty_nordic",
"piste/grooming_nordic",
"oneway",
"lit"
],
"geometry": [
"point",
"line",
"area"
],
data/presets/presets/piste/piste.json
+41
View File
@@ -0,0 +1,41 @@
{
"icon": "maki-skiing",
"fields": [
"name",
"piste/type",
"piste/difficulty",
"piste/grooming",
"oneway",
"lit"
],
"geometry": [
"line",
"area"
],
"terms": [
"ski",
"nordic",
"crosscountry",
"downhill",
"alpine",
"snowboard",
"skitour",
"ski touring",
"sled",
"luge",
"sleigh",
"sledge",
"ski-joring",
"husky",
"horse",
"winter hiking",
"snowshoe",
"snowshoeing",
"ice",
"skating"
],
"tags": {
"piste:type": "*"
},
"name": "Winter Sport Trails"
}
data/presets/presets/piste/piste_skitour.json → data/presets/presets/piste/skitour.json
+2 -3
View File
@@ -2,13 +2,12 @@
"icon": "maki-skiing",
"fields": [
"name",
"piste_skitour/difficulty",
"piste_skitour/grooming",
"piste/difficulty_skitour",
"piste/grooming",
"oneway",
"lit"
],
"geometry": [
"point",
"line",
"area"
],
data/presets/presets/piste/piste_sled.json → data/presets/presets/piste/sled.json
+2 -3
View File
@@ -2,13 +2,12 @@
"icon": "fas-snowflake",
"fields": [
"name",
"piste_sled/difficulty",
"piste_sled/grooming",
"piste/difficulty",
"piste/grooming",
"oneway",
"lit"
],
"geometry": [
"point",
"line",
"area"
],
data/presets/presets/piste/piste_sleigh.json → data/presets/presets/piste/sleigh.json
+3 -4
View File
@@ -2,13 +2,12 @@
"icon": "fas-snowflake",
"fields": [
"name",
"piste_sled/difficulty",
"piste_sled/grooming",
"piste/difficulty",
"piste/grooming",
"oneway",
"lit"
],
"geometry": [
"point",
"line",
"area"
],
@@ -26,5 +25,5 @@
"tags": {
"piste:type": "sleigh"
},
"name": "Animal-pulled Sleigh Piste"
"name": "Sleigh Piste"
}
data/taginfo.json
+22 -16
View File
@@ -4416,49 +4416,55 @@
"key": "piste:type",
"value": "downhill",
"description": "Downhill Piste/Ski Run, Type",
"object_types": ["node", "way", "area"],
"object_types": ["way", "area"],
"icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/skiing-15.svg?sanitize=true"
},
{
"key": "piste:type",
"value": "hike",
"description": "Snowshoeing or Winter Hiking Trail",
"object_types": ["node", "way", "area"],
"description": "Snowshoeing or Winter Hiking Trail, Type",
"object_types": ["way", "area"],
"icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-snowflake.svg?sanitize=true"
},
{
"key": "piste:type",
"value": "ice_skate",
"description": "Ice Skating Piste",
"object_types": ["node", "way", "area"],
"description": "Ice Skating Piste, Type",
"object_types": ["way", "area"],
"icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-snowflake.svg?sanitize=true"
},
{
"key": "piste:type",
"value": "nordic",
"description": "Nordic or Crosscountry Piste/Ski Trail",
"object_types": ["node", "way", "area"],
"description": "Nordic or Crosscountry Piste/Ski Trail, Type",
"object_types": ["way", "area"],
"icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/skiing-15.svg?sanitize=true"
},
{
"key": "piste:type",
"description": "Winter Sport Trails",
"object_types": ["way", "area"],
"icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/skiing-15.svg?sanitize=true"
},
{
"key": "piste:type",
"value": "skitour",
"description": "Ski Touring Trail",
"object_types": ["node", "way", "area"],
"description": "Ski Touring Trail, Type",
"object_types": ["way", "area"],
"icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/skiing-15.svg?sanitize=true"
},
{
"key": "piste:type",
"value": "sled",
"description": "Sled Piste",
"object_types": ["node", "way", "area"],
"description": "Sled Piste, Type",
"object_types": ["way", "area"],
"icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-snowflake.svg?sanitize=true"
},
{
"key": "piste:type",
"value": "sleigh",
"description": "Animal-pulled Sleigh Piste",
"object_types": ["node", "way", "area"],
"description": "Sleigh Piste, Type",
"object_types": ["way", "area"],
"icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-snowflake.svg?sanitize=true"
},
{
@@ -7128,9 +7134,6 @@
"value": "backcountry",
"description": "Grooming"
},
{"key": "piste:type", "value": "snow_park", "description": "Type"},
{"key": "piste:type", "value": "playground", "description": "Type"},
{"key": "piste:type", "value": "connection", "description": "Type"},
{
"key": "piste:grooming",
"value": "classic+skating",
@@ -7138,6 +7141,9 @@
},
{"key": "piste:grooming", "value": "scooter", "description": "Grooming"},
{"key": "piste:grooming", "value": "skating", "description": "Grooming"},
{"key": "piste:type", "value": "snow_park", "description": "Type"},
{"key": "piste:type", "value": "playground", "description": "Type"},
{"key": "piste:type", "value": "connection", "description": "Type"},
{"key": "plant", "description": "Plant"},
{"key": "plant:output:electricity", "description": "Power Output"},
{"key": "baby", "description": "Baby Seat"},
dist/locales/en.json
Vendored
+89 -107
View File
@@ -2427,7 +2427,7 @@
"label": "Telephone",
"placeholder": "+31 42 123 4567"
},
"piste_downhill/difficulty": {
"piste/difficulty_downhill": {
"label": "Difficulty",
"placeholder": "Easy, Intermediate, Advanced...",
"options": {
@@ -2440,44 +2440,7 @@
"extreme": "Extreme (climbing equipment required)"
}
},
"piste_downhill/grooming": {
"label": "Grooming",
"options": {
"classic": "Classic",
"mogul": "Mogul",
"backcountry": "Backcountry - no grooming"
}
},
"piste_downhill/type": {
"label": "Type",
"options": {
"downhill": "Downhill",
"snow_park": "Snow Park",
"playground": "Playground",
"connection": "Connection between pistes"
}
},
"piste_hike/difficulty": {
"label": "Difficulty",
"placeholder": "Easy, Intermediate, Advanced...",
"options": {
"novice": "Novice",
"easy": "Easy",
"intermediate": "Intermediate",
"advanced": "Advanced",
"expert": "Expert",
"freeride": "Freeride",
"extreme": "Extreme"
}
},
"piste_hike/grooming": {
"label": "Grooming",
"options": {
"classic": "Classic - Winter Hiking",
"backcountry": "Backcountry - Snowshoeing"
}
},
"piste_nordic/difficulty": {
"piste/difficulty_nordic": {
"label": "Difficulty",
"placeholder": "Easy, Intermediate, Advanced...",
"options": {
@@ -2488,7 +2451,48 @@
"expert": "Expert - Dangerous terrain around"
}
},
"piste_nordic/grooming": {
"piste/difficulty_skitour": {
"label": "Difficulty",
"placeholder": "Easy, Intermediate, Advanced...",
"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": {
"label": "Difficulty",
"placeholder": "Easy, Intermediate, Advanced...",
"options": {
"novice": "Novice",
"easy": "Easy",
"intermediate": "Intermediate",
"advanced": "Advanced",
"expert": "Expert",
"freeride": "Freeride",
"extreme": "Extreme"
}
},
"piste/grooming_downhill": {
"label": "Grooming",
"options": {
"classic": "Classic",
"mogul": "Mogul",
"backcountry": "Backcountry - no grooming"
}
},
"piste/grooming_hike": {
"label": "Grooming",
"options": {
"classic": "Classic - Winter Hiking",
"backcountry": "Backcountry - Snowshoeing"
}
},
"piste/grooming_nordic": {
"label": "Grooming",
"options": {
"classic": "Classic",
@@ -2498,7 +2502,27 @@
"skating": "Skating"
}
},
"piste_nordic/type": {
"piste/grooming": {
"label": "Grooming",
"options": {
"classic": "Classic",
"mogul": "Mogul",
"backcountry": "Backcountry",
"classic+skating": "Classic and Skating",
"scooter": "Scooter/Snowmobile",
"skating": "Skating"
}
},
"piste/type_downhill": {
"label": "Type",
"options": {
"downhill": "Downhill",
"snow_park": "Snow Park",
"playground": "Playground",
"connection": "Connection between pistes"
}
},
"piste/type_nordic": {
"label": "Type",
"options": {
"downhill": "Nordic",
@@ -2506,65 +2530,19 @@
"connection": "Connection between pistes"
}
},
"piste_skitour/difficulty": {
"label": "Difficulty",
"placeholder": "Easy, Intermediate, Advanced...",
"piste/type": {
"label": "Type",
"options": {
"novice": "novice - L: inclination <30 degree",
"easy": "Easy - WS: inclination 30-35 degree",
"intermediate": "Intermediate - ZS: inclination 35-40 degree",
"advanced": "Advanced - S: inclination 40-45 degree",
"expert": "Expert - SS: inclination 45–50 degree",
"freeride": "Freeride - AS: inclination 50–55 degree",
"extreme": "Extreme - EX: inclination >55 degree"
}
},
"piste_skitour/grooming": {
"label": "Grooming",
"options": {
"classic": "Classic",
"mogul": "Mogul",
"backcountry": "Backcountry"
}
},
"piste_sled/difficulty": {
"label": "Difficulty",
"placeholder": "Easy, Intermediate, Advanced...",
"options": {
"novice": "Novice",
"easy": "Easy",
"intermediate": "Intermediate",
"advanced": "Advanced",
"expert": "Expert",
"freeride": "Freeride",
"extreme": "Extreme"
}
},
"piste_sled/grooming": {
"label": "Grooming",
"options": {
"classic": "Classic - prepared",
"backcountry": "Backcountry - no grooming"
}
},
"piste_sleigh/difficulty": {
"label": "Difficulty",
"placeholder": "Easy, Intermediate, Advanced...",
"options": {
"novice": "Novice",
"easy": "Easy",
"intermediate": "Intermediate",
"advanced": "Advanced",
"expert": "Expert",
"freeride": "Freeride",
"extreme": "Extreme"
}
},
"piste_sleigh/grooming": {
"label": "Grooming",
"options": {
"classic": "Classic - prepared",
"backcountry": "Backcountry - no grooming"
"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": {
@@ -5815,32 +5793,36 @@
"name": "Water Utility Office",
"terms": "water board,utility"
},
"piste/piste_downhill": {
"piste/downhill": {
"name": "Downhill Piste/Ski Run",
"terms": "ski,alpine,snowboard,downhill,piste"
},
"piste/piste_hike": {
"piste/hike": {
"name": "Snowshoeing or Winter Hiking Trail",
"terms": "hike,winter hiking,snowshoe,snowshoeing,piste,ski"
},
"piste/piste_ice_skate": {
"piste/ice_skate": {
"name": "Ice Skating Piste",
"terms": "ice,skating,ski,piste"
},
"piste/piste_nordic": {
"piste/nordic": {
"name": "Nordic or Crosscountry Piste/Ski Trail",
"terms": "ski,nordic,crosscountry,skating,piste"
},
"piste/piste_skitour": {
"piste/piste": {
"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"
},
"piste/skitour": {
"name": "Ski Touring Trail",
"terms": "ski,skitour,crosscountry,ski touring,piste"
},
"piste/piste_sled": {
"piste/sled": {
"name": "Sled Piste",
"terms": "ski,sled,luge,sleigh,sledge,piste"
},
"piste/piste_sleigh": {
"name": "Animal-pulled Sleigh Piste",
"piste/sleigh": {
"name": "Sleigh Piste",
"terms": "ski,piste,sled,luge,sleigh,sledge,ski-joring,husky,horse"
},
"place/farm": {