CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-17 14:23:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

No differentiation of piste type field is needed, it's even disturbing to see the piste field change when you change the piste type.

Browse Source
This commit is contained in:
yves
2018-10-11 14:11:02 +02:00
parent b43d6a1a56
commit 4fefa51574
13 changed files with 42 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/presets.yaml
-22
View File
@@ -1301,28 +1301,6 @@ en:
sleigh: Sleigh
# 'piste:type=snow_park'
snow_park: Snow Park
piste/type_downhill:
# 'piste:type=*'
label: Type
options:
# 'piste:type=connection'
connection: Connection between pistes
# 'piste:type=downhill'
downhill: Downhill
# 'piste:type=playground'
playground: Playground
# 'piste:type=snow_park'
snow_park: Snow Park
piste/type_nordic:
# 'piste:type=*'
label: Type
options:
# 'piste:type=connection'
connection: Connection between pistes
# 'piste:type=nordic'
nordic: Nordic
# 'piste:type=playground'
playground: Playground
place:
# place=*
label: Type
data/presets/fields.json
-2
View File
@@ -210,8 +210,6 @@
"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": {"nordic": "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"},
data/presets/fields/piste/type_downhill.json
-13
View File
@@ -1,13 +0,0 @@
{
"key": "piste:type",
"type": "typeCombo",
"label": "Type",
"strings": {
"options": {
"downhill": "Downhill",
"snow_park": "Snow Park",
"playground": "Playground",
"connection": "Connection between pistes"
}
}
}
data/presets/fields/piste/type_nordic.json
-12
View File
@@ -1,12 +0,0 @@
{
"key": "piste:type",
"type": "typeCombo",
"label": "Type",
"strings": {
"options": {
"nordic": "Nordic",
"playground": "Playground",
"connection": "Connection between pistes"
}
}
}
data/presets/presets.json
+7 -7
View File
@@ -659,14 +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/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/downhill": {"icon": "maki-skiing", "fields": ["name", "piste/type", "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/type", "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", "piste/type", "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", "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"},
"piste/skitour": {"icon": "maki-skiing", "fields": ["name", "piste/type", "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/type", "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/type", "piste/difficulty", "piste/grooming", "oneway", "lit"], "geometry": ["line", "area"], "terms": ["ski", "piste", "sled", "luge", "sleigh", "sledge", "ski-joring", "husky", "horse"], "tags": {"piste:type": "sleigh"}, "name": "Sleigh Piste"},
"place/farm": {"icon": "maki-farm", "geometry": ["point", "area"], "fields": ["name"], "tags": {"place": "farm"}, "name": "Farm", "searchable": false},
"place/city": {"icon": "maki-city", "fields": ["name", "population"], "geometry": ["point", "area"], "tags": {"place": "city"}, "name": "City"},
"place/hamlet": {"icon": "maki-triangle-stroked", "fields": ["name", "population"], "geometry": ["point", "area"], "tags": {"place": "hamlet"}, "name": "Hamlet"},
data/presets/presets/piste/downhill.json
+1 -1
View File
@@ -2,7 +2,7 @@
"icon": "maki-skiing",
"fields": [
"name",
"piste/type_downhill",
"piste/type",
"piste/difficulty_downhill",
"piste/grooming_downhill",
"oneway",
data/presets/presets/piste/hike.json
+1
View File
@@ -2,6 +2,7 @@
"icon": "fas-snowflake",
"fields": [
"name",
"piste/type",
"piste/difficulty",
"piste/grooming_hike",
"oneway",
data/presets/presets/piste/ice_skate.json
+1
View File
@@ -2,6 +2,7 @@
"icon": "fas-snowflake",
"fields": [
"name",
"piste/type",
"sport_ice",
"oneway",
"lit"
data/presets/presets/piste/nordic.json
+1 -1
View File
@@ -2,7 +2,7 @@
"icon": "maki-skiing",
"fields": [
"name",
"piste/type_nordic",
"piste/type",
"piste/difficulty_nordic",
"piste/grooming_nordic",
"oneway",
data/presets/presets/piste/skitour.json
+1
View File
@@ -2,6 +2,7 @@
"icon": "maki-skiing",
"fields": [
"name",
"piste/type",
"piste/difficulty_skitour",
"piste/grooming",
"oneway",
data/presets/presets/piste/sled.json
+1
View File
@@ -2,6 +2,7 @@
"icon": "fas-snowflake",
"fields": [
"name",
"piste/type",
"piste/difficulty",
"piste/grooming",
"oneway",
data/presets/presets/piste/sleigh.json
+1
View File
@@ -2,6 +2,7 @@
"icon": "fas-snowflake",
"fields": [
"name",
"piste/type",
"piste/difficulty",
"piste/grooming",
"oneway",
dist/locales/en.json
Vendored
+28 -17
View File
@@ -2519,23 +2519,6 @@
"skating": "Skating"
}
},
"piste/type_downhill": {
"label": "Type",
"options": {
"downhill": "Downhill",
"snow_park": "Snow Park",
"playground": "Playground",
"connection": "Connection between pistes"
}
},
"piste/type_nordic": {
"label": "Type",
"options": {
"nordic": "Nordic",
"playground": "Playground",
"connection": "Connection between pistes"
}
},
"piste/type": {
"label": "Type",
"options": {
@@ -7399,6 +7382,34 @@
"description": "Orthofoto layer provided by basemap.at. \"Successor\" of geoimage.at imagery.",
"name": "basemap.at Orthofoto"
},
"eufar-balaton": {
"attribution": {
"text": "EUFAR Balaton ortofotó 2010"
},
"description": "1940 geo-tagged photography from Balaton Limnological Institute.",
"name": "EUFAR Balaton orthophotos"
},
"finds.jp_KBN_2500": {
"attribution": {
"text": "GSI KIBAN 2500"
},
"description": "GSI Kiban 2500 via finds.jp. Good for tracing, but a bit older.",
"name": "Japan GSI KIBAN 2500"
},
"gsi.go.jp": {
"attribution": {
"text": "GSI Japan"
},
"description": "Japan GSI ortho Imagery. Usually better than bing, but a bit older.",
"name": "Japan GSI ortho Imagery"
},
"gsi.go.jp_std_map": {
"attribution": {
"text": "GSI Japan"
},
"description": "Japan GSI Standard Map. Widely covered.",
"name": "Japan GSI Standard Map"
},
"hike_n_bike": {
"attribution": {
"text": "© OpenStreetMap contributors"