From b099872a8b11e0f856cc41dad9617dd32be5a345 Mon Sep 17 00:00:00 2001 From: Wille Marcel Date: Thu, 17 Aug 2017 10:12:29 -0300 Subject: [PATCH] add presets for theme park attractions --- data/presets.yaml | 71 +++++ data/presets/fields.json | 7 + data/presets/fields/species.json | 7 + data/presets/presets.json | 298 +++++++++++++++++- .../presets/attraction/amusement_ride.json | 20 ++ data/presets/presets/attraction/animal.json | 24 ++ .../presets/presets/attraction/big_wheel.json | 20 ++ .../presets/attraction/bumper_car.json | 21 ++ .../presets/attraction/bungee_jumping.json | 21 ++ data/presets/presets/attraction/carousel.json | 25 ++ .../presets/presets/attraction/dark_ride.json | 21 ++ .../presets/attraction/drop_tower.json | 24 ++ .../presets/attraction/pirate_ship.json | 20 ++ .../presets/attraction/river_rafting.json | 24 ++ .../presets/attraction/roller_coaster.json | 20 ++ data/presets/presets/attraction/train.json | 25 ++ .../presets/attraction/water_slide.json | 24 ++ data/presets/presets/natural/tree.json | 1 + data/taginfo.json | 52 +++ dist/locales/en.json | 58 +++- 20 files changed, 781 insertions(+), 2 deletions(-) create mode 100644 data/presets/fields/species.json create mode 100644 data/presets/presets/attraction/amusement_ride.json create mode 100644 data/presets/presets/attraction/animal.json create mode 100644 data/presets/presets/attraction/big_wheel.json create mode 100644 data/presets/presets/attraction/bumper_car.json create mode 100644 data/presets/presets/attraction/bungee_jumping.json create mode 100644 data/presets/presets/attraction/carousel.json create mode 100644 data/presets/presets/attraction/dark_ride.json create mode 100644 data/presets/presets/attraction/drop_tower.json create mode 100644 data/presets/presets/attraction/pirate_ship.json create mode 100644 data/presets/presets/attraction/river_rafting.json create mode 100644 data/presets/presets/attraction/roller_coaster.json create mode 100644 data/presets/presets/attraction/train.json create mode 100644 data/presets/presets/attraction/water_slide.json diff --git a/data/presets.yaml b/data/presets.yaml index 5895a11b2..f00b9e4ca 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -1219,6 +1219,11 @@ en: source: # source=* label: Source + species: + # species=* + label: Scientific Name + # species field placeholder + placeholder: Scientific name of the species sport: # sport=* label: Sports @@ -2101,6 +2106,71 @@ en: # 'area:highway=*' name: Road Surface terms: '' + attraction/amusement_ride: + # attraction=amusement_ride + name: Amusement Ride + # 'terms: theme park,carnival ride' + terms: '' + attraction/animal: + # attraction=animal + name: Animal + # 'terms: zoo,theme park,animal park,lion,tiger,bear' + terms: '' + attraction/big_wheel: + # attraction=big_wheel + name: Big Wheel + # 'terms: ferris wheel,theme park,amusement ride' + terms: '' + attraction/bumper_car: + # attraction=bumper_car + name: Bumper Car + # 'terms: theme park,dodgem cars,autoscooter' + terms: '' + attraction/bungee_jumping: + # attraction=bungee_jumping + name: Bungee Jumping + # 'terms: theme park,bungy jumping,jumping platform' + terms: '' + attraction/carousel: + # attraction=carousel + name: Carousel + # 'terms: theme park,roundabout,merry-go-round,galloper,jumper,horseabout,flying horses' + terms: '' + attraction/dark_ride: + # attraction=dark_ride + name: Dark Ride + # 'terms: theme park,ghost train' + terms: '' + attraction/drop_tower: + # attraction=drop_tower + name: Drop Tower + # 'terms: theme park,amusement ride,gondola,tower,big drop' + terms: '' + attraction/pirate_ship: + # attraction=pirate_ship + name: Pirate Ship + # 'terms: theme park,carnival ride,amusement ride' + terms: '' + attraction/river_rafting: + # attraction=river_rafting + name: River Rafting + # 'terms: theme park,aquatic park,water park,rafting simulator,river rafting ride,river rapids ride' + terms: '' + attraction/roller_coaster: + # attraction=roller_coaster + name: Roller Coaster + # 'terms: theme park,amusement ride' + terms: '' + attraction/train: + # attraction=train + name: Tourist Train + # 'terms: theme park,rackless train,road train,Tschu-Tschu train,dotto train,park train' + terms: '' + attraction/water_slide: + # attraction=water_slide + name: Water Slide + # 'terms: theme park,aquatic park,water park,flumes,water chutes,hydroslides' + terms: '' barrier: # barrier=* name: Barrier @@ -3556,6 +3626,7 @@ en: natural/wetland: # natural=wetland name: Wetland + # 'terms: bog,marsh,reedbed,swamp,tidalflat' terms: '' natural/wood: # natural=wood diff --git a/data/presets/fields.json b/data/presets/fields.json index e099f5416..1b6e8224d 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -1629,6 +1629,13 @@ "universal": true, "label": "Source" }, + "species": { + "key": "species", + "type": "localized", + "label": "Scientific Name", + "universal": true, + "placeholder": "Scientific name of the species" + }, "sport_ice": { "key": "sport", "type": "semiCombo", diff --git a/data/presets/fields/species.json b/data/presets/fields/species.json new file mode 100644 index 000000000..dcb010f51 --- /dev/null +++ b/data/presets/fields/species.json @@ -0,0 +1,7 @@ +{ + "key": "species", + "type": "localized", + "label": "Scientific Name", + "universal": true, + "placeholder": "Scientific name of the species" +} diff --git a/data/presets/presets.json b/data/presets/presets.json index 936001dd7..045b260c5 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -3317,6 +3317,295 @@ }, "name": "Road Surface" }, + "attraction/amusement_ride": { + "icon": "amusement-park", + "fields": [ + "name", + "operator", + "opening_hours" + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "theme park", + "carnival ride" + ], + "tags": { + "attraction": "amusement_ride" + }, + "name": "Amusement Ride" + }, + "attraction/animal": { + "icon": "zoo", + "fields": [ + "name", + "species", + "operator" + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "zoo", + "theme park", + "animal park", + "lion", + "tiger", + "bear" + ], + "tags": { + "attraction": "animal" + }, + "name": "Animal" + }, + "attraction/big_wheel": { + "icon": "amusement-park", + "fields": [ + "name", + "operator", + "opening_hours" + ], + "geometry": [ + "point" + ], + "terms": [ + "ferris wheel", + "theme park", + "amusement ride" + ], + "tags": { + "attraction": "big_wheel" + }, + "name": "Big Wheel" + }, + "attraction/bumper_car": { + "icon": "car", + "fields": [ + "name", + "operator", + "opening_hours" + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "theme park", + "dodgem cars", + "autoscooter" + ], + "tags": { + "attraction": "bumper_car" + }, + "name": "Bumper Car" + }, + "attraction/bungee_jumping": { + "icon": "pitch", + "fields": [ + "name", + "operator", + "opening_hours" + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "theme park", + "bungy jumping", + "jumping platform" + ], + "tags": { + "attraction": "bungee_jumping" + }, + "name": "Bungee Jumping" + }, + "attraction/carousel": { + "icon": "horse-riding", + "fields": [ + "name", + "operator", + "opening_hours" + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "theme park", + "roundabout", + "merry-go-round", + "galloper", + "jumper", + "horseabout", + "flying horses" + ], + "tags": { + "attraction": "carousel" + }, + "name": "Carousel" + }, + "attraction/dark_ride": { + "icon": "rail-metro", + "fields": [ + "name", + "operator", + "opening_hours" + ], + "geometry": [ + "point", + "line", + "area" + ], + "terms": [ + "theme park", + "ghost train" + ], + "tags": { + "attraction": "dark_ride" + }, + "name": "Dark Ride" + }, + "attraction/drop_tower": { + "icon": "poi-tower", + "fields": [ + "name", + "operator", + "height", + "opening_hours" + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "theme park", + "amusement ride", + "gondola", + "tower", + "big drop" + ], + "tags": { + "attraction": "drop_tower" + }, + "name": "Drop Tower" + }, + "attraction/pirate_ship": { + "icon": "amusement-park", + "fields": [ + "name", + "operator", + "opening_hours" + ], + "geometry": [ + "point" + ], + "terms": [ + "theme park", + "carnival ride", + "amusement ride" + ], + "tags": { + "attraction": "pirate_ship" + }, + "name": "Pirate Ship" + }, + "attraction/river_rafting": { + "icon": "ferry", + "fields": [ + "name", + "operator", + "opening_hours" + ], + "geometry": [ + "point", + "line" + ], + "terms": [ + "theme park", + "aquatic park", + "water park", + "rafting simulator", + "river rafting ride", + "river rapids ride" + ], + "tags": { + "attraction": "river_rafting" + }, + "name": "River Rafting" + }, + "attraction/roller_coaster": { + "icon": "amusement-park", + "fields": [ + "name", + "operator", + "opening_hours" + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "theme park", + "amusement ride" + ], + "tags": { + "attraction": "roller_coaster" + }, + "name": "Roller Coaster" + }, + "attraction/train": { + "icon": "rail", + "fields": [ + "name", + "operator", + "fee", + "opening_hours" + ], + "geometry": [ + "point", + "line" + ], + "terms": [ + "theme park", + "rackless train", + "road train", + "Tschu-Tschu train", + "dotto train", + "park train" + ], + "tags": { + "attraction": "train" + }, + "name": "Tourist Train" + }, + "attraction/water_slide": { + "icon": "swimming", + "fields": [ + "name", + "operator", + "opening_hours" + ], + "geometry": [ + "line", + "area" + ], + "terms": [ + "theme park", + "aquatic park", + "water park", + "flumes", + "water chutes", + "hydroslides" + ], + "tags": { + "attraction": "water_slide" + }, + "name": "Water Slide" + }, "barrier": { "icon": "roadblock", "geometry": [ @@ -9570,6 +9859,7 @@ "natural/tree": { "icon": "park", "fields": [ + "species", "leaf_type_singular", "leaf_cycle_singular", "denotation" @@ -9694,7 +9984,13 @@ "tags": { "natural": "wetland" }, - "terms": [], + "terms": [ + "bog", + "marsh", + "reedbed", + "swamp", + "tidalflat" + ], "name": "Wetland" }, "natural/wood": { diff --git a/data/presets/presets/attraction/amusement_ride.json b/data/presets/presets/attraction/amusement_ride.json new file mode 100644 index 000000000..52fbe5c7a --- /dev/null +++ b/data/presets/presets/attraction/amusement_ride.json @@ -0,0 +1,20 @@ +{ + "icon": "amusement-park", + "fields": [ + "name", + "operator", + "opening_hours" + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "theme park", + "carnival ride" + ], + "tags": { + "attraction": "amusement_ride" + }, + "name": "Amusement Ride" +} diff --git a/data/presets/presets/attraction/animal.json b/data/presets/presets/attraction/animal.json new file mode 100644 index 000000000..16baf27e8 --- /dev/null +++ b/data/presets/presets/attraction/animal.json @@ -0,0 +1,24 @@ +{ + "icon": "zoo", + "fields": [ + "name", + "species", + "operator" + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "zoo", + "theme park", + "animal park", + "lion", + "tiger", + "bear" + ], + "tags": { + "attraction": "animal" + }, + "name": "Animal" +} diff --git a/data/presets/presets/attraction/big_wheel.json b/data/presets/presets/attraction/big_wheel.json new file mode 100644 index 000000000..ff2c12261 --- /dev/null +++ b/data/presets/presets/attraction/big_wheel.json @@ -0,0 +1,20 @@ +{ + "icon": "amusement-park", + "fields": [ + "name", + "operator", + "opening_hours" + ], + "geometry": [ + "point" + ], + "terms": [ + "ferris wheel", + "theme park", + "amusement ride" + ], + "tags": { + "attraction": "big_wheel" + }, + "name": "Big Wheel" +} diff --git a/data/presets/presets/attraction/bumper_car.json b/data/presets/presets/attraction/bumper_car.json new file mode 100644 index 000000000..d96e75f1f --- /dev/null +++ b/data/presets/presets/attraction/bumper_car.json @@ -0,0 +1,21 @@ +{ + "icon": "car", + "fields": [ + "name", + "operator", + "opening_hours" + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "theme park", + "dodgem cars", + "autoscooter" + ], + "tags": { + "attraction": "bumper_car" + }, + "name": "Bumper Car" +} diff --git a/data/presets/presets/attraction/bungee_jumping.json b/data/presets/presets/attraction/bungee_jumping.json new file mode 100644 index 000000000..7e7f83b8c --- /dev/null +++ b/data/presets/presets/attraction/bungee_jumping.json @@ -0,0 +1,21 @@ +{ + "icon": "pitch", + "fields": [ + "name", + "operator", + "opening_hours" + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "theme park", + "bungy jumping", + "jumping platform" + ], + "tags": { + "attraction": "bungee_jumping" + }, + "name": "Bungee Jumping" +} diff --git a/data/presets/presets/attraction/carousel.json b/data/presets/presets/attraction/carousel.json new file mode 100644 index 000000000..3ae2ce844 --- /dev/null +++ b/data/presets/presets/attraction/carousel.json @@ -0,0 +1,25 @@ +{ + "icon": "horse-riding", + "fields": [ + "name", + "operator", + "opening_hours" + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "theme park", + "roundabout", + "merry-go-round", + "galloper", + "jumper", + "horseabout", + "flying horses" + ], + "tags": { + "attraction": "carousel" + }, + "name": "Carousel" +} diff --git a/data/presets/presets/attraction/dark_ride.json b/data/presets/presets/attraction/dark_ride.json new file mode 100644 index 000000000..bc0c9c02d --- /dev/null +++ b/data/presets/presets/attraction/dark_ride.json @@ -0,0 +1,21 @@ +{ + "icon": "rail-metro", + "fields": [ + "name", + "operator", + "opening_hours" + ], + "geometry": [ + "point", + "line", + "area" + ], + "terms": [ + "theme park", + "ghost train" + ], + "tags": { + "attraction": "dark_ride" + }, + "name": "Dark Ride" +} diff --git a/data/presets/presets/attraction/drop_tower.json b/data/presets/presets/attraction/drop_tower.json new file mode 100644 index 000000000..6e14a2eea --- /dev/null +++ b/data/presets/presets/attraction/drop_tower.json @@ -0,0 +1,24 @@ +{ + "icon": "poi-tower", + "fields": [ + "name", + "operator", + "height", + "opening_hours" + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "theme park", + "amusement ride", + "gondola", + "tower", + "big drop" + ], + "tags": { + "attraction": "drop_tower" + }, + "name": "Drop Tower" +} diff --git a/data/presets/presets/attraction/pirate_ship.json b/data/presets/presets/attraction/pirate_ship.json new file mode 100644 index 000000000..cb2edd425 --- /dev/null +++ b/data/presets/presets/attraction/pirate_ship.json @@ -0,0 +1,20 @@ +{ + "icon": "amusement-park", + "fields": [ + "name", + "operator", + "opening_hours" + ], + "geometry": [ + "point" + ], + "terms": [ + "theme park", + "carnival ride", + "amusement ride" + ], + "tags": { + "attraction": "pirate_ship" + }, + "name": "Pirate Ship" +} diff --git a/data/presets/presets/attraction/river_rafting.json b/data/presets/presets/attraction/river_rafting.json new file mode 100644 index 000000000..681ee1106 --- /dev/null +++ b/data/presets/presets/attraction/river_rafting.json @@ -0,0 +1,24 @@ +{ + "icon": "ferry", + "fields": [ + "name", + "operator", + "opening_hours" + ], + "geometry": [ + "point", + "line" + ], + "terms": [ + "theme park", + "aquatic park", + "water park", + "rafting simulator", + "river rafting ride", + "river rapids ride" + ], + "tags": { + "attraction": "river_rafting" + }, + "name": "River Rafting" +} diff --git a/data/presets/presets/attraction/roller_coaster.json b/data/presets/presets/attraction/roller_coaster.json new file mode 100644 index 000000000..74b75b5a6 --- /dev/null +++ b/data/presets/presets/attraction/roller_coaster.json @@ -0,0 +1,20 @@ +{ + "icon": "amusement-park", + "fields": [ + "name", + "operator", + "opening_hours" + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "theme park", + "amusement ride" + ], + "tags": { + "attraction": "roller_coaster" + }, + "name": "Roller Coaster" +} diff --git a/data/presets/presets/attraction/train.json b/data/presets/presets/attraction/train.json new file mode 100644 index 000000000..079699dc8 --- /dev/null +++ b/data/presets/presets/attraction/train.json @@ -0,0 +1,25 @@ +{ + "icon": "rail", + "fields": [ + "name", + "operator", + "fee", + "opening_hours" + ], + "geometry": [ + "point", + "line" + ], + "terms": [ + "theme park", + "rackless train", + "road train", + "Tschu-Tschu train", + "dotto train", + "park train" + ], + "tags": { + "attraction": "train" + }, + "name": "Tourist Train" +} diff --git a/data/presets/presets/attraction/water_slide.json b/data/presets/presets/attraction/water_slide.json new file mode 100644 index 000000000..692629753 --- /dev/null +++ b/data/presets/presets/attraction/water_slide.json @@ -0,0 +1,24 @@ +{ + "icon": "swimming", + "fields": [ + "name", + "operator", + "opening_hours" + ], + "geometry": [ + "line", + "area" + ], + "terms": [ + "theme park", + "aquatic park", + "water park", + "flumes", + "water chutes", + "hydroslides" + ], + "tags": { + "attraction": "water_slide" + }, + "name": "Water Slide" +} diff --git a/data/presets/presets/natural/tree.json b/data/presets/presets/natural/tree.json index a5066822a..e3fe5c5dd 100644 --- a/data/presets/presets/natural/tree.json +++ b/data/presets/presets/natural/tree.json @@ -1,6 +1,7 @@ { "icon": "park", "fields": [ + "species", "leaf_type_singular", "leaf_cycle_singular", "denotation" diff --git a/data/taginfo.json b/data/taginfo.json index 0dfc9f114..c262685d8 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -606,6 +606,58 @@ { "key": "area:highway" }, + { + "key": "attraction", + "value": "amusement_ride" + }, + { + "key": "attraction", + "value": "animal" + }, + { + "key": "attraction", + "value": "big_wheel" + }, + { + "key": "attraction", + "value": "bumper_car" + }, + { + "key": "attraction", + "value": "bungee_jumping" + }, + { + "key": "attraction", + "value": "carousel" + }, + { + "key": "attraction", + "value": "dark_ride" + }, + { + "key": "attraction", + "value": "drop_tower" + }, + { + "key": "attraction", + "value": "pirate_ship" + }, + { + "key": "attraction", + "value": "river_rafting" + }, + { + "key": "attraction", + "value": "roller_coaster" + }, + { + "key": "attraction", + "value": "train" + }, + { + "key": "attraction", + "value": "water_slide" + }, { "key": "barrier" }, diff --git a/dist/locales/en.json b/dist/locales/en.json index 2f4cfb3f9..e7271d1cc 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -2096,6 +2096,10 @@ "source": { "label": "Source" }, + "species": { + "label": "Scientific Name", + "placeholder": "Scientific name of the species" + }, "sport_ice": { "label": "Sports" }, @@ -2885,6 +2889,58 @@ "name": "Road Surface", "terms": "" }, + "attraction/amusement_ride": { + "name": "Amusement Ride", + "terms": "theme park,carnival ride" + }, + "attraction/animal": { + "name": "Animal", + "terms": "zoo,theme park,animal park,lion,tiger,bear" + }, + "attraction/big_wheel": { + "name": "Big Wheel", + "terms": "ferris wheel,theme park,amusement ride" + }, + "attraction/bumper_car": { + "name": "Bumper Car", + "terms": "theme park,dodgem cars,autoscooter" + }, + "attraction/bungee_jumping": { + "name": "Bungee Jumping", + "terms": "theme park,bungy jumping,jumping platform" + }, + "attraction/carousel": { + "name": "Carousel", + "terms": "theme park,roundabout,merry-go-round,galloper,jumper,horseabout,flying horses" + }, + "attraction/dark_ride": { + "name": "Dark Ride", + "terms": "theme park,ghost train" + }, + "attraction/drop_tower": { + "name": "Drop Tower", + "terms": "theme park,amusement ride,gondola,tower,big drop" + }, + "attraction/pirate_ship": { + "name": "Pirate Ship", + "terms": "theme park,carnival ride,amusement ride" + }, + "attraction/river_rafting": { + "name": "River Rafting", + "terms": "theme park,aquatic park,water park,rafting simulator,river rafting ride,river rapids ride" + }, + "attraction/roller_coaster": { + "name": "Roller Coaster", + "terms": "theme park,amusement ride" + }, + "attraction/train": { + "name": "Tourist Train", + "terms": "theme park,rackless train,road train,Tschu-Tschu train,dotto train,park train" + }, + "attraction/water_slide": { + "name": "Water Slide", + "terms": "theme park,aquatic park,water park,flumes,water chutes,hydroslides" + }, "barrier": { "name": "Barrier", "terms": "" @@ -4211,7 +4267,7 @@ }, "natural/wetland": { "name": "Wetland", - "terms": "" + "terms": "bog,marsh,reedbed,swamp,tidalflat" }, "natural/wood": { "name": "Wood",