From f3e23b71963f990b1c949bd50bf64967eacb17eb Mon Sep 17 00:00:00 2001 From: yves Date: Thu, 4 Oct 2018 14:53:41 +0200 Subject: [PATCH 1/4] Split piste presset into each piste:values to make sense of the difficulty and grooming keys. --- .../{piste => piste_downhill}/difficulty.json | 0 .../fields/piste_downhill/grooming.json | 12 ++++++++ .../{piste => piste_downhill}/type.json | 8 +---- .../presets/fields/piste_hike/difficulty.json | 17 +++++++++++ data/presets/fields/piste_hike/grooming.json | 11 +++++++ .../fields/piste_nordic/difficulty.json | 15 ++++++++++ .../{piste => piste_nordic}/grooming.json | 3 +- data/presets/fields/piste_nordic/type.json | 12 ++++++++ .../fields/piste_skitour/difficulty.json | 17 +++++++++++ .../fields/piste_skitour/grooming.json | 12 ++++++++ .../presets/fields/piste_sled/difficulty.json | 17 +++++++++++ data/presets/fields/piste_sled/grooming.json | 11 +++++++ .../fields/piste_sleigh/difficulty.json | 17 +++++++++++ .../presets/fields/piste_sleigh/grooming.json | 11 +++++++ .../{piste.json => piste/piste_downhill.json} | 16 +++++----- data/presets/presets/piste/piste_hike.json | 27 +++++++++++++++++ .../presets/piste/piste_ice_skate.json | 24 +++++++++++++++ data/presets/presets/piste/piste_nordic.json | 27 +++++++++++++++++ data/presets/presets/piste/piste_skitour.json | 26 ++++++++++++++++ data/presets/presets/piste/piste_sled.json | 27 +++++++++++++++++ data/presets/presets/piste/piste_sleigh.json | 30 +++++++++++++++++++ 21 files changed, 322 insertions(+), 18 deletions(-) rename data/presets/fields/{piste => piste_downhill}/difficulty.json (100%) create mode 100644 data/presets/fields/piste_downhill/grooming.json rename data/presets/fields/{piste => piste_downhill}/type.json (51%) create mode 100644 data/presets/fields/piste_hike/difficulty.json create mode 100644 data/presets/fields/piste_hike/grooming.json create mode 100644 data/presets/fields/piste_nordic/difficulty.json rename data/presets/fields/{piste => piste_nordic}/grooming.json (80%) create mode 100644 data/presets/fields/piste_nordic/type.json create mode 100644 data/presets/fields/piste_skitour/difficulty.json create mode 100644 data/presets/fields/piste_skitour/grooming.json create mode 100644 data/presets/fields/piste_sled/difficulty.json create mode 100644 data/presets/fields/piste_sled/grooming.json create mode 100644 data/presets/fields/piste_sleigh/difficulty.json create mode 100644 data/presets/fields/piste_sleigh/grooming.json rename data/presets/presets/{piste.json => piste/piste_downhill.json} (56%) create mode 100644 data/presets/presets/piste/piste_hike.json create mode 100644 data/presets/presets/piste/piste_ice_skate.json create mode 100644 data/presets/presets/piste/piste_nordic.json create mode 100644 data/presets/presets/piste/piste_skitour.json create mode 100644 data/presets/presets/piste/piste_sled.json create mode 100644 data/presets/presets/piste/piste_sleigh.json diff --git a/data/presets/fields/piste/difficulty.json b/data/presets/fields/piste_downhill/difficulty.json similarity index 100% rename from data/presets/fields/piste/difficulty.json rename to data/presets/fields/piste_downhill/difficulty.json diff --git a/data/presets/fields/piste_downhill/grooming.json b/data/presets/fields/piste_downhill/grooming.json new file mode 100644 index 0000000000..ad415eb25a --- /dev/null +++ b/data/presets/fields/piste_downhill/grooming.json @@ -0,0 +1,12 @@ +{ + "key": "piste:grooming", + "type": "combo", + "label": "Grooming", + "strings": { + "options": { + "classic": "Classic", + "mogul": "Mogul", + "backcountry": "Backcountry - no grooming" + } + } +} diff --git a/data/presets/fields/piste/type.json b/data/presets/fields/piste_downhill/type.json similarity index 51% rename from data/presets/fields/piste/type.json rename to data/presets/fields/piste_downhill/type.json index ac3bee99a5..597f838e22 100644 --- a/data/presets/fields/piste/type.json +++ b/data/presets/fields/piste_downhill/type.json @@ -5,15 +5,9 @@ "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" + "connection": "Connection between pistes" } } } diff --git a/data/presets/fields/piste_hike/difficulty.json b/data/presets/fields/piste_hike/difficulty.json new file mode 100644 index 0000000000..a06a3d18b3 --- /dev/null +++ b/data/presets/fields/piste_hike/difficulty.json @@ -0,0 +1,17 @@ +{ + "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" + } + } +} diff --git a/data/presets/fields/piste_hike/grooming.json b/data/presets/fields/piste_hike/grooming.json new file mode 100644 index 0000000000..733b9da413 --- /dev/null +++ b/data/presets/fields/piste_hike/grooming.json @@ -0,0 +1,11 @@ +{ + "key": "piste:grooming", + "type": "combo", + "label": "Grooming", + "strings": { + "options": { + "classic": "Classic - Winter Hiking", + "backcountry": "Backcountry - Snowshoeing" + } + } +} diff --git a/data/presets/fields/piste_nordic/difficulty.json b/data/presets/fields/piste_nordic/difficulty.json new file mode 100644 index 0000000000..52d1736677 --- /dev/null +++ b/data/presets/fields/piste_nordic/difficulty.json @@ -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" + } + } +} diff --git a/data/presets/fields/piste/grooming.json b/data/presets/fields/piste_nordic/grooming.json similarity index 80% rename from data/presets/fields/piste/grooming.json rename to data/presets/fields/piste_nordic/grooming.json index a96c9f5632..71b07d9710 100644 --- a/data/presets/fields/piste/grooming.json +++ b/data/presets/fields/piste_nordic/grooming.json @@ -5,8 +5,7 @@ "strings": { "options": { "classic": "Classic", - "mogul": "Mogul", - "backcountry": "Backcountry", + "backcountry": "Backcountry, no grooming", "classic+skating": "Classic and Skating", "scooter": "Scooter/Snowmobile", "skating": "Skating" diff --git a/data/presets/fields/piste_nordic/type.json b/data/presets/fields/piste_nordic/type.json new file mode 100644 index 0000000000..2065421f4b --- /dev/null +++ b/data/presets/fields/piste_nordic/type.json @@ -0,0 +1,12 @@ +{ + "key": "piste:type", + "type": "typeCombo", + "label": "Type", + "strings": { + "options": { + "downhill": "Nordic", + "playground": "Playground", + "connection": "Connection between pistes" + } + } +} diff --git a/data/presets/fields/piste_skitour/difficulty.json b/data/presets/fields/piste_skitour/difficulty.json new file mode 100644 index 0000000000..c0227f1bd5 --- /dev/null +++ b/data/presets/fields/piste_skitour/difficulty.json @@ -0,0 +1,17 @@ +{ + "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" + } + } +} diff --git a/data/presets/fields/piste_skitour/grooming.json b/data/presets/fields/piste_skitour/grooming.json new file mode 100644 index 0000000000..3c39f9c9a1 --- /dev/null +++ b/data/presets/fields/piste_skitour/grooming.json @@ -0,0 +1,12 @@ +{ + "key": "piste:grooming", + "type": "combo", + "label": "Grooming", + "strings": { + "options": { + "classic": "Classic", + "mogul": "Mogul", + "backcountry": "Backcountry" + } + } +} diff --git a/data/presets/fields/piste_sled/difficulty.json b/data/presets/fields/piste_sled/difficulty.json new file mode 100644 index 0000000000..a06a3d18b3 --- /dev/null +++ b/data/presets/fields/piste_sled/difficulty.json @@ -0,0 +1,17 @@ +{ + "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" + } + } +} diff --git a/data/presets/fields/piste_sled/grooming.json b/data/presets/fields/piste_sled/grooming.json new file mode 100644 index 0000000000..b250887b43 --- /dev/null +++ b/data/presets/fields/piste_sled/grooming.json @@ -0,0 +1,11 @@ +{ + "key": "piste:grooming", + "type": "combo", + "label": "Grooming", + "strings": { + "options": { + "classic": "Classic - prepared", + "backcountry": "Backcountry - no grooming" + } + } +} diff --git a/data/presets/fields/piste_sleigh/difficulty.json b/data/presets/fields/piste_sleigh/difficulty.json new file mode 100644 index 0000000000..a06a3d18b3 --- /dev/null +++ b/data/presets/fields/piste_sleigh/difficulty.json @@ -0,0 +1,17 @@ +{ + "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" + } + } +} diff --git a/data/presets/fields/piste_sleigh/grooming.json b/data/presets/fields/piste_sleigh/grooming.json new file mode 100644 index 0000000000..b250887b43 --- /dev/null +++ b/data/presets/fields/piste_sleigh/grooming.json @@ -0,0 +1,11 @@ +{ + "key": "piste:grooming", + "type": "combo", + "label": "Grooming", + "strings": { + "options": { + "classic": "Classic - prepared", + "backcountry": "Backcountry - no grooming" + } + } +} diff --git a/data/presets/presets/piste.json b/data/presets/presets/piste/piste_downhill.json similarity index 56% rename from data/presets/presets/piste.json rename to data/presets/presets/piste/piste_downhill.json index b838e1b0c5..33b639a189 100644 --- a/data/presets/presets/piste.json +++ b/data/presets/presets/piste/piste_downhill.json @@ -2,9 +2,9 @@ "icon": "maki-skiing", "fields": [ "name", - "piste/type", - "piste/difficulty", - "piste/grooming", + "piste_downhill/type", + "piste_downhill/difficulty", + "piste_downhill/grooming", "oneway", "lit" ], @@ -15,15 +15,13 @@ ], "terms": [ "ski", - "sled", - "sleigh", + "alpine", "snowboard", - "nordic", "downhill", - "snowmobile" + "piste" ], "tags": { - "piste:type": "*" + "piste:type": "downhill" }, - "name": "Piste/Ski Trail" + "name": "Downhill Piste/Ski Run" } diff --git a/data/presets/presets/piste/piste_hike.json b/data/presets/presets/piste/piste_hike.json new file mode 100644 index 0000000000..bd1393e95d --- /dev/null +++ b/data/presets/presets/piste/piste_hike.json @@ -0,0 +1,27 @@ +{ + "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" +} diff --git a/data/presets/presets/piste/piste_ice_skate.json b/data/presets/presets/piste/piste_ice_skate.json new file mode 100644 index 0000000000..945c683a2c --- /dev/null +++ b/data/presets/presets/piste/piste_ice_skate.json @@ -0,0 +1,24 @@ +{ + "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" +} diff --git a/data/presets/presets/piste/piste_nordic.json b/data/presets/presets/piste/piste_nordic.json new file mode 100644 index 0000000000..37708f1bf9 --- /dev/null +++ b/data/presets/presets/piste/piste_nordic.json @@ -0,0 +1,27 @@ +{ + "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" +} diff --git a/data/presets/presets/piste/piste_skitour.json b/data/presets/presets/piste/piste_skitour.json new file mode 100644 index 0000000000..2bc9a5841a --- /dev/null +++ b/data/presets/presets/piste/piste_skitour.json @@ -0,0 +1,26 @@ +{ + "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" +} diff --git a/data/presets/presets/piste/piste_sled.json b/data/presets/presets/piste/piste_sled.json new file mode 100644 index 0000000000..c7cefb3332 --- /dev/null +++ b/data/presets/presets/piste/piste_sled.json @@ -0,0 +1,27 @@ +{ + "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" +} diff --git a/data/presets/presets/piste/piste_sleigh.json b/data/presets/presets/piste/piste_sleigh.json new file mode 100644 index 0000000000..364b317605 --- /dev/null +++ b/data/presets/presets/piste/piste_sleigh.json @@ -0,0 +1,30 @@ +{ + "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" +} From 77f534f4979b7a2eda2469b12cf687cea794f80c Mon Sep 17 00:00:00 2001 From: yves Date: Thu, 4 Oct 2018 15:34:01 +0200 Subject: [PATCH 2/4] Build --- data/presets.yaml | 222 +++++++++++++++++++++++++++++++++----- data/presets/fields.json | 17 ++- data/presets/presets.json | 8 +- data/taginfo.json | 58 ++++++++-- dist/locales/en.json | 157 ++++++++++++++++++++++++--- 5 files changed, 403 insertions(+), 59 deletions(-) diff --git a/data/presets.yaml b/data/presets.yaml index c975f79599..3ac8a211a6 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -1148,7 +1148,7 @@ en: label: Telephone # phone field placeholder placeholder: +31 42 123 4567 - piste/difficulty: + piste_downhill/difficulty: # 'piste:difficulty=*' label: Difficulty options: @@ -1166,48 +1166,184 @@ en: intermediate: Intermediate (blue square) # 'piste:difficulty=novice' novice: Novice (instructional) - # piste/difficulty field placeholder + # piste_downhill/difficulty field placeholder placeholder: 'Easy, Intermediate, Advanced...' - piste/grooming: + piste_downhill/grooming: # 'piste:grooming=*' label: Grooming options: # 'piste:grooming=backcountry' - backcountry: Backcountry + backcountry: Backcountry - no grooming # 'piste:grooming=classic' classic: Classic - # 'piste:grooming=classic+skating' - classic+skating: Classic and Skating # '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=*' + 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_nordic/difficulty field placeholder + placeholder: 'Easy, Intermediate, Advanced...' + piste_nordic/grooming: + # '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_nordic/type: # 'piste:type=*' label: Type options: # 'piste:type=connection' - connection: Connection + connection: Connection between pistes # 'piste:type=downhill' - downhill: Downhill - # 'piste:type=hike' - hike: Hike - # 'piste:type=ice_skate' - ice_skate: Ice Skate - # 'piste:type=nordic' - nordic: Nordic + downhill: 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_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 @@ -4887,11 +5023,41 @@ en: name: Water Utility Office # 'terms: water board,utility' terms: '' - piste: - # 'piste:type=*' - name: Piste/Ski Trail - # 'terms: ski,sled,sleigh,snowboard,nordic,downhill,snowmobile' - terms: '' + piste/piste_downhill: + # 'piste:type=downhill' + name: Downhill Piste/Ski Run + # 'terms: ski,alpine,snowboard,downhill,piste' + terms: '' + piste/piste_hike: + # 'piste:type=hike' + name: Snowshoeing or Winter Hiking Trail + # 'terms: hike,winter hiking,snowshoe,snowshoeing,piste,ski' + terms: '' + piste/piste_ice_skate: + # 'piste:type=ice_skate' + name: Ice Skating Piste + # 'terms: ice,skating,ski,piste' + terms: '' + piste/piste_nordic: + # 'piste:type=nordic' + name: Nordic or Crosscountry Piste/Ski Trail + # 'terms: ski,nordic,crosscountry,skating,piste' + terms: '' + piste/piste_skitour: + # 'piste:type=skitour' + name: Ski Touring Trail + # 'terms: ski,skitour,crosscountry,ski touring,piste' + terms: '' + piste/piste_sled: + # 'piste:type=sled' + name: Sled Piste + # 'terms: ski,sled,luge,sleigh,sledge,piste' + terms: '' + piste/piste_sleigh: + # 'piste:type=sleigh' + name: Animal-pulled Sleigh Piste + # 'terms: ski,piste,sled,luge,sleigh,sledge,ski-joring,husky,horse' + terms: '' place: # place=* name: Place diff --git a/data/presets/fields.json b/data/presets/fields.json index b0ec1b069c..d643680078 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -201,9 +201,20 @@ "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/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": {"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"}}}, + "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"}}}, "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..."}, diff --git a/data/presets/presets.json b/data/presets/presets.json index 4d1f7eb421..85be7bedce 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -659,7 +659,13 @@ "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": {"icon": "maki-skiing", "fields": ["name", "piste/type", "piste/difficulty", "piste/grooming", "oneway", "lit"], "geometry": ["point", "line", "area"], "terms": ["ski", "sled", "sleigh", "snowboard", "nordic", "downhill", "snowmobile"], "tags": {"piste:type": "*"}, "name": "Piste/Ski Trail"}, + "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"}, "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"}, diff --git a/data/taginfo.json b/data/taginfo.json index 244690dee3..67041056a3 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -4414,10 +4414,53 @@ }, { "key": "piste:type", - "description": "Piste/Ski Trail", + "value": "downhill", + "description": "Downhill Piste/Ski Run, Type", "object_types": ["node", "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"], + "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"], + "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"], + "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"], + "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"], + "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"], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-snowflake.svg?sanitize=true" + }, { "key": "place", "value": "farm", @@ -7085,6 +7128,9 @@ "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", @@ -7092,16 +7138,6 @@ }, {"key": "piste:grooming", "value": "scooter", "description": "Grooming"}, {"key": "piste:grooming", "value": "skating", "description": "Grooming"}, - {"key": "piste:type", "value": "downhill", "description": "Type"}, - {"key": "piste:type", "value": "nordic", "description": "Type"}, - {"key": "piste:type", "value": "skitour", "description": "Type"}, - {"key": "piste:type", "value": "sled", "description": "Type"}, - {"key": "piste:type", "value": "hike", "description": "Type"}, - {"key": "piste:type", "value": "sleigh", "description": "Type"}, - {"key": "piste:type", "value": "ice_skate", "description": "Type"}, - {"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"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index cac5177813..2c1fd036b8 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -2427,7 +2427,7 @@ "label": "Telephone", "placeholder": "+31 42 123 4567" }, - "piste/difficulty": { + "piste_downhill/difficulty": { "label": "Difficulty", "placeholder": "Easy, Intermediate, Advanced...", "options": { @@ -2440,30 +2440,131 @@ "extreme": "Extreme (climbing equipment required)" } }, - "piste/grooming": { + "piste_downhill/grooming": { "label": "Grooming", "options": { "classic": "Classic", "mogul": "Mogul", - "backcountry": "Backcountry", + "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": { + "label": "Difficulty", + "placeholder": "Easy, Intermediate, Advanced...", + "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": { + "label": "Grooming", + "options": { + "classic": "Classic", + "backcountry": "Backcountry, no grooming", "classic+skating": "Classic and Skating", "scooter": "Scooter/Snowmobile", "skating": "Skating" } }, - "piste/type": { + "piste_nordic/type": { "label": "Type", "options": { - "downhill": "Downhill", - "nordic": "Nordic", - "skitour": "Skitour", - "sled": "Sled", - "hike": "Hike", - "sleigh": "Sleigh", - "ice_skate": "Ice Skate", - "snow_park": "Snow Park", + "downhill": "Nordic", "playground": "Playground", - "connection": "Connection" + "connection": "Connection between pistes" + } + }, + "piste_skitour/difficulty": { + "label": "Difficulty", + "placeholder": "Easy, Intermediate, Advanced...", + "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" } }, "place": { @@ -5714,9 +5815,33 @@ "name": "Water Utility Office", "terms": "water board,utility" }, - "piste": { - "name": "Piste/Ski Trail", - "terms": "ski,sled,sleigh,snowboard,nordic,downhill,snowmobile" + "piste/piste_downhill": { + "name": "Downhill Piste/Ski Run", + "terms": "ski,alpine,snowboard,downhill,piste" + }, + "piste/piste_hike": { + "name": "Snowshoeing or Winter Hiking Trail", + "terms": "hike,winter hiking,snowshoe,snowshoeing,piste,ski" + }, + "piste/piste_ice_skate": { + "name": "Ice Skating Piste", + "terms": "ice,skating,ski,piste" + }, + "piste/piste_nordic": { + "name": "Nordic or Crosscountry Piste/Ski Trail", + "terms": "ski,nordic,crosscountry,skating,piste" + }, + "piste/piste_skitour": { + "name": "Ski Touring Trail", + "terms": "ski,skitour,crosscountry,ski touring,piste" + }, + "piste/piste_sled": { + "name": "Sled Piste", + "terms": "ski,sled,luge,sleigh,sledge,piste" + }, + "piste/piste_sleigh": { + "name": "Animal-pulled Sleigh Piste", + "terms": "ski,piste,sled,luge,sleigh,sledge,ski-joring,husky,horse" }, "place/farm": { "name": "Farm", From 3296176d7a48ecd59d7089e6ae356d2449363485 Mon Sep 17 00:00:00 2001 From: yves Date: Sat, 6 Oct 2018 08:27:10 +0200 Subject: [PATCH 3/4] Change the piste presets directory structure and other fixes --- data/presets.yaml | 253 ++++++++---------- data/presets/fields.json | 25 +- .../{piste_hike => piste}/difficulty.json | 0 .../difficulty_downhill.json} | 0 .../difficulty_nordic.json} | 0 .../fields/piste/difficulty_skitour.json | 17 ++ .../{piste_skitour => piste}/grooming.json | 5 +- .../grooming_downhill.json} | 0 .../grooming_hike.json} | 0 .../grooming_nordic.json} | 0 data/presets/fields/piste/type.json | 19 ++ .../type.json => piste/type_downhill.json} | 0 .../type.json => piste/type_nordic.json} | 0 .../fields/piste_skitour/difficulty.json | 17 -- .../presets/fields/piste_sled/difficulty.json | 17 -- data/presets/fields/piste_sled/grooming.json | 11 - .../fields/piste_sleigh/difficulty.json | 17 -- .../presets/fields/piste_sleigh/grooming.json | 11 - data/presets/presets.json | 15 +- .../{piste_downhill.json => downhill.json} | 7 +- .../piste/{piste_hike.json => hike.json} | 5 +- .../{piste_ice_skate.json => ice_skate.json} | 1 - .../piste/{piste_nordic.json => nordic.json} | 7 +- data/presets/presets/piste/piste.json | 41 +++ .../{piste_skitour.json => skitour.json} | 5 +- .../piste/{piste_sled.json => sled.json} | 5 +- .../piste/{piste_sleigh.json => sleigh.json} | 7 +- data/taginfo.json | 38 +-- dist/locales/en.json | 156 +++++------ 29 files changed, 322 insertions(+), 357 deletions(-) rename data/presets/fields/{piste_hike => piste}/difficulty.json (100%) rename data/presets/fields/{piste_downhill/difficulty.json => piste/difficulty_downhill.json} (100%) rename data/presets/fields/{piste_nordic/difficulty.json => piste/difficulty_nordic.json} (100%) create mode 100644 data/presets/fields/piste/difficulty_skitour.json rename data/presets/fields/{piste_skitour => piste}/grooming.json (53%) rename data/presets/fields/{piste_downhill/grooming.json => piste/grooming_downhill.json} (100%) rename data/presets/fields/{piste_hike/grooming.json => piste/grooming_hike.json} (100%) rename data/presets/fields/{piste_nordic/grooming.json => piste/grooming_nordic.json} (100%) create mode 100644 data/presets/fields/piste/type.json rename data/presets/fields/{piste_downhill/type.json => piste/type_downhill.json} (100%) rename data/presets/fields/{piste_nordic/type.json => piste/type_nordic.json} (100%) delete mode 100644 data/presets/fields/piste_skitour/difficulty.json delete mode 100644 data/presets/fields/piste_sled/difficulty.json delete mode 100644 data/presets/fields/piste_sled/grooming.json delete mode 100644 data/presets/fields/piste_sleigh/difficulty.json delete mode 100644 data/presets/fields/piste_sleigh/grooming.json rename data/presets/presets/piste/{piste_downhill.json => downhill.json} (75%) rename data/presets/presets/piste/{piste_hike.json => hike.json} (83%) rename data/presets/presets/piste/{piste_ice_skate.json => ice_skate.json} (95%) rename data/presets/presets/piste/{piste_nordic.json => nordic.json} (76%) create mode 100644 data/presets/presets/piste/piste.json rename data/presets/presets/piste/{piste_skitour.json => skitour.json} (80%) rename data/presets/presets/piste/{piste_sled.json => sled.json} (81%) rename data/presets/presets/piste/{piste_sleigh.json => sleigh.json} (76%) diff --git a/data/presets.yaml b/data/presets.yaml index 3ac8a211a6..cc8509c00e 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -1148,77 +1148,47 @@ 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 (black diamond) + advanced: Advanced # 'piste:difficulty=easy' - easy: Easy (green circle) + easy: Easy # 'piste:difficulty=expert' - expert: Expert (double black diamond) + expert: Expert # 'piste:difficulty=extreme' - extreme: Extreme (climbing equipment required) + extreme: Extreme # 'piste:difficulty=freeride' - freeride: Freeride (off-piste) + freeride: Freeride # 'piste:difficulty=intermediate' - intermediate: Intermediate (blue square) + intermediate: Intermediate # 'piste:difficulty=novice' - novice: Novice (instructional) - # piste_downhill/difficulty field placeholder + novice: Novice + # piste/difficulty 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_downhill: # 'piste:difficulty=*' label: Difficulty options: # 'piste:difficulty=advanced' - advanced: Advanced + advanced: Advanced (black diamond) # 'piste:difficulty=easy' - easy: Easy + easy: Easy (green circle) # 'piste:difficulty=expert' - expert: Expert + expert: Expert (double black diamond) # 'piste:difficulty=extreme' - extreme: Extreme + extreme: Extreme (climbing equipment required) # 'piste:difficulty=freeride' - freeride: Freeride + freeride: Freeride (off-piste) # 'piste:difficulty=intermediate' - intermediate: Intermediate + intermediate: Intermediate (blue square) # 'piste:difficulty=novice' - novice: Novice - # piste_hike/difficulty field placeholder + novice: Novice (instructional) + # piste/difficulty_downhill 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,53 +1202,29 @@ 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: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_nordic/type: - # 'piste:type=*' - label: Type - options: - # 'piste:type=connection' - connection: Connection between pistes - # 'piste:type=downhill' - downhill: Nordic - # 'piste:type=playground' - playground: Playground - piste_skitour/difficulty: + piste/difficulty_skitour: # 'piste:difficulty=*' label: Difficulty options: # 'piste:difficulty=advanced' - advanced: 'Advanced - S: inclination 40-45 degree' + advanced: 'Advanced - S: 40-45° incline' # 'piste:difficulty=easy' - easy: 'Easy - WS: inclination 30-35 degree' + easy: 'Easy - WS: 30-35° incline' # 'piste:difficulty=expert' - expert: 'Expert - SS: inclination 45–50 degree' + expert: 'Expert - SS: 45–50° incline' # 'piste:difficulty=extreme' - extreme: 'Extreme - EX: inclination >55 degree' + extreme: 'Extreme - EX: >55° incline' # 'piste:difficulty=freeride' - freeride: 'Freeride - AS: inclination 50–55 degree' + freeride: 'Freeride - AS: 50–55° incline' # 'piste:difficulty=intermediate' - intermediate: 'Intermediate - ZS: inclination 35-40 degree' + intermediate: 'Intermediate - ZS: 35-40° incline' # 'piste:difficulty=novice' - novice: 'novice - L: inclination <30 degree' - # piste_skitour/difficulty field placeholder + novice: 'Novice - L: <30° incline' + # piste/difficulty_skitour field placeholder placeholder: 'Easy, Intermediate, Advanced...' - piste_skitour/grooming: + piste/grooming: # 'piste:grooming=*' label: Grooming options: @@ -1286,64 +1232,92 @@ en: backcountry: Backcountry # 'piste:grooming=classic' classic: Classic + # 'piste:grooming=classic+skating' + classic+skating: Classic and Skating # '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=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 - prepared - piste_sleigh/difficulty: - # 'piste:difficulty=*' - label: Difficulty + classic: Classic + # 'piste:grooming=mogul' + mogul: Mogul + piste/grooming_hike: + # 'piste:grooming=*' + label: Grooming 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=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 + backcountry: 'Backcountry, no grooming' # 'piste:grooming=classic' - classic: Classic - prepared + 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 + 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: + # 'piste:type=connection' + connection: Connection between pistes + # 'piste:type=downhill' + downhill: Nordic + # 'piste:type=playground' + playground: Playground place: # place=* label: Type @@ -5023,41 +4997,46 @@ en: name: Water Utility Office # 'terms: water board,utility' terms: '' - piste/piste_downhill: + piste/downhill: # 'piste:type=downhill' name: Downhill Piste/Ski Run # 'terms: ski,alpine,snowboard,downhill,piste' terms: '' - piste/piste_hike: + piste/hike: # 'piste:type=hike' name: Snowshoeing or Winter Hiking Trail # 'terms: hike,winter hiking,snowshoe,snowshoeing,piste,ski' terms: '' - piste/piste_ice_skate: + piste/ice_skate: # 'piste:type=ice_skate' name: Ice Skating Piste # 'terms: ice,skating,ski,piste' terms: '' - piste/piste_nordic: + piste/nordic: # 'piste:type=nordic' name: Nordic or Crosscountry Piste/Ski Trail # 'terms: ski,nordic,crosscountry,skating,piste' terms: '' - 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: '' + piste/skitour: # 'piste:type=skitour' name: Ski Touring Trail # 'terms: ski,skitour,crosscountry,ski touring,piste' terms: '' - piste/piste_sled: + piste/sled: # 'piste:type=sled' name: Sled Piste # 'terms: ski,sled,luge,sleigh,sledge,piste' terms: '' - 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: '' + terms: '' place: # place=* name: Place diff --git a/data/presets/fields.json b/data/presets/fields.json index d643680078..b06b19beb4 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -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..."}, diff --git a/data/presets/fields/piste_hike/difficulty.json b/data/presets/fields/piste/difficulty.json similarity index 100% rename from data/presets/fields/piste_hike/difficulty.json rename to data/presets/fields/piste/difficulty.json diff --git a/data/presets/fields/piste_downhill/difficulty.json b/data/presets/fields/piste/difficulty_downhill.json similarity index 100% rename from data/presets/fields/piste_downhill/difficulty.json rename to data/presets/fields/piste/difficulty_downhill.json diff --git a/data/presets/fields/piste_nordic/difficulty.json b/data/presets/fields/piste/difficulty_nordic.json similarity index 100% rename from data/presets/fields/piste_nordic/difficulty.json rename to data/presets/fields/piste/difficulty_nordic.json diff --git a/data/presets/fields/piste/difficulty_skitour.json b/data/presets/fields/piste/difficulty_skitour.json new file mode 100644 index 0000000000..f4b68e2094 --- /dev/null +++ b/data/presets/fields/piste/difficulty_skitour.json @@ -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" + } + } +} diff --git a/data/presets/fields/piste_skitour/grooming.json b/data/presets/fields/piste/grooming.json similarity index 53% rename from data/presets/fields/piste_skitour/grooming.json rename to data/presets/fields/piste/grooming.json index 3c39f9c9a1..a96c9f5632 100644 --- a/data/presets/fields/piste_skitour/grooming.json +++ b/data/presets/fields/piste/grooming.json @@ -6,7 +6,10 @@ "options": { "classic": "Classic", "mogul": "Mogul", - "backcountry": "Backcountry" + "backcountry": "Backcountry", + "classic+skating": "Classic and Skating", + "scooter": "Scooter/Snowmobile", + "skating": "Skating" } } } diff --git a/data/presets/fields/piste_downhill/grooming.json b/data/presets/fields/piste/grooming_downhill.json similarity index 100% rename from data/presets/fields/piste_downhill/grooming.json rename to data/presets/fields/piste/grooming_downhill.json diff --git a/data/presets/fields/piste_hike/grooming.json b/data/presets/fields/piste/grooming_hike.json similarity index 100% rename from data/presets/fields/piste_hike/grooming.json rename to data/presets/fields/piste/grooming_hike.json diff --git a/data/presets/fields/piste_nordic/grooming.json b/data/presets/fields/piste/grooming_nordic.json similarity index 100% rename from data/presets/fields/piste_nordic/grooming.json rename to data/presets/fields/piste/grooming_nordic.json diff --git a/data/presets/fields/piste/type.json b/data/presets/fields/piste/type.json new file mode 100644 index 0000000000..ac3bee99a5 --- /dev/null +++ b/data/presets/fields/piste/type.json @@ -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" + } + } +} diff --git a/data/presets/fields/piste_downhill/type.json b/data/presets/fields/piste/type_downhill.json similarity index 100% rename from data/presets/fields/piste_downhill/type.json rename to data/presets/fields/piste/type_downhill.json diff --git a/data/presets/fields/piste_nordic/type.json b/data/presets/fields/piste/type_nordic.json similarity index 100% rename from data/presets/fields/piste_nordic/type.json rename to data/presets/fields/piste/type_nordic.json diff --git a/data/presets/fields/piste_skitour/difficulty.json b/data/presets/fields/piste_skitour/difficulty.json deleted file mode 100644 index c0227f1bd5..0000000000 --- a/data/presets/fields/piste_skitour/difficulty.json +++ /dev/null @@ -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" - } - } -} diff --git a/data/presets/fields/piste_sled/difficulty.json b/data/presets/fields/piste_sled/difficulty.json deleted file mode 100644 index a06a3d18b3..0000000000 --- a/data/presets/fields/piste_sled/difficulty.json +++ /dev/null @@ -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" - } - } -} diff --git a/data/presets/fields/piste_sled/grooming.json b/data/presets/fields/piste_sled/grooming.json deleted file mode 100644 index b250887b43..0000000000 --- a/data/presets/fields/piste_sled/grooming.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "key": "piste:grooming", - "type": "combo", - "label": "Grooming", - "strings": { - "options": { - "classic": "Classic - prepared", - "backcountry": "Backcountry - no grooming" - } - } -} diff --git a/data/presets/fields/piste_sleigh/difficulty.json b/data/presets/fields/piste_sleigh/difficulty.json deleted file mode 100644 index a06a3d18b3..0000000000 --- a/data/presets/fields/piste_sleigh/difficulty.json +++ /dev/null @@ -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" - } - } -} diff --git a/data/presets/fields/piste_sleigh/grooming.json b/data/presets/fields/piste_sleigh/grooming.json deleted file mode 100644 index b250887b43..0000000000 --- a/data/presets/fields/piste_sleigh/grooming.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "key": "piste:grooming", - "type": "combo", - "label": "Grooming", - "strings": { - "options": { - "classic": "Classic - prepared", - "backcountry": "Backcountry - no grooming" - } - } -} diff --git a/data/presets/presets.json b/data/presets/presets.json index 85be7bedce..18431fa32a 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -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"}, diff --git a/data/presets/presets/piste/piste_downhill.json b/data/presets/presets/piste/downhill.json similarity index 75% rename from data/presets/presets/piste/piste_downhill.json rename to data/presets/presets/piste/downhill.json index 33b639a189..a93097c420 100644 --- a/data/presets/presets/piste/piste_downhill.json +++ b/data/presets/presets/piste/downhill.json @@ -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" ], diff --git a/data/presets/presets/piste/piste_hike.json b/data/presets/presets/piste/hike.json similarity index 83% rename from data/presets/presets/piste/piste_hike.json rename to data/presets/presets/piste/hike.json index bd1393e95d..9376515b70 100644 --- a/data/presets/presets/piste/piste_hike.json +++ b/data/presets/presets/piste/hike.json @@ -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" ], diff --git a/data/presets/presets/piste/piste_ice_skate.json b/data/presets/presets/piste/ice_skate.json similarity index 95% rename from data/presets/presets/piste/piste_ice_skate.json rename to data/presets/presets/piste/ice_skate.json index 945c683a2c..4e6a86bde2 100644 --- a/data/presets/presets/piste/piste_ice_skate.json +++ b/data/presets/presets/piste/ice_skate.json @@ -7,7 +7,6 @@ "lit" ], "geometry": [ - "point", "line", "area" ], diff --git a/data/presets/presets/piste/piste_nordic.json b/data/presets/presets/piste/nordic.json similarity index 76% rename from data/presets/presets/piste/piste_nordic.json rename to data/presets/presets/piste/nordic.json index 37708f1bf9..42a95f751f 100644 --- a/data/presets/presets/piste/piste_nordic.json +++ b/data/presets/presets/piste/nordic.json @@ -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" ], diff --git a/data/presets/presets/piste/piste.json b/data/presets/presets/piste/piste.json new file mode 100644 index 0000000000..c6c38f0609 --- /dev/null +++ b/data/presets/presets/piste/piste.json @@ -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" +} diff --git a/data/presets/presets/piste/piste_skitour.json b/data/presets/presets/piste/skitour.json similarity index 80% rename from data/presets/presets/piste/piste_skitour.json rename to data/presets/presets/piste/skitour.json index 2bc9a5841a..a8ab25a0b3 100644 --- a/data/presets/presets/piste/piste_skitour.json +++ b/data/presets/presets/piste/skitour.json @@ -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" ], diff --git a/data/presets/presets/piste/piste_sled.json b/data/presets/presets/piste/sled.json similarity index 81% rename from data/presets/presets/piste/piste_sled.json rename to data/presets/presets/piste/sled.json index c7cefb3332..594cb743a9 100644 --- a/data/presets/presets/piste/piste_sled.json +++ b/data/presets/presets/piste/sled.json @@ -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" ], diff --git a/data/presets/presets/piste/piste_sleigh.json b/data/presets/presets/piste/sleigh.json similarity index 76% rename from data/presets/presets/piste/piste_sleigh.json rename to data/presets/presets/piste/sleigh.json index 364b317605..8b919c431f 100644 --- a/data/presets/presets/piste/piste_sleigh.json +++ b/data/presets/presets/piste/sleigh.json @@ -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" } diff --git a/data/taginfo.json b/data/taginfo.json index 67041056a3..94ac193dab 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -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"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 2c1fd036b8..7f6b44f06a 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -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,24 +2440,31 @@ "extreme": "Extreme (climbing equipment required)" } }, - "piste_downhill/grooming": { - "label": "Grooming", + "piste/difficulty_nordic": { + "label": "Difficulty", + "placeholder": "Easy, Intermediate, Advanced...", "options": { - "classic": "Classic", - "mogul": "Mogul", - "backcountry": "Backcountry - no grooming" + "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_downhill/type": { - "label": "Type", + "piste/difficulty_skitour": { + "label": "Difficulty", + "placeholder": "Easy, Intermediate, Advanced...", "options": { - "downhill": "Downhill", - "snow_park": "Snow Park", - "playground": "Playground", - "connection": "Connection between pistes" + "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_hike/difficulty": { + "piste/difficulty": { "label": "Difficulty", "placeholder": "Easy, Intermediate, Advanced...", "options": { @@ -2470,25 +2477,22 @@ "extreme": "Extreme" } }, - "piste_hike/grooming": { + "piste/grooming_downhill": { "label": "Grooming", "options": { - "classic": "Classic - Winter Hiking", - "backcountry": "Backcountry - Snowshoeing" + "classic": "Classic", + "mogul": "Mogul", + "backcountry": "Backcountry - no grooming" } }, - "piste_nordic/difficulty": { - "label": "Difficulty", - "placeholder": "Easy, Intermediate, Advanced...", + "piste/grooming_hike": { + "label": "Grooming", "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" + "classic": "Classic - Winter Hiking", + "backcountry": "Backcountry - Snowshoeing" } }, - "piste_nordic/grooming": { + "piste/grooming_nordic": { "label": "Grooming", "options": { "classic": "Classic", @@ -2498,73 +2502,47 @@ "skating": "Skating" } }, - "piste_nordic/type": { - "label": "Type", - "options": { - "downhill": "Nordic", - "playground": "Playground", - "connection": "Connection between pistes" - } - }, - "piste_skitour/difficulty": { - "label": "Difficulty", - "placeholder": "Easy, Intermediate, Advanced...", - "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": { + "piste/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" + "backcountry": "Backcountry", + "classic+skating": "Classic and Skating", + "scooter": "Scooter/Snowmobile", + "skating": "Skating" } }, - "piste_sled/grooming": { - "label": "Grooming", + "piste/type_downhill": { + "label": "Type", "options": { - "classic": "Classic - prepared", - "backcountry": "Backcountry - no grooming" + "downhill": "Downhill", + "snow_park": "Snow Park", + "playground": "Playground", + "connection": "Connection between pistes" } }, - "piste_sleigh/difficulty": { - "label": "Difficulty", - "placeholder": "Easy, Intermediate, Advanced...", + "piste/type_nordic": { + "label": "Type", "options": { - "novice": "Novice", - "easy": "Easy", - "intermediate": "Intermediate", - "advanced": "Advanced", - "expert": "Expert", - "freeride": "Freeride", - "extreme": "Extreme" + "downhill": "Nordic", + "playground": "Playground", + "connection": "Connection between pistes" } }, - "piste_sleigh/grooming": { - "label": "Grooming", + "piste/type": { + "label": "Type", "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": { From 67d5e896807b5fc872b179112a0b59e22d6f4094 Mon Sep 17 00:00:00 2001 From: yves Date: Sat, 6 Oct 2018 09:10:28 +0200 Subject: [PATCH 4/4] Add colour field to the piste route preset --- data/presets.yaml | 3 +++ data/presets/fields.json | 1 + data/presets/fields/colour.json | 5 +++++ data/presets/presets.json | 2 +- data/presets/presets/type/route/piste.json | 5 +++-- data/taginfo.json | 1 + dist/locales/en.json | 3 +++ 7 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 data/presets/fields/colour.json diff --git a/data/presets.yaml b/data/presets.yaml index cc8509c00e..f04b944262 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -321,6 +321,9 @@ en: collection_times: # collection_times=* label: Collection Times + colour: + # colour=* + label: Colour comment: # comment=* label: Changeset Comment diff --git a/data/presets/fields.json b/data/presets/fields.json index b06b19beb4..801eb4d74c 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -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"}, diff --git a/data/presets/fields/colour.json b/data/presets/fields/colour.json new file mode 100644 index 0000000000..6ab9de9afb --- /dev/null +++ b/data/presets/fields/colour.json @@ -0,0 +1,5 @@ +{ + "key": "colour", + "type": "text", + "label": "Colour" +} diff --git a/data/presets/presets.json b/data/presets/presets.json index 18431fa32a..814adcd7b8 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -978,7 +978,7 @@ "type/route/horse": {"icon": "iD-route-horse", "fields": ["name", "ref_route", "operator", "network_horse", "description", "distance"], "geometry": ["relation"], "tags": {"type": "route", "route": "horse"}, "name": "Riding Route"}, "type/route/light_rail": {"icon": "iD-route-light-rail", "fields": ["name", "ref_route", "operator", "network"], "geometry": ["relation"], "tags": {"type": "route", "route": "light_rail"}, "name": "Light Rail Route"}, "type/route/pipeline": {"icon": "iD-route-pipeline", "fields": ["name", "ref_route", "operator"], "geometry": ["relation"], "tags": {"type": "route", "route": "pipeline"}, "name": "Pipeline Route"}, - "type/route/piste": {"icon": "iD-route-piste", "fields": ["name", "ref_route", "operator", "network"], "geometry": ["relation"], "tags": {"type": "route", "route": "piste"}, "name": "Piste/Ski Route"}, + "type/route/piste": {"icon": "iD-route-piste", "fields": ["name", "piste/type", "colour", "ref_route", "operator"], "geometry": ["relation"], "tags": {"type": "route", "route": "piste"}, "name": "Piste/Ski Route"}, "type/route/power": {"icon": "iD-route-power", "fields": ["name", "ref_route", "operator"], "geometry": ["relation"], "tags": {"type": "route", "route": "power"}, "name": "Power Route"}, "type/route/road": {"icon": "iD-route-road", "fields": ["name", "ref_route", "network_road"], "geometry": ["relation"], "tags": {"type": "route", "route": "road"}, "name": "Road Route"}, "type/route/subway": {"icon": "iD-route-subway", "fields": ["name", "ref_route", "operator", "network"], "geometry": ["relation"], "tags": {"type": "route", "route": "subway"}, "name": "Subway Route"}, diff --git a/data/presets/presets/type/route/piste.json b/data/presets/presets/type/route/piste.json index d670b77b38..42993a7963 100644 --- a/data/presets/presets/type/route/piste.json +++ b/data/presets/presets/type/route/piste.json @@ -2,9 +2,10 @@ "icon": "iD-route-piste", "fields": [ "name", + "piste/type", + "colour", "ref_route", - "operator", - "network" + "operator" ], "geometry": [ "relation" diff --git a/data/taginfo.json b/data/taginfo.json index 94ac193dab..299bcf6ee0 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -6689,6 +6689,7 @@ {"key": "castle_type", "description": "Type"}, {"key": "clothes", "description": "Clothes"}, {"key": "collection_times", "description": "Collection Times"}, + {"key": "colour", "description": "Colour"}, {"key": "comment", "description": "Changeset Comment"}, {"key": "communication:", "description": "Communication Types"}, {"key": "construction", "description": "Type"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 7f6b44f06a..431da2fe2c 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -1730,6 +1730,9 @@ "collection_times": { "label": "Collection Times" }, + "colour": { + "label": "Colour" + }, "comment": { "label": "Changeset Comment", "placeholder": "Brief description of your contributions (required)"