Index: trunk/resources/data/defaultpresets.xml
===================================================================
--- trunk/resources/data/defaultpresets.xml	(revision 16479)
+++ trunk/resources/data/defaultpresets.xml	(revision 16480)
@@ -3490,4 +3490,67 @@
         </item> <!-- Bird Hide -->
         <separator/>
+        <item name="Amusement arcade" icon="presets/leisure/amusement_arcade.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Tag:leisure=amusement_arcade" />
+            <space />
+            <key key="leisure" value="amusement_arcade" />
+            <reference ref="name_operator_oh_wheelchair" />
+            <reference ref="min_age" />
+            <space />
+            <reference ref="internet_smoking" />
+            <reference ref="link_contact_address_payment" />
+            <preset_link preset_name="Adult gaming centre" text="Similar but different tags:" />
+            <preset_link preset_name="Gambling" text="Similar but different tags:" />
+            <preset_link preset_name="Casino" text="Similar but different tags:" />
+            <preset_link preset_name="Bookmaker" text="Similar but different tags:" />
+            <preset_link preset_name="Lottery" text="Similar but different tags:" />
+        </item> <!-- Amusement arcade -->
+        <item name="Adult gaming centre" icon="presets/leisure/adult_gaming_centre.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Tag:leisure=adult_gaming_centre" />
+            <space />
+            <key key="leisure" value="adult_gaming_centre" />
+            <reference ref="name_operator_oh_wheelchair" />
+            <reference ref="min_age" />
+            <space />
+            <reference ref="internet_smoking" />
+            <reference ref="link_contact_address_payment" />
+            <preset_link preset_name="Amusement arcade" text="Similar but different tags:" />
+            <preset_link preset_name="Adult gaming centre" text="Similar but different tags:" />
+            <preset_link preset_name="Gambling" text="Similar but different tags:" />
+            <preset_link preset_name="Casino" text="Similar but different tags:" />
+            <preset_link preset_name="Bookmaker" text="Similar but different tags:" />
+            <preset_link preset_name="Lottery" text="Similar but different tags:" />
+        </item> <!-- Adult gaming centre -->
+        <item name="Gambling" icon="presets/leisure/gambling.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Tag:amenity=gambling" />
+            <space />
+            <key key="amenity" value="gambling" />
+            <multiselect key="gambling" text="Type" values="yes;lottery;pachinko;slot_machines;bingo;betting;poker" />
+            <reference ref="name_operator_oh_wheelchair" />
+            <reference ref="min_age" />
+            <space />
+            <reference ref="internet_smoking" />
+            <reference ref="link_contact_address_payment" />
+            <preset_link preset_name="Amusement arcade" text="Similar but different tags:" />
+            <preset_link preset_name="Adult gaming centre" text="Similar but different tags:" />
+            <preset_link preset_name="Casino" text="Similar but different tags:" />
+            <preset_link preset_name="Bookmaker" text="Similar but different tags:" />
+            <preset_link preset_name="Lottery" text="Similar but different tags:" />
+        </item> <!-- Gambling -->
+        <item name="Casino" icon="presets/leisure/casino.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Tag:amenity=casino" />
+            <space />
+            <key key="amenity" value="casino" />
+            <reference ref="name_operator_oh_wheelchair" />
+            <reference ref="min_age" />
+            <space />
+            <reference ref="internet_smoking" />
+            <reference ref="link_contact_address_payment" />
+            <preset_link preset_name="Amusement arcade" text="Similar but different tags:" />
+            <preset_link preset_name="Adult gaming centre" text="Similar but different tags:" />
+            <preset_link preset_name="Gambling" text="Similar but different tags:" />
+            <preset_link preset_name="Bookmaker" text="Similar but different tags:" />
+            <preset_link preset_name="Lottery" text="Similar but different tags:" />
+        </item> <!-- Casino -->
+        <separator/>
         <item name="Night Club" icon="presets/leisure/nightclub.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:amenity=nightclub" />
@@ -3501,14 +3564,4 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Night Club -->
-        <item name="Casino" icon="presets/leisure/casino.svg" type="node,closedway,multipolygon" preset_name_label="true">
-            <link wiki="Tag:amenity=casino" />
-            <space />
-            <key key="amenity" value="casino" />
-            <reference ref="name_operator_oh_wheelchair" />
-            <space />
-            <reference ref="internet_smoking" />
-            <space />
-            <reference ref="link_contact_address_payment" />
-        </item> <!-- Casino -->
         <item name="Strip Club" icon="presets/leisure/stripclub.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:amenity=stripclub" />
@@ -3516,4 +3569,5 @@
             <key key="amenity" value="stripclub" />
             <reference ref="name_operator_oh_wheelchair" />
+            <reference ref="min_age" />
             <space />
             <reference ref="internet_smoking" />
@@ -6562,4 +6616,9 @@
             <reference ref="name_operator_oh_wheelchair" />
             <reference ref="link_contact_address_payment" />
+            <preset_link preset_name="Amusement arcade" text="Similar but different tags:" />
+            <preset_link preset_name="Adult gaming centre" text="Similar but different tags:" />
+            <preset_link preset_name="Gambling" text="Similar but different tags:" />
+            <preset_link preset_name="Casino" text="Similar but different tags:" />
+            <preset_link preset_name="Lottery" text="Similar but different tags:" />
         </item> <!-- Bookmaker -->
         <item name="Lottery" icon="presets/shop/lottery.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -6569,4 +6628,9 @@
             <reference ref="name_operator_oh_wheelchair" />
             <reference ref="link_contact_address_payment" />
+            <preset_link preset_name="Amusement arcade" text="Similar but different tags:" />
+            <preset_link preset_name="Adult gaming centre" text="Similar but different tags:" />
+            <preset_link preset_name="Gambling" text="Similar but different tags:" />
+            <preset_link preset_name="Casino" text="Similar but different tags:" />
+            <preset_link preset_name="Bookmaker" text="Similar but different tags:" />
         </item> <!-- Lottery -->
         <item name="Bag" icon="presets/shop/bag.svg" type="node,closedway,multipolygon" preset_name_label="true">