From 512dfaa52c02273ab6d5ebc5bf8cd71b5470fec8 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Tue, 15 Jan 2019 15:28:01 -0500 Subject: [PATCH] Updated attraction presets to use field inheritance Added generic attraction preset with attraction typeCombo field --- data/presets.yaml | 6 ++++ data/presets/fields.json | 1 + data/presets/fields/attraction.json | 5 ++++ data/presets/presets.json | 29 ++++++++++--------- data/presets/presets/_attraction.json | 25 ++++++++++++++++ .../presets/attraction/amusement_ride.json | 5 ---- .../presets/presets/attraction/big_wheel.json | 6 ++-- .../presets/attraction/bumper_car.json | 5 ---- .../presets/attraction/bungee_jumping.json | 6 ++-- data/presets/presets/attraction/carousel.json | 5 ---- .../presets/presets/attraction/dark_ride.json | 5 ---- .../presets/attraction/drop_tower.json | 6 ++-- data/presets/presets/attraction/maze.json | 4 --- .../presets/attraction/pirate_ship.json | 5 ---- .../presets/attraction/river_rafting.json | 5 ---- .../presets/attraction/roller_coaster.json | 5 ---- .../presets/attraction/summer_toboggan.json | 5 ---- data/presets/presets/attraction/train.json | 6 ++-- .../presets/attraction/water_slide.json | 5 ++-- data/taginfo.json | 6 ++++ dist/locales/en.json | 7 +++++ 21 files changed, 75 insertions(+), 77 deletions(-) create mode 100644 data/presets/fields/attraction.json create mode 100644 data/presets/presets/_attraction.json diff --git a/data/presets.yaml b/data/presets.yaml index 724357399..25974f489 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -199,6 +199,9 @@ en: atm: # atm=* label: ATM + attraction: + # attraction=* + label: Type backrest: # backrest=* label: Backrest @@ -3014,6 +3017,9 @@ en: # 'area:highway=*' name: Road Surface terms: '' + attraction: + # attraction=* + name: Attraction attraction/amusement_ride: # attraction=amusement_ride name: Amusement Ride diff --git a/data/presets/fields.json b/data/presets/fields.json index 312dcd093..18681d99e 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -22,6 +22,7 @@ "artist": {"key": "artist_name", "type": "text", "label": "Artist"}, "artwork_type": {"key": "artwork_type", "type": "combo", "label": "Type"}, "atm": {"key": "atm", "type": "check", "label": "ATM"}, + "attraction": {"key": "attraction", "type": "typeCombo", "label": "Type"}, "backrest": {"key": "backrest", "type": "check", "label": "Backrest"}, "barrier": {"key": "barrier", "type": "typeCombo", "label": "Type"}, "basin": {"key": "basin", "type": "combo", "label": "Type"}, diff --git a/data/presets/fields/attraction.json b/data/presets/fields/attraction.json new file mode 100644 index 000000000..5d95269a6 --- /dev/null +++ b/data/presets/fields/attraction.json @@ -0,0 +1,5 @@ +{ + "key": "attraction", + "type": "typeCombo", + "label": "Type" +} diff --git a/data/presets/presets.json b/data/presets/presets.json index 4a8f8c3be..6fc557175 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -3,6 +3,7 @@ "aerialway": {"fields": ["aerialway"], "geometry": ["point", "vertex", "line"], "tags": {"aerialway": "*"}, "terms": ["ski lift", "funifor", "funitel"], "searchable": false, "name": "Aerialway"}, "aeroway": {"icon": "maki-airport", "fields": ["aeroway"], "geometry": ["point", "vertex", "line", "area"], "tags": {"aeroway": "*"}, "searchable": false, "name": "Aeroway"}, "amenity": {"fields": ["amenity"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "*"}, "searchable": false, "name": "Amenity"}, + "attraction": {"icon": "maki-star", "fields": ["name", "attraction", "operator", "opening_hours"], "moreFields": ["address", "opening_hours", "fee"], "geometry": ["point", "vertex", "line", "area"], "tags": {"attraction": "*"}, "searchable": false, "name": "Attraction"}, "circular": {"geometry": ["vertex", "line"], "fields": ["name"], "tags": {"junction": "circular"}, "name": "Traffic Circle", "searchable": false}, "embankment": {"geometry": ["line"], "tags": {"embankment": "yes"}, "name": "Embankment", "matchScore": 0.2, "searchable": false}, "highway": {"fields": ["name", "highway"], "geometry": ["point", "vertex", "line", "area"], "tags": {"highway": "*"}, "searchable": false, "name": "Highway"}, @@ -209,21 +210,21 @@ "amenity/watering_place": {"icon": "maki-drinking-water", "geometry": ["area", "vertex", "point"], "tags": {"amenity": "watering_place"}, "name": "Animal Watering Place"}, "area": {"fields": ["name"], "geometry": ["area"], "tags": {"area": "yes"}, "name": "Area", "matchScore": 0.1}, "area/highway": {"fields": ["name", "area/highway"], "geometry": ["area"], "tags": {"area:highway": "*"}, "name": "Road Surface"}, - "attraction/amusement_ride": {"icon": "maki-amusement-park", "fields": ["name", "operator", "opening_hours"], "geometry": ["point", "area"], "terms": ["theme park", "carnival ride"], "tags": {"attraction": "amusement_ride"}, "name": "Amusement Ride"}, + "attraction/amusement_ride": {"icon": "maki-amusement-park", "geometry": ["point", "area"], "terms": ["theme park", "carnival ride"], "tags": {"attraction": "amusement_ride"}, "name": "Amusement Ride"}, "attraction/animal": {"icon": "maki-zoo", "fields": ["name", "operator"], "geometry": ["point", "area"], "terms": ["zoo", "theme park", "animal park", "lion", "tiger", "bear"], "tags": {"attraction": "animal"}, "name": "Animal"}, - "attraction/big_wheel": {"icon": "maki-amusement-park", "fields": ["name", "operator", "height", "opening_hours"], "geometry": ["point"], "terms": ["ferris wheel", "theme park", "amusement ride"], "tags": {"attraction": "big_wheel"}, "name": "Big Wheel"}, - "attraction/bumper_car": {"icon": "maki-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": "maki-pitch", "fields": ["name", "operator", "height", "opening_hours"], "geometry": ["point", "area"], "terms": ["theme park", "bungy jumping", "jumping platform"], "tags": {"attraction": "bungee_jumping"}, "name": "Bungee Jumping"}, - "attraction/carousel": {"icon": "maki-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": "maki-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": "temaki-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/maze": {"icon": "maki-amusement-park", "fields": ["name", "operator"], "geometry": ["point", "area"], "terms": ["theme park", "amusement ride", "labyrinth"], "tags": {"attraction": "maze"}, "name": "Maze"}, - "attraction/pirate_ship": {"icon": "maki-danger", "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": "maki-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": "maki-amusement-park", "fields": ["name", "operator", "opening_hours"], "geometry": ["point", "area"], "terms": ["theme park", "amusement ride"], "tags": {"attraction": "roller_coaster"}, "name": "Roller Coaster"}, - "attraction/summer_toboggan": {"fields": ["name", "operator", "opening_hours"], "geometry": ["line"], "terms": ["alpine slide", "mountain coaster"], "tags": {"attraction": "summer_toboggan"}, "name": "Summer Toboggan"}, - "attraction/train": {"icon": "maki-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": "maki-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"}, + "attraction/big_wheel": {"icon": "maki-amusement-park", "fields": ["{attraction}", "height"], "geometry": ["point"], "terms": ["ferris wheel", "theme park", "amusement ride"], "tags": {"attraction": "big_wheel"}, "name": "Big Wheel"}, + "attraction/bumper_car": {"icon": "maki-car", "geometry": ["point", "area"], "terms": ["theme park", "dodgem cars", "autoscooter"], "tags": {"attraction": "bumper_car"}, "name": "Bumper Car"}, + "attraction/bungee_jumping": {"icon": "maki-pitch", "fields": ["{attraction}", "height"], "geometry": ["point", "area"], "terms": ["theme park", "bungy jumping", "jumping platform"], "tags": {"attraction": "bungee_jumping"}, "name": "Bungee Jumping"}, + "attraction/carousel": {"icon": "maki-horse-riding", "geometry": ["point", "area"], "terms": ["theme park", "roundabout", "merry-go-round", "galloper", "jumper", "horseabout", "flying horses"], "tags": {"attraction": "carousel"}, "name": "Carousel"}, + "attraction/dark_ride": {"icon": "maki-rail-metro", "geometry": ["point", "line", "area"], "terms": ["theme park", "ghost train"], "tags": {"attraction": "dark_ride"}, "name": "Dark Ride"}, + "attraction/drop_tower": {"icon": "temaki-tower", "fields": ["{attraction}", "height"], "geometry": ["point", "area"], "terms": ["theme park", "amusement ride", "gondola", "tower", "big drop"], "tags": {"attraction": "drop_tower"}, "name": "Drop Tower"}, + "attraction/maze": {"icon": "maki-amusement-park", "geometry": ["point", "area"], "terms": ["theme park", "amusement ride", "labyrinth"], "tags": {"attraction": "maze"}, "name": "Maze"}, + "attraction/pirate_ship": {"icon": "maki-danger", "geometry": ["point"], "terms": ["theme park", "carnival ride", "amusement ride"], "tags": {"attraction": "pirate_ship"}, "name": "Pirate Ship"}, + "attraction/river_rafting": {"icon": "maki-ferry", "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": "maki-amusement-park", "geometry": ["point", "area"], "terms": ["theme park", "amusement ride"], "tags": {"attraction": "roller_coaster"}, "name": "Roller Coaster"}, + "attraction/summer_toboggan": {"geometry": ["line"], "terms": ["alpine slide", "mountain coaster"], "tags": {"attraction": "summer_toboggan"}, "name": "Summer Toboggan"}, + "attraction/train": {"icon": "maki-rail", "fields": ["{attraction}", "fee"], "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": "maki-swimming", "fields": ["{attraction}", "height"], "geometry": ["line", "area"], "terms": ["theme park", "aquatic park", "water park", "flumes", "water chutes", "hydroslides"], "tags": {"attraction": "water_slide"}, "name": "Water Slide"}, "barrier": {"icon": "maki-roadblock", "moreFields": ["material"], "geometry": ["point", "vertex", "line", "area"], "tags": {"barrier": "*"}, "fields": ["barrier"], "name": "Barrier", "matchScore": 0.4}, "barrier/entrance": {"icon": "maki-entrance-alt1", "geometry": ["vertex"], "tags": {"barrier": "entrance"}, "name": "Entrance", "searchable": false}, "barrier/block": {"icon": "maki-roadblock", "fields": ["access"], "moreFields": ["material"], "geometry": ["point", "vertex"], "tags": {"barrier": "block"}, "name": "Block"}, diff --git a/data/presets/presets/_attraction.json b/data/presets/presets/_attraction.json new file mode 100644 index 000000000..31bcdb4d3 --- /dev/null +++ b/data/presets/presets/_attraction.json @@ -0,0 +1,25 @@ +{ + "icon": "maki-star", + "fields": [ + "name", + "attraction", + "operator", + "opening_hours" + ], + "moreFields": [ + "address", + "opening_hours", + "fee" + ], + "geometry": [ + "point", + "vertex", + "line", + "area" + ], + "tags": { + "attraction": "*" + }, + "searchable": false, + "name": "Attraction" +} diff --git a/data/presets/presets/attraction/amusement_ride.json b/data/presets/presets/attraction/amusement_ride.json index 2e9a3dba4..a46b232c4 100644 --- a/data/presets/presets/attraction/amusement_ride.json +++ b/data/presets/presets/attraction/amusement_ride.json @@ -1,10 +1,5 @@ { "icon": "maki-amusement-park", - "fields": [ - "name", - "operator", - "opening_hours" - ], "geometry": [ "point", "area" diff --git a/data/presets/presets/attraction/big_wheel.json b/data/presets/presets/attraction/big_wheel.json index d7061198e..49e80c85a 100644 --- a/data/presets/presets/attraction/big_wheel.json +++ b/data/presets/presets/attraction/big_wheel.json @@ -1,10 +1,8 @@ { "icon": "maki-amusement-park", "fields": [ - "name", - "operator", - "height", - "opening_hours" + "{attraction}", + "height" ], "geometry": [ "point" diff --git a/data/presets/presets/attraction/bumper_car.json b/data/presets/presets/attraction/bumper_car.json index 7288b31a5..f22f35abb 100644 --- a/data/presets/presets/attraction/bumper_car.json +++ b/data/presets/presets/attraction/bumper_car.json @@ -1,10 +1,5 @@ { "icon": "maki-car", - "fields": [ - "name", - "operator", - "opening_hours" - ], "geometry": [ "point", "area" diff --git a/data/presets/presets/attraction/bungee_jumping.json b/data/presets/presets/attraction/bungee_jumping.json index 8d70f1d68..d8792941b 100644 --- a/data/presets/presets/attraction/bungee_jumping.json +++ b/data/presets/presets/attraction/bungee_jumping.json @@ -1,10 +1,8 @@ { "icon": "maki-pitch", "fields": [ - "name", - "operator", - "height", - "opening_hours" + "{attraction}", + "height" ], "geometry": [ "point", diff --git a/data/presets/presets/attraction/carousel.json b/data/presets/presets/attraction/carousel.json index e227832f6..44f4edf67 100644 --- a/data/presets/presets/attraction/carousel.json +++ b/data/presets/presets/attraction/carousel.json @@ -1,10 +1,5 @@ { "icon": "maki-horse-riding", - "fields": [ - "name", - "operator", - "opening_hours" - ], "geometry": [ "point", "area" diff --git a/data/presets/presets/attraction/dark_ride.json b/data/presets/presets/attraction/dark_ride.json index 593862d92..9929aad22 100644 --- a/data/presets/presets/attraction/dark_ride.json +++ b/data/presets/presets/attraction/dark_ride.json @@ -1,10 +1,5 @@ { "icon": "maki-rail-metro", - "fields": [ - "name", - "operator", - "opening_hours" - ], "geometry": [ "point", "line", diff --git a/data/presets/presets/attraction/drop_tower.json b/data/presets/presets/attraction/drop_tower.json index 4a7bd0fb5..8bda07eba 100644 --- a/data/presets/presets/attraction/drop_tower.json +++ b/data/presets/presets/attraction/drop_tower.json @@ -1,10 +1,8 @@ { "icon": "temaki-tower", "fields": [ - "name", - "operator", - "height", - "opening_hours" + "{attraction}", + "height" ], "geometry": [ "point", diff --git a/data/presets/presets/attraction/maze.json b/data/presets/presets/attraction/maze.json index 9f13022ef..89db2d922 100644 --- a/data/presets/presets/attraction/maze.json +++ b/data/presets/presets/attraction/maze.json @@ -1,9 +1,5 @@ { "icon": "maki-amusement-park", - "fields": [ - "name", - "operator" - ], "geometry": [ "point", "area" diff --git a/data/presets/presets/attraction/pirate_ship.json b/data/presets/presets/attraction/pirate_ship.json index 357a21bcb..585c6f2b3 100644 --- a/data/presets/presets/attraction/pirate_ship.json +++ b/data/presets/presets/attraction/pirate_ship.json @@ -1,10 +1,5 @@ { "icon": "maki-danger", - "fields": [ - "name", - "operator", - "opening_hours" - ], "geometry": [ "point" ], diff --git a/data/presets/presets/attraction/river_rafting.json b/data/presets/presets/attraction/river_rafting.json index de65d36bd..2981e388e 100644 --- a/data/presets/presets/attraction/river_rafting.json +++ b/data/presets/presets/attraction/river_rafting.json @@ -1,10 +1,5 @@ { "icon": "maki-ferry", - "fields": [ - "name", - "operator", - "opening_hours" - ], "geometry": [ "point", "line" diff --git a/data/presets/presets/attraction/roller_coaster.json b/data/presets/presets/attraction/roller_coaster.json index 1c8deae78..651bf8c24 100644 --- a/data/presets/presets/attraction/roller_coaster.json +++ b/data/presets/presets/attraction/roller_coaster.json @@ -1,10 +1,5 @@ { "icon": "maki-amusement-park", - "fields": [ - "name", - "operator", - "opening_hours" - ], "geometry": [ "point", "area" diff --git a/data/presets/presets/attraction/summer_toboggan.json b/data/presets/presets/attraction/summer_toboggan.json index bb00ee055..6474ce3c7 100644 --- a/data/presets/presets/attraction/summer_toboggan.json +++ b/data/presets/presets/attraction/summer_toboggan.json @@ -1,9 +1,4 @@ { - "fields": [ - "name", - "operator", - "opening_hours" - ], "geometry": [ "line" ], diff --git a/data/presets/presets/attraction/train.json b/data/presets/presets/attraction/train.json index 7711cc082..a3f150f2c 100644 --- a/data/presets/presets/attraction/train.json +++ b/data/presets/presets/attraction/train.json @@ -1,10 +1,8 @@ { "icon": "maki-rail", "fields": [ - "name", - "operator", - "fee", - "opening_hours" + "{attraction}", + "fee" ], "geometry": [ "point", diff --git a/data/presets/presets/attraction/water_slide.json b/data/presets/presets/attraction/water_slide.json index 8a3fd7368..a6f431ce5 100644 --- a/data/presets/presets/attraction/water_slide.json +++ b/data/presets/presets/attraction/water_slide.json @@ -1,9 +1,8 @@ { "icon": "maki-swimming", "fields": [ - "name", - "operator", - "opening_hours" + "{attraction}", + "height" ], "geometry": [ "line", diff --git a/data/taginfo.json b/data/taginfo.json index b272099da..3f0bbf1ac 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -26,6 +26,12 @@ "description": "🄿 Amenity (unsearchable), 🄵 Type", "object_types": ["node", "area"] }, + { + "key": "attraction", + "description": "🄿 Attraction (unsearchable), 🄵 Type", + "object_types": ["node", "way", "area"], + "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/star-15.svg?sanitize=true" + }, { "key": "junction", "value": "circular", diff --git a/dist/locales/en.json b/dist/locales/en.json index 00450bb1c..083267f94 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -1990,6 +1990,9 @@ "atm": { "label": "ATM" }, + "attraction": { + "label": "Type" + }, "backrest": { "label": "Backrest" }, @@ -3575,6 +3578,10 @@ "name": "Amenity", "terms": "" }, + "attraction": { + "name": "Attraction", + "terms": "" + }, "circular": { "name": "Traffic Circle", "terms": ""