Index: data/defaultpresets.xml
===================================================================
--- data/defaultpresets.xml (revision 6161)
+++ data/defaultpresets.xml (working copy)
@@ -2782,23 +2782,78 @@
                 <check key="bicycle" text="Bicycle" default="off" />
             </optional>
         </item>
-        <item name="Ticket Machine" de.name="Fahrausweisautomat" icon="presets/vending_machine.png" type="node">
+        <item name="Ticket Machine" de.name="Fahrausweisautomat" icon="presets/vending_machine.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=vending_machine"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=vending_machine"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=vending_machine"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=vending_machine"/>
-            <key key="amenity" value="vending_machine"/>
-            <key key="vending" value="public_transport_tickets"/>
-            <text key="name" text="Name"/>
-            <text key="operator" text="Operator"/>
-            <text key="ref" text="Reference Number"/>
-            <check key="payment:coins" text="Coins" default="off" />
-            <check key="payment:notes" text="Notes" default="off" />
-            <check key="payment:electronic_purses" text="Electronic purses and Charge cards" default="off" />
-            <check key="payment:debit_cards" text="Debit cards" default="off" />
-            <check key="payment:credit_cards" text="Credit cards" default="off" />
-            <check key="payment:account_cards" text="Account or loyalty cards" default="off" />
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=vending_machine" />
+            <label text="Edit Ticket Machine" />
+            <space />
+            <key key="amenity" value="vending_machine" />
+            <key key="vending" value="public_transport_tickets" />
+            <text key="name" text="Name" />
+            <text key="operator" text="Operator" />
+            <text key="ref" text="Reference Number" />
+            <space />
+            <label text="Payment methods: Cash" />
+            <checkgroup columns="3">
+                <check key="payment:coins" text="Coins" default="off" />
+                <check key="payment:notes" text="Notes" default="off" />
+            </checkgroup>
+            <combo key="payment:cash" text="Cash" values="no" />
+            <space />
+            <label text="Payment methods: Debit cards" />
+            <checkgroup columns="3">
+                <check key="payment:bankaxess" text="BankAxess" default="off" />
+                <check key="payment:bancomat" text="Bancomat" default="off" />
+                <check key="payment:girocard" text="Girocard" default="off" />
+                <check key="payment:laser" text="Laser" default="off" />
+                <check key="payment:maestro" text="Maestro" default="off" />
+                <check key="payment:visa_debit" text="Visa Debit" default="off" />
+                <check key="payment:visa_electron" text="Visa Electron" default="off" />
+            </checkgroup>
+            <combo key="payment:debit_cards" text="Debit cards" values="no" />
+            <space />
+            <label text="Payment methods: Credit cards" />
+            <checkgroup columns="3">
+                <check key="payment:american_express" text="American Express" default="off" />
+                <check key="payment:diners_club" text="Diners Club" default="off" />
+                <check key="payment:discover_card" text="Discover Card" default="off" />
+                <check key="payment:mastercard" text="Mastercard" default="off" />
+                <check key="payment:visa" text="Visa" default="off" />
+            </checkgroup>
+            <combo key="payment:account_cards" text="Account or loyalty cards" values="no" />
+            <combo key="payment:credit_cards" text="Credit cards" values="no" />
+            <space />
+            <label text="Payment methods: Electronic Purses and Charge cards" />
+            <checkgroup columns="3">
+                <check key="payment:ep_avant" text="Avant (fi)" default="off" />
+                <check key="payment:ep_cash" text="Cash (ch)" default="off" />
+                <check key="payment:ep_chipknip" text="Chipknip (nl)" default="off" />
+                <check key="payment:ep_geldkarte" text="Geldkarte (de)" default="off" />
+                <check key="payment:ep_mep" text="Mep (pt)" default="off" />
+                <check key="payment:ep_minicash" text="Minicash (lu)" default="off" />
+                <check key="payment:ep_minipay" text="Minipay (it)" default="off" />
+                <check key="payment:ep_monedero" text="Mondero (ar)" default="off" />
+                <check key="payment:ep_monedero4b" text="Mondero 4b (es)" default="off" />
+                <check key="payment:ep_moneo" text="Moneo (fr)" default="off" />
+                <check key="payment:ep_quick" text="Quick (au)" default="off" />
+                <check key="payment:ep_proton" text="Proton (be)" default="off" />
+            </checkgroup>
+            <combo key="payment:electronic_purses" text="Electronic purses and Charge cards" values="no" />
+            <space />
+            <label text="Payment methods: Public transport" />
+            <checkgroup columns="3">
+                <check key="payment:oyster" text="Oyster" default="off" />
+                <check key="payment:bob" text="Bob" default="off" />
+            </checkgroup>
+            <space />
+            <label text="Payment methods: Others" />
+            <checkgroup columns="3">
+                <check key="payment:bitcoin" text="Bitcoin" default="off" />
+                <check key="payment:u-key" text="U-Key" default="off" />
+            </checkgroup>
         </item>
     </group>
     <group name="Public Transport (legacy)" icon="presets/bus.png">