diff --git a/data/presets.yaml b/data/presets.yaml index cc64c8d1e..00477c8c2 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -60,6 +60,25 @@ en: postcode: Postal code admin_level: label: Admin Level + aerialway: + label: Type + aerialway/access: + label: Access + aerialway/bubble: + label: Bubble + aerialway/capacity: + label: Capacity (per hour) + placeholder: "500, 2500, 5000..." + aerialway/duration: + label: Duration (minutes) + placeholder: "1, 2, 3..." + aerialway/heating: + label: Heated + aerialway/occupancy: + label: Occupancy + placeholder: "2, 4, 8..." + aerialway/summer/access: + label: Access (summer) aeroway: label: Type amenity: @@ -215,6 +234,12 @@ en: phone: label: Phone placeholder: +31 42 123 4567 + piste/difficulty: + label: Difficulty + piste/grooming: + label: Grooming + piste/type: + label: Type place: label: Type power: @@ -300,6 +325,36 @@ en: address: name: Address terms: "" + aerialway: + name: Aerialway + terms: "" + aerialway/cable_car: + name: Cable Car + terms: "" + aerialway/chair_lift: + name: Chair Lift + terms: "" + aerialway/gondola: + name: Gondola + terms: "" + aerialway/magic_carpet: + name: Magic Carpet Lift + terms: "" + aerialway/platter: + name: Platter Lift + terms: "" + aerialway/pylon: + name: Aerialway Pylon + terms: "" + aerialway/rope_tow: + name: Rope Tow Lift + terms: "" + aerialway/station: + name: Aerialway Station + terms: "" + "aerialway/t-bar": + name: "T-bar Lift" + terms: "" aeroway: name: Aeroway terms: "" @@ -1047,6 +1102,9 @@ en: office/travel_agent: name: Travel Agency terms: "" + piste: + name: Piste/Ski Trail + terms: "" place: name: Place terms: "" diff --git a/data/presets/fields.json b/data/presets/fields.json index d455a8893..e92b45f17 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -84,6 +84,59 @@ "type": "number", "label": "Admin Level" }, + "aerialway": { + "key": "aerialway", + "type": "typeCombo", + "label": "Type" + }, + "aerialway/access": { + "key": "aerialway:access", + "type": "combo", + "options": [ + "entry", + "exit", + "both" + ], + "label": "Access" + }, + "aerialway/bubble": { + "key": "aerialway:bubble", + "type": "check", + "label": "Bubble" + }, + "aerialway/capacity": { + "key": "aerialway:capacity", + "type": "number", + "label": "Capacity (per hour)", + "placeholder": "500, 2500, 5000..." + }, + "aerialway/duration": { + "key": "aerialway:duration", + "type": "number", + "label": "Duration (minutes)", + "placeholder": "1, 2, 3..." + }, + "aerialway/heating": { + "key": "aerialway:heating", + "type": "check", + "label": "Heated" + }, + "aerialway/occupancy": { + "key": "aerialway:occupancy", + "type": "number", + "label": "Occupancy", + "placeholder": "2, 4, 8..." + }, + "aerialway/summer/access": { + "key": "aerialway:summer:access", + "type": "combo", + "options": [ + "entry", + "exit", + "both" + ], + "label": "Access (summer)" + }, "aeroway": { "key": "aeroway", "type": "typeCombo", @@ -502,6 +555,21 @@ "label": "Phone", "placeholder": "+31 42 123 4567" }, + "piste/difficulty": { + "key": "piste:difficulty", + "type": "combo", + "label": "Difficulty" + }, + "piste/grooming": { + "key": "piste:grooming", + "type": "combo", + "label": "Grooming" + }, + "piste/type": { + "key": "piste:type", + "type": "typeCombo", + "label": "Type" + }, "place": { "key": "place", "type": "typeCombo", diff --git a/data/presets/fields/aerialway.json b/data/presets/fields/aerialway.json new file mode 100644 index 000000000..1023fe384 --- /dev/null +++ b/data/presets/fields/aerialway.json @@ -0,0 +1,5 @@ +{ + "key": "aerialway", + "type": "typeCombo", + "label": "Type" +} \ No newline at end of file diff --git a/data/presets/fields/aerialway/access.json b/data/presets/fields/aerialway/access.json new file mode 100644 index 000000000..64f7ffee5 --- /dev/null +++ b/data/presets/fields/aerialway/access.json @@ -0,0 +1,10 @@ +{ + "key": "aerialway:access", + "type": "combo", + "options": [ + "entry", + "exit", + "both" + ], + "label": "Access" +} \ No newline at end of file diff --git a/data/presets/fields/aerialway/bubble.json b/data/presets/fields/aerialway/bubble.json new file mode 100644 index 000000000..98e839d36 --- /dev/null +++ b/data/presets/fields/aerialway/bubble.json @@ -0,0 +1,5 @@ +{ + "key": "aerialway:bubble", + "type": "check", + "label": "Bubble" +} \ No newline at end of file diff --git a/data/presets/fields/aerialway/capacity.json b/data/presets/fields/aerialway/capacity.json new file mode 100644 index 000000000..0e3b757c3 --- /dev/null +++ b/data/presets/fields/aerialway/capacity.json @@ -0,0 +1,6 @@ +{ + "key": "aerialway:capacity", + "type": "number", + "label": "Capacity (per hour)", + "placeholder": "500, 2500, 5000..." +} \ No newline at end of file diff --git a/data/presets/fields/aerialway/duration.json b/data/presets/fields/aerialway/duration.json new file mode 100644 index 000000000..9754a58f7 --- /dev/null +++ b/data/presets/fields/aerialway/duration.json @@ -0,0 +1,6 @@ +{ + "key": "aerialway:duration", + "type": "number", + "label": "Duration (minutes)", + "placeholder": "1, 2, 3..." +} \ No newline at end of file diff --git a/data/presets/fields/aerialway/heating.json b/data/presets/fields/aerialway/heating.json new file mode 100644 index 000000000..ef7fc7be4 --- /dev/null +++ b/data/presets/fields/aerialway/heating.json @@ -0,0 +1,5 @@ +{ + "key": "aerialway:heating", + "type": "check", + "label": "Heated" +} \ No newline at end of file diff --git a/data/presets/fields/aerialway/occupancy.json b/data/presets/fields/aerialway/occupancy.json new file mode 100644 index 000000000..8e34a8a04 --- /dev/null +++ b/data/presets/fields/aerialway/occupancy.json @@ -0,0 +1,6 @@ +{ + "key": "aerialway:occupancy", + "type": "number", + "label": "Occupancy", + "placeholder": "2, 4, 8..." +} \ No newline at end of file diff --git a/data/presets/fields/aerialway/summer/access.json b/data/presets/fields/aerialway/summer/access.json new file mode 100644 index 000000000..1426e6160 --- /dev/null +++ b/data/presets/fields/aerialway/summer/access.json @@ -0,0 +1,10 @@ +{ + "key": "aerialway:summer:access", + "type": "combo", + "options": [ + "entry", + "exit", + "both" + ], + "label": "Access (summer)" +} \ No newline at end of file diff --git a/data/presets/fields/piste/difficulty.json b/data/presets/fields/piste/difficulty.json new file mode 100644 index 000000000..a75ecaaf3 --- /dev/null +++ b/data/presets/fields/piste/difficulty.json @@ -0,0 +1,5 @@ +{ + "key": "piste:difficulty", + "type": "combo", + "label": "Difficulty" +} \ No newline at end of file diff --git a/data/presets/fields/piste/grooming.json b/data/presets/fields/piste/grooming.json new file mode 100644 index 000000000..81005d9d8 --- /dev/null +++ b/data/presets/fields/piste/grooming.json @@ -0,0 +1,5 @@ +{ + "key": "piste:grooming", + "type": "combo", + "label": "Grooming" +} \ No newline at end of file diff --git a/data/presets/fields/piste/type.json b/data/presets/fields/piste/type.json new file mode 100644 index 000000000..93ec7f0b5 --- /dev/null +++ b/data/presets/fields/piste/type.json @@ -0,0 +1,5 @@ +{ + "key": "piste:type", + "type": "typeCombo", + "label": "Type" +} \ No newline at end of file diff --git a/data/presets/presets.json b/data/presets/presets.json index da5c27e2a..f810b45a7 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -13,6 +13,165 @@ "matchScore": 0.2, "name": "Address" }, + "aerialway": { + "fields": [ + "aerialway" + ], + "geometry": [ + "point", + "vertex", + "line" + ], + "tags": { + "aerialway": "*" + }, + "terms": [ + "ski lift", + "funifor", + "funitel" + ], + "name": "Aerialway" + }, + "aerialway/cable_car": { + "geometry": [ + "line" + ], + "terms": [ + "tramway", + "ropeway" + ], + "fields": [ + "aerialway/occupancy", + "aerialway/capacity", + "aerialway/duration", + "aerialway/heating" + ], + "tags": { + "aerialway": "cable_car" + }, + "name": "Cable Car" + }, + "aerialway/chair_lift": { + "geometry": [ + "line" + ], + "fields": [ + "aerialway/occupancy", + "aerialway/capacity", + "aerialway/duration", + "aerialway/bubble", + "aerialway/heating" + ], + "tags": { + "aerialway": "chair_lift" + }, + "name": "Chair Lift" + }, + "aerialway/gondola": { + "geometry": [ + "line" + ], + "fields": [ + "aerialway/occupancy", + "aerialway/capacity", + "aerialway/duration", + "aerialway/bubble", + "aerialway/heating" + ], + "tags": { + "aerialway": "gondola" + }, + "name": "Gondola" + }, + "aerialway/magic_carpet": { + "geometry": [ + "line" + ], + "fields": [ + "aerialway/capacity", + "aerialway/duration", + "aerialway/heating" + ], + "tags": { + "aerialway": "magic_carpet" + }, + "name": "Magic Carpet Lift" + }, + "aerialway/platter": { + "geometry": [ + "line" + ], + "terms": [ + "button lift", + "poma lift" + ], + "fields": [ + "aerialway/capacity", + "aerialway/duration" + ], + "tags": { + "aerialway": "platter" + }, + "name": "Platter Lift" + }, + "aerialway/pylon": { + "geometry": [ + "point", + "vertex" + ], + "fields": [ + "ref" + ], + "tags": { + "aerialway": "pylon" + }, + "name": "Aerialway Pylon" + }, + "aerialway/rope_tow": { + "geometry": [ + "line" + ], + "terms": [ + "handle tow", + "bugel lift" + ], + "fields": [ + "aerialway/capacity", + "aerialway/duration" + ], + "tags": { + "aerialway": "rope_tow" + }, + "name": "Rope Tow Lift" + }, + "aerialway/station": { + "geometry": [ + "point", + "vertex" + ], + "fields": [ + "aerialway/access", + "aerialway/summer/access", + "elevation" + ], + "tags": { + "aerialway": "station" + }, + "name": "Aerialway Station" + }, + "aerialway/t-bar": { + "geometry": [ + "line" + ], + "fields": [ + "aerialway/capacity", + "aerialway/duration" + ], + "tags": { + "aerialway": "t-bar" + }, + "name": "T-bar Lift" + }, "aeroway": { "icon": "airport", "fields": [ @@ -4007,6 +4166,34 @@ "name": "Travel Agency", "searchable": false }, + "piste": { + "icon": "skiing", + "fields": [ + "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" + }, "place": { "fields": [ "place" diff --git a/data/presets/presets/aerialway.json b/data/presets/presets/aerialway.json new file mode 100644 index 000000000..bda5e34fa --- /dev/null +++ b/data/presets/presets/aerialway.json @@ -0,0 +1,19 @@ +{ + "fields": [ + "aerialway" + ], + "geometry": [ + "point", + "vertex", + "line" + ], + "tags": { + "aerialway": "*" + }, + "terms": [ + "ski lift", + "funifor", + "funitel" + ], + "name": "Aerialway" +} \ No newline at end of file diff --git a/data/presets/presets/aerialway/cable_car.json b/data/presets/presets/aerialway/cable_car.json new file mode 100644 index 000000000..35a6d6333 --- /dev/null +++ b/data/presets/presets/aerialway/cable_car.json @@ -0,0 +1,19 @@ +{ + "geometry": [ + "line" + ], + "terms": [ + "tramway", + "ropeway" + ], + "fields": [ + "aerialway/occupancy", + "aerialway/capacity", + "aerialway/duration", + "aerialway/heating" + ], + "tags": { + "aerialway": "cable_car" + }, + "name": "Cable Car" +} diff --git a/data/presets/presets/aerialway/chair_lift.json b/data/presets/presets/aerialway/chair_lift.json new file mode 100644 index 000000000..f26cc225b --- /dev/null +++ b/data/presets/presets/aerialway/chair_lift.json @@ -0,0 +1,16 @@ +{ + "geometry": [ + "line" + ], + "fields": [ + "aerialway/occupancy", + "aerialway/capacity", + "aerialway/duration", + "aerialway/bubble", + "aerialway/heating" + ], + "tags": { + "aerialway": "chair_lift" + }, + "name": "Chair Lift" +} diff --git a/data/presets/presets/aerialway/gondola.json b/data/presets/presets/aerialway/gondola.json new file mode 100644 index 000000000..c4b41de4e --- /dev/null +++ b/data/presets/presets/aerialway/gondola.json @@ -0,0 +1,16 @@ +{ + "geometry": [ + "line" + ], + "fields": [ + "aerialway/occupancy", + "aerialway/capacity", + "aerialway/duration", + "aerialway/bubble", + "aerialway/heating" + ], + "tags": { + "aerialway": "gondola" + }, + "name": "Gondola" +} diff --git a/data/presets/presets/aerialway/magic_carpet.json b/data/presets/presets/aerialway/magic_carpet.json new file mode 100644 index 000000000..9cad4ba7f --- /dev/null +++ b/data/presets/presets/aerialway/magic_carpet.json @@ -0,0 +1,14 @@ +{ + "geometry": [ + "line" + ], + "fields": [ + "aerialway/capacity", + "aerialway/duration", + "aerialway/heating" + ], + "tags": { + "aerialway": "magic_carpet" + }, + "name": "Magic Carpet Lift" +} diff --git a/data/presets/presets/aerialway/platter.json b/data/presets/presets/aerialway/platter.json new file mode 100644 index 000000000..2add6a3af --- /dev/null +++ b/data/presets/presets/aerialway/platter.json @@ -0,0 +1,17 @@ +{ + "geometry": [ + "line" + ], + "terms": [ + "button lift", + "poma lift" + ], + "fields": [ + "aerialway/capacity", + "aerialway/duration" + ], + "tags": { + "aerialway": "platter" + }, + "name": "Platter Lift" +} diff --git a/data/presets/presets/aerialway/pylon.json b/data/presets/presets/aerialway/pylon.json new file mode 100644 index 000000000..ae9fc828f --- /dev/null +++ b/data/presets/presets/aerialway/pylon.json @@ -0,0 +1,13 @@ +{ + "geometry": [ + "point", + "vertex" + ], + "fields": [ + "ref" + ], + "tags": { + "aerialway": "pylon" + }, + "name": "Aerialway Pylon" +} diff --git a/data/presets/presets/aerialway/rope_tow.json b/data/presets/presets/aerialway/rope_tow.json new file mode 100644 index 000000000..ed4193634 --- /dev/null +++ b/data/presets/presets/aerialway/rope_tow.json @@ -0,0 +1,17 @@ +{ + "geometry": [ + "line" + ], + "terms": [ + "handle tow", + "bugel lift" + ], + "fields": [ + "aerialway/capacity", + "aerialway/duration" + ], + "tags": { + "aerialway": "rope_tow" + }, + "name": "Rope Tow Lift" +} diff --git a/data/presets/presets/aerialway/station.json b/data/presets/presets/aerialway/station.json new file mode 100644 index 000000000..b8019c2a5 --- /dev/null +++ b/data/presets/presets/aerialway/station.json @@ -0,0 +1,15 @@ +{ + "geometry": [ + "point", + "vertex" + ], + "fields": [ + "aerialway/access", + "aerialway/summer/access", + "elevation" + ], + "tags": { + "aerialway": "station" + }, + "name": "Aerialway Station" +} diff --git a/data/presets/presets/aerialway/t-bar.json b/data/presets/presets/aerialway/t-bar.json new file mode 100644 index 000000000..5b465adba --- /dev/null +++ b/data/presets/presets/aerialway/t-bar.json @@ -0,0 +1,13 @@ +{ + "geometry": [ + "line" + ], + "fields": [ + "aerialway/capacity", + "aerialway/duration" + ], + "tags": { + "aerialway": "t-bar" + }, + "name": "T-bar Lift" +} diff --git a/data/presets/presets/piste.json b/data/presets/presets/piste.json new file mode 100644 index 000000000..7aee2893d --- /dev/null +++ b/data/presets/presets/piste.json @@ -0,0 +1,28 @@ +{ + "icon": "skiing", + "fields": [ + "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" +} \ No newline at end of file diff --git a/dist/locales/en.json b/dist/locales/en.json index d44d2ed47..a518b43a6 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -475,6 +475,33 @@ "admin_level": { "label": "Admin Level" }, + "aerialway": { + "label": "Type" + }, + "aerialway/access": { + "label": "Access" + }, + "aerialway/bubble": { + "label": "Bubble" + }, + "aerialway/capacity": { + "label": "Capacity (per hour)", + "placeholder": "500, 2500, 5000..." + }, + "aerialway/duration": { + "label": "Duration (minutes)", + "placeholder": "1, 2, 3..." + }, + "aerialway/heating": { + "label": "Heated" + }, + "aerialway/occupancy": { + "label": "Occupancy", + "placeholder": "2, 4, 8..." + }, + "aerialway/summer/access": { + "label": "Access (summer)" + }, "aeroway": { "label": "Type" }, @@ -700,6 +727,15 @@ "label": "Phone", "placeholder": "+31 42 123 4567" }, + "piste/difficulty": { + "label": "Difficulty" + }, + "piste/grooming": { + "label": "Grooming" + }, + "piste/type": { + "label": "Type" + }, "place": { "label": "Type" }, @@ -822,6 +858,46 @@ "name": "Address", "terms": "" }, + "aerialway": { + "name": "Aerialway", + "terms": "ski lift,funifor,funitel" + }, + "aerialway/cable_car": { + "name": "Cable Car", + "terms": "tramway,ropeway" + }, + "aerialway/chair_lift": { + "name": "Chair Lift", + "terms": "" + }, + "aerialway/gondola": { + "name": "Gondola", + "terms": "" + }, + "aerialway/magic_carpet": { + "name": "Magic Carpet Lift", + "terms": "" + }, + "aerialway/platter": { + "name": "Platter Lift", + "terms": "button lift,poma lift" + }, + "aerialway/pylon": { + "name": "Aerialway Pylon", + "terms": "" + }, + "aerialway/rope_tow": { + "name": "Rope Tow Lift", + "terms": "handle tow,bugel lift" + }, + "aerialway/station": { + "name": "Aerialway Station", + "terms": "" + }, + "aerialway/t-bar": { + "name": "T-bar Lift", + "terms": "" + }, "aeroway": { "name": "Aeroway", "terms": "" @@ -1818,6 +1894,10 @@ "name": "Travel Agency", "terms": "" }, + "piste": { + "name": "Piste/Ski Trail", + "terms": "ski,sled,sleigh,snowboard,nordic,downhill,snowmobile" + }, "place": { "name": "Place", "terms": "" diff --git a/js/id/core/area_keys.js b/js/id/core/area_keys.js index 9b7a13055..e98251063 100644 --- a/js/id/core/area_keys.js +++ b/js/id/core/area_keys.js @@ -58,6 +58,7 @@ iD.areaKeys = { "tree": true }, "office": {}, + "piste:type": {}, "place": {}, "power": { "line": true,