diff --git a/data/presets.yaml b/data/presets.yaml
index 617d37613..6b3605dc7 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -2112,6 +2112,71 @@ en:
         # 'area:highway=*'
         name: Road Surface
         terms: '<translate with synonyms or related terms for ''Road Surface'', separated by commas>'
+      attraction/amusement_ride:
+        # attraction=amusement_ride
+        name: Amusement Ride
+        # 'terms: theme park,carnival ride'
+        terms: '<translate with synonyms or related terms for ''Amusement Ride'', separated by commas>'
+      attraction/animal:
+        # attraction=animal
+        name: Animal
+        # 'terms: zoo,theme park,animal park,lion,tiger,bear'
+        terms: '<translate with synonyms or related terms for ''Animal'', separated by commas>'
+      attraction/big_wheel:
+        # attraction=big_wheel
+        name: Big Wheel
+        # 'terms: ferris wheel,theme park,amusement ride'
+        terms: '<translate with synonyms or related terms for ''Big Wheel'', separated by commas>'
+      attraction/bumper_car:
+        # attraction=bumper_car
+        name: Bumper Car
+        # 'terms: theme park,dodgem cars,autoscooter'
+        terms: '<translate with synonyms or related terms for ''Bumper Car'', separated by commas>'
+      attraction/bungee_jumping:
+        # attraction=bungee_jumping
+        name: Bungee Jumping
+        # 'terms: theme park,bungy jumping,jumping platform'
+        terms: '<translate with synonyms or related terms for ''Bungee Jumping'', separated by commas>'
+      attraction/carousel:
+        # attraction=carousel
+        name: Carousel
+        # 'terms: theme park,roundabout,merry-go-round,galloper,jumper,horseabout,flying horses'
+        terms: '<translate with synonyms or related terms for ''Carousel'', separated by commas>'
+      attraction/dark_ride:
+        # attraction=dark_ride
+        name: Dark Ride
+        # 'terms: theme park,ghost train'
+        terms: '<translate with synonyms or related terms for ''Dark Ride'', separated by commas>'
+      attraction/drop_tower:
+        # attraction=drop_tower
+        name: Drop Tower
+        # 'terms: theme park,amusement ride,gondola,tower,big drop'
+        terms: '<translate with synonyms or related terms for ''Drop Tower'', separated by commas>'
+      attraction/pirate_ship:
+        # attraction=pirate_ship
+        name: Pirate Ship
+        # 'terms: theme park,carnival ride,amusement ride'
+        terms: '<translate with synonyms or related terms for ''Pirate Ship'', separated by commas>'
+      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: '<translate with synonyms or related terms for ''River Rafting'', separated by commas>'
+      attraction/roller_coaster:
+        # attraction=roller_coaster
+        name: Roller Coaster
+        # 'terms: theme park,amusement ride'
+        terms: '<translate with synonyms or related terms for ''Roller Coaster'', separated by commas>'
+      attraction/train:
+        # attraction=train
+        name: Tourist Train
+        # 'terms: theme park,rackless train,road train,Tschu-Tschu train,dotto train,park train'
+        terms: '<translate with synonyms or related terms for ''Tourist Train'', separated by commas>'
+      attraction/water_slide:
+        # attraction=water_slide
+        name: Water Slide
+        # 'terms: theme park,aquatic park,water park,flumes,water chutes,hydroslides'
+        terms: '<translate with synonyms or related terms for ''Water Slide'', separated by commas>'
       barrier:
         # barrier=*
         name: Barrier
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 38e6f8317..681aed6ba 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -3317,6 +3317,296 @@
             },
             "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",
+                "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",
+                "height",
+                "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",
+                "height",
+                "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": [
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..f9b36d663
--- /dev/null
+++ b/data/presets/presets/attraction/animal.json
@@ -0,0 +1,23 @@
+{
+    "icon": "zoo",
+    "fields": [
+        "name",
+        "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..b052f1c23
--- /dev/null
+++ b/data/presets/presets/attraction/big_wheel.json
@@ -0,0 +1,21 @@
+{
+    "icon": "amusement-park",
+    "fields": [
+        "name",
+        "operator",
+        "height",
+        "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..4604d2845
--- /dev/null
+++ b/data/presets/presets/attraction/bungee_jumping.json
@@ -0,0 +1,22 @@
+{
+    "icon": "pitch",
+    "fields": [
+        "name",
+        "operator",
+        "height",
+        "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/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 477d1ec9a..d4b823f4f 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -2893,6 +2893,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": ""