From 09ade87f53c2715a2df9bf7ff64fc05fc4ef61e0 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Tue, 14 Jan 2020 20:20:05 -0500 Subject: [PATCH] Update the names and terms of piste presets Update the terms of aerialway presets --- CHANGELOG.md | 1 + data/presets.yaml | 61 +++++++++++-------- data/presets/presets.json | 44 ++++++------- data/presets/presets/aerialway/cable_car.json | 12 ++-- .../presets/presets/aerialway/chair_lift.json | 5 ++ data/presets/presets/aerialway/drag_lift.json | 5 ++ data/presets/presets/aerialway/gondola.json | 6 ++ data/presets/presets/aerialway/goods.json | 3 + data/presets/presets/aerialway/j-bar.json | 11 +++- .../presets/aerialway/magic_carpet.json | 6 ++ .../presets/presets/aerialway/mixed_lift.json | 5 ++ data/presets/presets/aerialway/platter.json | 13 ++-- data/presets/presets/aerialway/pylon.json | 6 ++ data/presets/presets/aerialway/rope_tow.json | 12 ++-- data/presets/presets/aerialway/t-bar.json | 9 ++- data/presets/presets/aerialway/zip_line.json | 6 +- data/presets/presets/piste/downhill.json | 16 ++--- .../presets/piste/downhill/halfpipe.json | 14 +++-- data/presets/presets/piste/hike.json | 18 +++--- data/presets/presets/piste/ice_skate.json | 15 ++--- data/presets/presets/piste/nordic.json | 17 +++--- data/presets/presets/piste/piste.json | 8 +-- data/presets/presets/piste/skitour.json | 6 +- data/presets/presets/piste/sled.json | 19 +++--- data/presets/presets/piste/sleigh.json | 23 ++++--- data/taginfo.json | 16 ++--- dist/locales/en.json | 52 ++++++++-------- 27 files changed, 240 insertions(+), 169 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 87ebba38f..1d3015aac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -106,6 +106,7 @@ _Breaking changes, which may affect downstream projects or sites that embed iD, * Add Speed Limit Enforcement preset ([#7234]) * Add presets: Emergency Exit, Geyser, Used Car Dealership, Wedding Clothes Store, Backcountry Camping Area, Group Camping Area, History Museum * Rename "Anime Shop" to "Anime / Manga Shop" ([#7223]) +* Simplify the names of various Piste presets * Update Arts & Crafts Store icon ([#7228]) * Update Dressmaker icon ([#7229]) * Update Water Well icon ([#7170]) diff --git a/data/presets.yaml b/data/presets.yaml index c40089716..86378349a 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -2765,55 +2765,62 @@ en: aerialway/cable_car: # aerialway=cable_car name: Cable Car - # 'terms: tramway,ropeway' + # 'terms: aerial cable,lift,ropeway,skiing,snowboarding,tramway' terms: '' aerialway/chair_lift: # aerialway=chair_lift name: Chair Lift + # 'terms: aerial cable,skiing,snowboarding' terms: '' aerialway/drag_lift: # aerialway=drag_lift name: Drag Lift + # 'terms: skiing,snowboarding,surface cable' terms: '' aerialway/gondola: # aerialway=gondola name: Gondola + # 'terms: aerial cable,lift,skiing,snowboarding' terms: '' aerialway/goods: # aerialway=goods name: Goods Aerialway + # 'terms: aerial cable' terms: '' aerialway/j-bar: # aerialway=j-bar name: J-Bar Lift - # 'terms: jbar' + # 'terms: drag lift,skiing,snowboarding,surface cable,jaybar,jbar' terms: '' aerialway/magic_carpet: # aerialway=magic_carpet name: Magic Carpet Lift + # 'terms: conveyor belt,skiing,snowboarding,surface lift' terms: '' aerialway/mixed_lift: # aerialway=mixed_lift name: Mixed Lift + # 'terms: aerial cable,skiing,snowboarding' terms: '' aerialway/platter: # aerialway=platter name: Platter Lift - # 'terms: button lift,poma lift' + # 'terms: button lift,disc lift,drag lift,poma lift,skiing,snowboarding,surface cable' terms: '' aerialway/pylon: # aerialway=pylon name: Aerialway Pylon + # 'terms: chair lift pole,skiing,snowboarding,lift tower' terms: '' aerialway/rope_tow: # aerialway=rope_tow name: Rope Tow Lift - # 'terms: handle tow,bugel lift' + # 'terms: bugel lift,drag lift,handle tow,skiing,snowboarding,surface cable' terms: '' aerialway/t-bar: # aerialway=t-bar name: T-Bar Lift - # 'terms: tbar' + # 'terms: drag lift,skiing,surface cable,tbar' terms: '' aerialway/zip_line: # aerialway=zip_line @@ -6776,34 +6783,34 @@ en: terms: '' piste/downhill: # 'piste:type=downhill' - name: Downhill Piste/Ski Run - # 'terms: ski,alpine,snowboard,downhill,piste' - terms: '' + name: Downhill Ski Run + # 'terms: alpine skiing,piste,ski hill,skiing,snowboarding' + terms: '' piste/downhill/halfpipe: # 'piste:type=downhill, man_made=piste:halfpipe' - name: Halfpipe + name: Snowsports Half-Pipe # 'terms: ski,alpine,halfpipe,half pipe,snowboard,downhill,piste' - terms: '' + terms: '' piste/hike: # 'piste:type=hike' - name: Snowshoeing or Winter Hiking Trail - # 'terms: hike,winter hiking,snowshoe,snowshoeing,piste,ski' - terms: '' + name: Snowshoeing / Winter Hiking Trail + # 'terms: hike,nordic walking,piste,show shoeing,snowshoe,snowshoeing' + terms: '' piste/ice_skate: # 'piste:type=ice_skate' - name: Ice Skating Piste - # 'terms: ice,skating,ski,piste' - terms: '' + name: Ice Skating Trail + # 'terms: ice rink,ice track,iceskating,piste,skates' + terms: '' piste/nordic: # 'piste:type=nordic' - name: Nordic or Crosscountry Piste/Ski Trail - # 'terms: ski,nordic,crosscountry,skating,piste' - terms: '' + name: Cross-Country Ski Trail + # 'terms: crosscountry,nordic skiing,piste,skate skiing,skiing,xc' + terms: '' piste/piste: # 'piste:type=*' - name: Winter Sport Trails + name: Snowsports Trail / Piste # '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: '' + terms: '' piste/skitour: # 'piste:type=skitour' name: Ski Touring Trail @@ -6811,14 +6818,14 @@ en: terms: '' piste/sled: # 'piste:type=sled' - name: Sled Piste - # 'terms: ski,sled,luge,sleigh,sledge,piste' - terms: '' + name: Sled Run + # 'terms: bobsled,luge,piste,skeleton,sledge,sleigh,toboggan' + terms: '' piste/sleigh: # 'piste:type=sleigh' - name: Sleigh Piste - # 'terms: ski,piste,sled,luge,sleigh,sledge,ski-joring,husky,horse' - terms: '' + name: Sleigh Trail + # 'terms: dogsledding,husky,horse,piste,sled,sledge,ski-joring,skijoring' + terms: '' place: # place=* name: Place diff --git a/data/presets/presets.json b/data/presets/presets.json index 09453cda4..5c4e6d9da 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -29,19 +29,19 @@ "advertising/column": {"icon": "temaki-storage_tank", "fields": ["lit"], "geometry": ["point", "area"], "tags": {"advertising": "column"}, "name": "Advertising Column"}, "advertising/poster_box": {"fields": ["lit", "height"], "geometry": ["point"], "tags": {"advertising": "poster_box"}, "name": "Poster Box"}, "advertising/totem": {"fields": ["operator", "lit", "visibility", "direction", "height"], "geometry": ["point"], "tags": {"advertising": "totem"}, "name": "Advertising Totem"}, - "aerialway/cable_car": {"icon": "fas-tram", "geometry": ["line"], "terms": ["tramway", "ropeway"], "fields": ["name", "aerialway/occupancy", "aerialway/capacity", "aerialway/duration", "aerialway/heating"], "tags": {"aerialway": "cable_car"}, "name": "Cable Car"}, - "aerialway/chair_lift": {"icon": "temaki-chairlift", "geometry": ["line"], "fields": ["name", "oneway_yes", "aerialway/occupancy", "aerialway/capacity", "aerialway/duration", "aerialway/bubble", "aerialway/heating"], "tags": {"aerialway": "chair_lift"}, "name": "Chair Lift"}, - "aerialway/drag_lift": {"icon": "temaki-drag_lift", "geometry": ["line"], "fields": ["name", "aerialway/capacity", "aerialway/duration"], "tags": {"aerialway": "drag_lift"}, "name": "Drag Lift"}, - "aerialway/gondola": {"icon": "maki-aerialway", "geometry": ["line"], "fields": ["name", "oneway", "aerialway/occupancy", "aerialway/capacity", "aerialway/duration", "aerialway/bubble", "aerialway/heating"], "tags": {"aerialway": "gondola"}, "name": "Gondola"}, - "aerialway/goods": {"geometry": ["line"], "fields": ["name", "aerialway/capacity", "aerialway/duration"], "tags": {"aerialway": "goods"}, "name": "Goods Aerialway"}, - "aerialway/j-bar": {"icon": "temaki-j_bar_lift", "geometry": ["line"], "fields": ["name", "aerialway/capacity", "aerialway/duration"], "terms": ["jbar"], "tags": {"aerialway": "j-bar"}, "name": "J-Bar Lift"}, - "aerialway/magic_carpet": {"geometry": ["line"], "fields": ["name", "aerialway/capacity", "aerialway/duration", "aerialway/heating"], "tags": {"aerialway": "magic_carpet"}, "name": "Magic Carpet Lift"}, - "aerialway/mixed_lift": {"icon": "maki-aerialway", "geometry": ["line"], "fields": ["name", "oneway_yes", "aerialway/occupancy", "aerialway/capacity", "aerialway/duration", "aerialway/bubble", "aerialway/heating"], "tags": {"aerialway": "mixed_lift"}, "name": "Mixed Lift"}, - "aerialway/platter": {"icon": "temaki-platter_lift", "geometry": ["line"], "terms": ["button lift", "poma lift"], "fields": ["name", "aerialway/capacity", "aerialway/duration"], "tags": {"aerialway": "platter"}, "name": "Platter Lift"}, - "aerialway/pylon": {"icon": "temaki-aerialway_pole", "geometry": ["point", "vertex"], "fields": ["ref"], "tags": {"aerialway": "pylon"}, "name": "Aerialway Pylon"}, - "aerialway/rope_tow": {"geometry": ["line"], "terms": ["handle tow", "bugel lift"], "fields": ["name", "oneway_yes", "aerialway/capacity", "aerialway/duration"], "tags": {"aerialway": "rope_tow"}, "name": "Rope Tow Lift"}, - "aerialway/t-bar": {"icon": "temaki-t_bar_lift", "geometry": ["line"], "fields": ["name", "aerialway/capacity", "aerialway/duration"], "terms": ["tbar"], "tags": {"aerialway": "t-bar"}, "name": "T-Bar Lift"}, - "aerialway/zip_line": {"geometry": ["line"], "fields": ["name", "oneway_yes", "aerialway/duration", "maxweight", "access_simple"], "terms": ["aerial runway", "canopy", "flying fox", "foefie slide", "gravity propelled aerial ropeslide", "Tyrolean traverse", "zip wire", "zip-line", "zipline", "zipwire"], "tags": {"aerialway": "zip_line"}, "name": "Zip Line"}, + "aerialway/cable_car": {"icon": "fas-tram", "geometry": ["line"], "fields": ["name", "aerialway/occupancy", "aerialway/capacity", "aerialway/duration", "aerialway/heating"], "tags": {"aerialway": "cable_car"}, "terms": ["aerial cable", "lift", "ropeway", "skiing", "snowboarding", "tramway"], "name": "Cable Car"}, + "aerialway/chair_lift": {"icon": "temaki-chairlift", "geometry": ["line"], "fields": ["name", "oneway_yes", "aerialway/occupancy", "aerialway/capacity", "aerialway/duration", "aerialway/bubble", "aerialway/heating"], "tags": {"aerialway": "chair_lift"}, "terms": ["aerial cable", "skiing", "snowboarding"], "name": "Chair Lift"}, + "aerialway/drag_lift": {"icon": "temaki-drag_lift", "geometry": ["line"], "fields": ["name", "aerialway/capacity", "aerialway/duration"], "tags": {"aerialway": "drag_lift"}, "terms": ["skiing", "snowboarding", "surface cable"], "name": "Drag Lift"}, + "aerialway/gondola": {"icon": "maki-aerialway", "geometry": ["line"], "fields": ["name", "oneway", "aerialway/occupancy", "aerialway/capacity", "aerialway/duration", "aerialway/bubble", "aerialway/heating"], "tags": {"aerialway": "gondola"}, "terms": ["aerial cable", "lift", "skiing", "snowboarding"], "name": "Gondola"}, + "aerialway/goods": {"geometry": ["line"], "fields": ["name", "aerialway/capacity", "aerialway/duration"], "tags": {"aerialway": "goods"}, "terms": ["aerial cable"], "name": "Goods Aerialway"}, + "aerialway/j-bar": {"icon": "temaki-j_bar_lift", "geometry": ["line"], "fields": ["name", "aerialway/capacity", "aerialway/duration"], "tags": {"aerialway": "j-bar"}, "terms": ["drag lift", "skiing", "snowboarding", "surface cable", "jaybar", "jbar"], "name": "J-Bar Lift"}, + "aerialway/magic_carpet": {"geometry": ["line"], "fields": ["name", "aerialway/capacity", "aerialway/duration", "aerialway/heating"], "tags": {"aerialway": "magic_carpet"}, "terms": ["conveyor belt", "skiing", "snowboarding", "surface lift"], "name": "Magic Carpet Lift"}, + "aerialway/mixed_lift": {"icon": "maki-aerialway", "geometry": ["line"], "fields": ["name", "oneway_yes", "aerialway/occupancy", "aerialway/capacity", "aerialway/duration", "aerialway/bubble", "aerialway/heating"], "tags": {"aerialway": "mixed_lift"}, "terms": ["aerial cable", "skiing", "snowboarding"], "name": "Mixed Lift"}, + "aerialway/platter": {"icon": "temaki-platter_lift", "geometry": ["line"], "fields": ["name", "aerialway/capacity", "aerialway/duration"], "tags": {"aerialway": "platter"}, "terms": ["button lift", "disc lift", "drag lift", "poma lift", "skiing", "snowboarding", "surface cable"], "name": "Platter Lift"}, + "aerialway/pylon": {"icon": "temaki-aerialway_pole", "geometry": ["point", "vertex"], "fields": ["ref"], "tags": {"aerialway": "pylon"}, "terms": ["chair lift pole", "skiing", "snowboarding", "lift tower"], "name": "Aerialway Pylon"}, + "aerialway/rope_tow": {"geometry": ["line"], "fields": ["name", "oneway_yes", "aerialway/capacity", "aerialway/duration"], "tags": {"aerialway": "rope_tow"}, "terms": ["bugel lift", "drag lift", "handle tow", "skiing", "snowboarding", "surface cable"], "name": "Rope Tow Lift"}, + "aerialway/t-bar": {"icon": "temaki-t_bar_lift", "geometry": ["line"], "fields": ["name", "aerialway/capacity", "aerialway/duration"], "tags": {"aerialway": "t-bar"}, "terms": ["drag lift", "skiing", "surface cable", "tbar"], "name": "T-Bar Lift"}, + "aerialway/zip_line": {"geometry": ["line"], "fields": ["name", "oneway_yes", "aerialway/duration", "maxweight", "access_simple"], "tags": {"aerialway": "zip_line"}, "terms": ["aerial runway", "canopy", "flying fox", "foefie slide", "gravity propelled aerial ropeslide", "Tyrolean traverse", "zip wire", "zip-line", "zipline", "zipwire"], "name": "Zip Line"}, "aeroway/aerodrome": {"icon": "maki-airport", "geometry": ["area", "point"], "fields": ["name", "iata", "icao", "operator", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["gnis/feature_id"], "terms": ["aerodrome", "aeroway", "airplane", "airport", "jet", "plane"], "tags": {"aeroway": "aerodrome"}, "matchScore": 0.9, "name": "Airport"}, "aeroway/apron": {"icon": "maki-airport", "geometry": ["area"], "terms": ["ramp"], "fields": ["ref", "surface"], "tags": {"aeroway": "apron"}, "name": "Apron"}, "aeroway/gate": {"icon": "maki-airport", "geometry": ["point"], "fields": ["ref_aeroway_gate"], "tags": {"aeroway": "gate"}, "name": "Airport Gate"}, @@ -887,15 +887,15 @@ "office/telecommunication": {"icon": "maki-telephone", "geometry": ["point", "area"], "tags": {"office": "telecommunication"}, "terms": ["communication", "internet service provider", "isp", "network", "telephone", "voice"], "name": "Telecom Office"}, "office/therapist": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "therapist"}, "terms": ["therapy"], "name": "Therapist Office"}, "office/water_utility": {"icon": "maki-suitcase", "fields": ["{office}", "operator"], "geometry": ["point", "area"], "tags": {"office": "water_utility"}, "terms": ["water board", "utility"], "name": "Water Utility Office"}, - "piste/downhill": {"icon": "fas-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/downhill/halfpipe": {"icon": "fas-snowboarding", "geometry": ["line", "area"], "terms": ["ski", "alpine", "halfpipe", "half pipe", "snowboard", "downhill", "piste"], "tags": {"piste:type": "downhill", "man_made": "piste:halfpipe"}, "name": "Halfpipe"}, - "piste/hike": {"icon": "temaki-snow_shoeing", "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-skating", "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": "fas-skiing-nordic", "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": "fas-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": "fas-skiing-nordic", "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": "temaki-sledding", "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-sleigh", "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"}, + "piste/downhill": {"icon": "fas-skiing", "fields": ["name", "piste/type", "piste/difficulty_downhill", "piste/grooming_downhill", "oneway", "lit"], "geometry": ["line", "area"], "tags": {"piste:type": "downhill"}, "terms": ["alpine skiing", "piste", "ski hill", "skiing", "snowboarding"], "name": "Downhill Ski Run"}, + "piste/downhill/halfpipe": {"icon": "fas-snowboarding", "geometry": ["line", "area"], "tags": {"piste:type": "downhill", "man_made": "piste:halfpipe"}, "reference": {"key": "man_made", "value": "piste:halfpipe"}, "terms": ["ski", "alpine", "halfpipe", "half pipe", "snowboard", "downhill", "piste"], "name": "Snowsports Half-Pipe"}, + "piste/hike": {"icon": "temaki-snow_shoeing", "fields": ["name", "piste/type", "piste/difficulty", "piste/grooming_hike", "oneway", "lit"], "geometry": ["line", "area"], "tags": {"piste:type": "hike"}, "terms": ["hike", "nordic walking", "piste", "show shoeing", "snowshoe", "snowshoeing"], "name": "Snowshoeing / Winter Hiking Trail"}, + "piste/ice_skate": {"icon": "fas-skating", "fields": ["name", "piste/type", "sport_ice", "oneway", "lit"], "geometry": ["line", "area"], "tags": {"piste:type": "ice_skate"}, "terms": ["ice rink", "ice track", "iceskating", "piste", "skates"], "name": "Ice Skating Trail"}, + "piste/nordic": {"icon": "fas-skiing-nordic", "fields": ["name", "piste/type", "piste/difficulty_nordic", "piste/grooming_nordic", "oneway", "lit"], "geometry": ["line", "area"], "tags": {"piste:type": "nordic"}, "terms": ["crosscountry", "nordic skiing", "piste", "skate skiing", "skiing", "xc"], "name": "Cross-Country Ski Trail"}, + "piste/piste": {"icon": "fas-skiing", "fields": ["name", "piste/type", "piste/difficulty", "piste/grooming", "oneway", "lit"], "geometry": ["line", "area"], "tags": {"piste:type": "*"}, "terms": ["ski", "nordic", "crosscountry", "downhill", "alpine", "snowboard", "skitour", "ski touring", "sled", "luge", "sleigh", "sledge", "ski-joring", "husky", "horse", "winter hiking", "snowshoe", "snowshoeing", "ice", "skating"], "name": "Snowsports Trail / Piste"}, + "piste/skitour": {"icon": "fas-skiing-nordic", "fields": ["name", "piste/type", "piste/difficulty_skitour", "piste/grooming", "oneway", "lit"], "geometry": ["line", "area"], "tags": {"piste:type": "skitour"}, "terms": ["ski", "skitour", "crosscountry", "ski touring", "piste"], "name": "Ski Touring Trail"}, + "piste/sled": {"icon": "temaki-sledding", "fields": ["name", "piste/type", "piste/difficulty", "piste/grooming", "oneway", "lit"], "geometry": ["line", "area"], "tags": {"piste:type": "sled"}, "terms": ["bobsled", "luge", "piste", "skeleton", "sledge", "sleigh", "toboggan"], "name": "Sled Run"}, + "piste/sleigh": {"icon": "fas-sleigh", "fields": ["name", "piste/type", "piste/difficulty", "piste/grooming", "oneway", "lit"], "geometry": ["line", "area"], "tags": {"piste:type": "sleigh"}, "terms": ["dogsledding", "husky", "horse", "piste", "sled", "sledge", "ski-joring", "skijoring"], "name": "Sleigh Trail"}, "place/farm": {"icon": "maki-farm", "geometry": ["point", "area"], "tags": {"place": "farm"}, "name": "Farm", "searchable": false}, "place/city_block": {"icon": "maki-triangle-stroked", "moreFields": ["{place}", "website"], "geometry": ["point", "area"], "tags": {"place": "city_block"}, "name": "City Block"}, "place/city": {"icon": "maki-city", "fields": ["name", "population"], "moreFields": ["{place}", "website"], "geometry": ["point", "area"], "tags": {"place": "city"}, "name": "City"}, diff --git a/data/presets/presets/aerialway/cable_car.json b/data/presets/presets/aerialway/cable_car.json index 41aaeb8dd..d92677efa 100644 --- a/data/presets/presets/aerialway/cable_car.json +++ b/data/presets/presets/aerialway/cable_car.json @@ -3,10 +3,6 @@ "geometry": [ "line" ], - "terms": [ - "tramway", - "ropeway" - ], "fields": [ "name", "aerialway/occupancy", @@ -17,5 +13,13 @@ "tags": { "aerialway": "cable_car" }, + "terms": [ + "aerial cable", + "lift", + "ropeway", + "skiing", + "snowboarding", + "tramway" + ], "name": "Cable Car" } diff --git a/data/presets/presets/aerialway/chair_lift.json b/data/presets/presets/aerialway/chair_lift.json index ff03df2e2..ca7488e6a 100644 --- a/data/presets/presets/aerialway/chair_lift.json +++ b/data/presets/presets/aerialway/chair_lift.json @@ -15,5 +15,10 @@ "tags": { "aerialway": "chair_lift" }, + "terms": [ + "aerial cable", + "skiing", + "snowboarding" + ], "name": "Chair Lift" } diff --git a/data/presets/presets/aerialway/drag_lift.json b/data/presets/presets/aerialway/drag_lift.json index 324bd77d2..201e354ce 100644 --- a/data/presets/presets/aerialway/drag_lift.json +++ b/data/presets/presets/aerialway/drag_lift.json @@ -11,5 +11,10 @@ "tags": { "aerialway": "drag_lift" }, + "terms": [ + "skiing", + "snowboarding", + "surface cable" + ], "name": "Drag Lift" } diff --git a/data/presets/presets/aerialway/gondola.json b/data/presets/presets/aerialway/gondola.json index d5829ca71..a5957acf4 100644 --- a/data/presets/presets/aerialway/gondola.json +++ b/data/presets/presets/aerialway/gondola.json @@ -15,5 +15,11 @@ "tags": { "aerialway": "gondola" }, + "terms": [ + "aerial cable", + "lift", + "skiing", + "snowboarding" + ], "name": "Gondola" } diff --git a/data/presets/presets/aerialway/goods.json b/data/presets/presets/aerialway/goods.json index 9ad3ab629..18ccf4b4d 100644 --- a/data/presets/presets/aerialway/goods.json +++ b/data/presets/presets/aerialway/goods.json @@ -10,5 +10,8 @@ "tags": { "aerialway": "goods" }, + "terms": [ + "aerial cable" + ], "name": "Goods Aerialway" } diff --git a/data/presets/presets/aerialway/j-bar.json b/data/presets/presets/aerialway/j-bar.json index 6889b4314..c864cb7b6 100644 --- a/data/presets/presets/aerialway/j-bar.json +++ b/data/presets/presets/aerialway/j-bar.json @@ -8,11 +8,16 @@ "aerialway/capacity", "aerialway/duration" ], - "terms": [ - "jbar" - ], "tags": { "aerialway": "j-bar" }, + "terms": [ + "drag lift", + "skiing", + "snowboarding", + "surface cable", + "jaybar", + "jbar" + ], "name": "J-Bar Lift" } diff --git a/data/presets/presets/aerialway/magic_carpet.json b/data/presets/presets/aerialway/magic_carpet.json index f7eecd0ca..18b551da5 100644 --- a/data/presets/presets/aerialway/magic_carpet.json +++ b/data/presets/presets/aerialway/magic_carpet.json @@ -11,5 +11,11 @@ "tags": { "aerialway": "magic_carpet" }, + "terms": [ + "conveyor belt", + "skiing", + "snowboarding", + "surface lift" + ], "name": "Magic Carpet Lift" } diff --git a/data/presets/presets/aerialway/mixed_lift.json b/data/presets/presets/aerialway/mixed_lift.json index 0253efd77..11011cc94 100644 --- a/data/presets/presets/aerialway/mixed_lift.json +++ b/data/presets/presets/aerialway/mixed_lift.json @@ -15,5 +15,10 @@ "tags": { "aerialway": "mixed_lift" }, + "terms": [ + "aerial cable", + "skiing", + "snowboarding" + ], "name": "Mixed Lift" } diff --git a/data/presets/presets/aerialway/platter.json b/data/presets/presets/aerialway/platter.json index a3a8656b8..86b99fba5 100644 --- a/data/presets/presets/aerialway/platter.json +++ b/data/presets/presets/aerialway/platter.json @@ -3,10 +3,6 @@ "geometry": [ "line" ], - "terms": [ - "button lift", - "poma lift" - ], "fields": [ "name", "aerialway/capacity", @@ -15,5 +11,14 @@ "tags": { "aerialway": "platter" }, + "terms": [ + "button lift", + "disc lift", + "drag lift", + "poma lift", + "skiing", + "snowboarding", + "surface cable" + ], "name": "Platter Lift" } diff --git a/data/presets/presets/aerialway/pylon.json b/data/presets/presets/aerialway/pylon.json index 5cee1b13b..ceb920e76 100644 --- a/data/presets/presets/aerialway/pylon.json +++ b/data/presets/presets/aerialway/pylon.json @@ -10,5 +10,11 @@ "tags": { "aerialway": "pylon" }, + "terms": [ + "chair lift pole", + "skiing", + "snowboarding", + "lift tower" + ], "name": "Aerialway Pylon" } diff --git a/data/presets/presets/aerialway/rope_tow.json b/data/presets/presets/aerialway/rope_tow.json index a6d4df303..84f077f09 100644 --- a/data/presets/presets/aerialway/rope_tow.json +++ b/data/presets/presets/aerialway/rope_tow.json @@ -2,10 +2,6 @@ "geometry": [ "line" ], - "terms": [ - "handle tow", - "bugel lift" - ], "fields": [ "name", "oneway_yes", @@ -15,5 +11,13 @@ "tags": { "aerialway": "rope_tow" }, + "terms": [ + "bugel lift", + "drag lift", + "handle tow", + "skiing", + "snowboarding", + "surface cable" + ], "name": "Rope Tow Lift" } diff --git a/data/presets/presets/aerialway/t-bar.json b/data/presets/presets/aerialway/t-bar.json index 912e05d33..593dfb028 100644 --- a/data/presets/presets/aerialway/t-bar.json +++ b/data/presets/presets/aerialway/t-bar.json @@ -8,11 +8,14 @@ "aerialway/capacity", "aerialway/duration" ], - "terms": [ - "tbar" - ], "tags": { "aerialway": "t-bar" }, + "terms": [ + "drag lift", + "skiing", + "surface cable", + "tbar" + ], "name": "T-Bar Lift" } diff --git a/data/presets/presets/aerialway/zip_line.json b/data/presets/presets/aerialway/zip_line.json index e64b96b43..bb8c61103 100644 --- a/data/presets/presets/aerialway/zip_line.json +++ b/data/presets/presets/aerialway/zip_line.json @@ -9,6 +9,9 @@ "maxweight", "access_simple" ], + "tags": { + "aerialway": "zip_line" + }, "terms": [ "aerial runway", "canopy", @@ -21,8 +24,5 @@ "zipline", "zipwire" ], - "tags": { - "aerialway": "zip_line" - }, "name": "Zip Line" } diff --git a/data/presets/presets/piste/downhill.json b/data/presets/presets/piste/downhill.json index 454724ee5..10c132d8c 100644 --- a/data/presets/presets/piste/downhill.json +++ b/data/presets/presets/piste/downhill.json @@ -12,15 +12,15 @@ "line", "area" ], - "terms": [ - "ski", - "alpine", - "snowboard", - "downhill", - "piste" - ], "tags": { "piste:type": "downhill" }, - "name": "Downhill Piste/Ski Run" + "terms": [ + "alpine skiing", + "piste", + "ski hill", + "skiing", + "snowboarding" + ], + "name": "Downhill Ski Run" } diff --git a/data/presets/presets/piste/downhill/halfpipe.json b/data/presets/presets/piste/downhill/halfpipe.json index e903c4aaa..04605cdd9 100644 --- a/data/presets/presets/piste/downhill/halfpipe.json +++ b/data/presets/presets/piste/downhill/halfpipe.json @@ -4,6 +4,14 @@ "line", "area" ], + "tags": { + "piste:type": "downhill", + "man_made": "piste:halfpipe" + }, + "reference": { + "key": "man_made", + "value": "piste:halfpipe" + }, "terms": [ "ski", "alpine", @@ -13,9 +21,5 @@ "downhill", "piste" ], - "tags": { - "piste:type": "downhill", - "man_made": "piste:halfpipe" - }, - "name": "Halfpipe" + "name": "Snowsports Half-Pipe" } diff --git a/data/presets/presets/piste/hike.json b/data/presets/presets/piste/hike.json index 9ead22670..2ea39ef83 100644 --- a/data/presets/presets/piste/hike.json +++ b/data/presets/presets/piste/hike.json @@ -12,16 +12,16 @@ "line", "area" ], - "terms": [ - "hike", - "winter hiking", - "snowshoe", - "snowshoeing", - "piste", - "ski" - ], "tags": { "piste:type": "hike" }, - "name": "Snowshoeing or Winter Hiking Trail" + "terms": [ + "hike", + "nordic walking", + "piste", + "show shoeing", + "snowshoe", + "snowshoeing" + ], + "name": "Snowshoeing / Winter Hiking Trail" } diff --git a/data/presets/presets/piste/ice_skate.json b/data/presets/presets/piste/ice_skate.json index c5f8650d7..604acd973 100644 --- a/data/presets/presets/piste/ice_skate.json +++ b/data/presets/presets/piste/ice_skate.json @@ -11,14 +11,15 @@ "line", "area" ], - "terms": [ - "ice", - "skating", - "ski", - "piste" - ], "tags": { "piste:type": "ice_skate" }, - "name": "Ice Skating Piste" + "terms": [ + "ice rink", + "ice track", + "iceskating", + "piste", + "skates" + ], + "name": "Ice Skating Trail" } diff --git a/data/presets/presets/piste/nordic.json b/data/presets/presets/piste/nordic.json index 5774c79c3..c7ed8b52f 100644 --- a/data/presets/presets/piste/nordic.json +++ b/data/presets/presets/piste/nordic.json @@ -12,15 +12,16 @@ "line", "area" ], - "terms": [ - "ski", - "nordic", - "crosscountry", - "skating", - "piste" - ], "tags": { "piste:type": "nordic" }, - "name": "Nordic or Crosscountry Piste/Ski Trail" + "terms": [ + "crosscountry", + "nordic skiing", + "piste", + "skate skiing", + "skiing", + "xc" + ], + "name": "Cross-Country Ski Trail" } diff --git a/data/presets/presets/piste/piste.json b/data/presets/presets/piste/piste.json index 72b40659d..799577b5a 100644 --- a/data/presets/presets/piste/piste.json +++ b/data/presets/presets/piste/piste.json @@ -12,6 +12,9 @@ "line", "area" ], + "tags": { + "piste:type": "*" + }, "terms": [ "ski", "nordic", @@ -34,8 +37,5 @@ "ice", "skating" ], - "tags": { - "piste:type": "*" - }, - "name": "Winter Sport Trails" + "name": "Snowsports Trail / Piste" } diff --git a/data/presets/presets/piste/skitour.json b/data/presets/presets/piste/skitour.json index aaaf5c7b4..b8d5bb278 100644 --- a/data/presets/presets/piste/skitour.json +++ b/data/presets/presets/piste/skitour.json @@ -12,6 +12,9 @@ "line", "area" ], + "tags": { + "piste:type": "skitour" + }, "terms": [ "ski", "skitour", @@ -19,8 +22,5 @@ "ski touring", "piste" ], - "tags": { - "piste:type": "skitour" - }, "name": "Ski Touring Trail" } diff --git a/data/presets/presets/piste/sled.json b/data/presets/presets/piste/sled.json index 12bd6cb71..6fb0af0b4 100644 --- a/data/presets/presets/piste/sled.json +++ b/data/presets/presets/piste/sled.json @@ -12,16 +12,17 @@ "line", "area" ], - "terms": [ - "ski", - "sled", - "luge", - "sleigh", - "sledge", - "piste" - ], "tags": { "piste:type": "sled" }, - "name": "Sled Piste" + "terms": [ + "bobsled", + "luge", + "piste", + "skeleton", + "sledge", + "sleigh", + "toboggan" + ], + "name": "Sled Run" } diff --git a/data/presets/presets/piste/sleigh.json b/data/presets/presets/piste/sleigh.json index 061b4e412..077b2295c 100644 --- a/data/presets/presets/piste/sleigh.json +++ b/data/presets/presets/piste/sleigh.json @@ -12,19 +12,18 @@ "line", "area" ], - "terms": [ - "ski", - "piste", - "sled", - "luge", - "sleigh", - "sledge", - "ski-joring", - "husky", - "horse" - ], "tags": { "piste:type": "sleigh" }, - "name": "Sleigh Piste" + "terms": [ + "dogsledding", + "husky", + "horse", + "piste", + "sled", + "sledge", + "ski-joring", + "skijoring" + ], + "name": "Sleigh Trail" } diff --git a/data/taginfo.json b/data/taginfo.json index a7c9fd79b..480a32377 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -862,15 +862,15 @@ {"key": "office", "value": "telecommunication", "description": "🄿 Telecom Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/telephone-15.svg"}, {"key": "office", "value": "therapist", "description": "🄿 Therapist Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"}, {"key": "office", "value": "water_utility", "description": "🄿 Water Utility Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"}, - {"key": "piste:type", "value": "downhill", "description": "🄿 Downhill Piste/Ski Run, 🄵 Type", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-skiing.svg"}, - {"key": "man_made", "value": "piste:halfpipe", "description": "🄿 Halfpipe", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-snowboarding.svg"}, - {"key": "piste:type", "value": "hike", "description": "🄿 Snowshoeing or Winter Hiking Trail, 🄵 Type", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/snow_shoeing.svg"}, - {"key": "piste:type", "value": "ice_skate", "description": "🄿 Ice Skating Piste, 🄵 Type", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-skating.svg"}, - {"key": "piste:type", "value": "nordic", "description": "🄿 Nordic or Crosscountry Piste/Ski Trail, 🄵 Type", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-skiing-nordic.svg"}, - {"key": "piste:type", "description": "🄿 Winter Sport Trails", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-skiing.svg"}, + {"key": "piste:type", "value": "downhill", "description": "🄿 Downhill Ski Run, 🄵 Type", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-skiing.svg"}, + {"key": "man_made", "value": "piste:halfpipe", "description": "🄿 Snowsports Half-Pipe", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-snowboarding.svg"}, + {"key": "piste:type", "value": "hike", "description": "🄿 Snowshoeing / Winter Hiking Trail, 🄵 Type", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/snow_shoeing.svg"}, + {"key": "piste:type", "value": "ice_skate", "description": "🄿 Ice Skating Trail, 🄵 Type", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-skating.svg"}, + {"key": "piste:type", "value": "nordic", "description": "🄿 Cross-Country Ski Trail, 🄵 Type", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-skiing-nordic.svg"}, + {"key": "piste:type", "description": "🄿 Snowsports Trail / Piste", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-skiing.svg"}, {"key": "piste:type", "value": "skitour", "description": "🄿 Ski Touring Trail, 🄵 Type", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-skiing-nordic.svg"}, - {"key": "piste:type", "value": "sled", "description": "🄿 Sled Piste, 🄵 Type", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/sledding.svg"}, - {"key": "piste:type", "value": "sleigh", "description": "🄿 Sleigh Piste, 🄵 Type", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-sleigh.svg"}, + {"key": "piste:type", "value": "sled", "description": "🄿 Sled Run, 🄵 Type", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/sledding.svg"}, + {"key": "piste:type", "value": "sleigh", "description": "🄿 Sleigh Trail, 🄵 Type", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-sleigh.svg"}, {"key": "place", "value": "farm", "description": "🄿 Farm (unsearchable)", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/farm-15.svg"}, {"key": "place", "value": "city_block", "description": "🄿 City Block", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/triangle-stroked-15.svg"}, {"key": "place", "value": "city", "description": "🄿 City", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/city-15.svg"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 409bb5d90..d615f13c2 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -4967,51 +4967,51 @@ }, "aerialway/cable_car": { "name": "Cable Car", - "terms": "tramway,ropeway" + "terms": "aerial cable,lift,ropeway,skiing,snowboarding,tramway" }, "aerialway/chair_lift": { "name": "Chair Lift", - "terms": "" + "terms": "aerial cable,skiing,snowboarding" }, "aerialway/drag_lift": { "name": "Drag Lift", - "terms": "" + "terms": "skiing,snowboarding,surface cable" }, "aerialway/gondola": { "name": "Gondola", - "terms": "" + "terms": "aerial cable,lift,skiing,snowboarding" }, "aerialway/goods": { "name": "Goods Aerialway", - "terms": "" + "terms": "aerial cable" }, "aerialway/j-bar": { "name": "J-Bar Lift", - "terms": "jbar" + "terms": "drag lift,skiing,snowboarding,surface cable,jaybar,jbar" }, "aerialway/magic_carpet": { "name": "Magic Carpet Lift", - "terms": "" + "terms": "conveyor belt,skiing,snowboarding,surface lift" }, "aerialway/mixed_lift": { "name": "Mixed Lift", - "terms": "" + "terms": "aerial cable,skiing,snowboarding" }, "aerialway/platter": { "name": "Platter Lift", - "terms": "button lift,poma lift" + "terms": "button lift,disc lift,drag lift,poma lift,skiing,snowboarding,surface cable" }, "aerialway/pylon": { "name": "Aerialway Pylon", - "terms": "" + "terms": "chair lift pole,skiing,snowboarding,lift tower" }, "aerialway/rope_tow": { "name": "Rope Tow Lift", - "terms": "handle tow,bugel lift" + "terms": "bugel lift,drag lift,handle tow,skiing,snowboarding,surface cable" }, "aerialway/t-bar": { "name": "T-Bar Lift", - "terms": "tbar" + "terms": "drag lift,skiing,surface cable,tbar" }, "aerialway/zip_line": { "name": "Zip Line", @@ -8356,27 +8356,27 @@ "terms": "water board,utility" }, "piste/downhill": { - "name": "Downhill Piste/Ski Run", - "terms": "ski,alpine,snowboard,downhill,piste" + "name": "Downhill Ski Run", + "terms": "alpine skiing,piste,ski hill,skiing,snowboarding" }, "piste/downhill/halfpipe": { - "name": "Halfpipe", + "name": "Snowsports Half-Pipe", "terms": "ski,alpine,halfpipe,half pipe,snowboard,downhill,piste" }, "piste/hike": { - "name": "Snowshoeing or Winter Hiking Trail", - "terms": "hike,winter hiking,snowshoe,snowshoeing,piste,ski" + "name": "Snowshoeing / Winter Hiking Trail", + "terms": "hike,nordic walking,piste,show shoeing,snowshoe,snowshoeing" }, "piste/ice_skate": { - "name": "Ice Skating Piste", - "terms": "ice,skating,ski,piste" + "name": "Ice Skating Trail", + "terms": "ice rink,ice track,iceskating,piste,skates" }, "piste/nordic": { - "name": "Nordic or Crosscountry Piste/Ski Trail", - "terms": "ski,nordic,crosscountry,skating,piste" + "name": "Cross-Country Ski Trail", + "terms": "crosscountry,nordic skiing,piste,skate skiing,skiing,xc" }, "piste/piste": { - "name": "Winter Sport Trails", + "name": "Snowsports Trail / Piste", "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": { @@ -8384,12 +8384,12 @@ "terms": "ski,skitour,crosscountry,ski touring,piste" }, "piste/sled": { - "name": "Sled Piste", - "terms": "ski,sled,luge,sleigh,sledge,piste" + "name": "Sled Run", + "terms": "bobsled,luge,piste,skeleton,sledge,sleigh,toboggan" }, "piste/sleigh": { - "name": "Sleigh Piste", - "terms": "ski,piste,sled,luge,sleigh,sledge,ski-joring,husky,horse" + "name": "Sleigh Trail", + "terms": "dogsledding,husky,horse,piste,sled,sledge,ski-joring,skijoring" }, "place/farm": { "name": "Farm"