Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 10329)
+++ trunk/data/defaultpresets.xml	(revision 10330)
@@ -2869,7 +2869,44 @@
             <space />
             <key key="amenity" value="charging_station" />
-            <reference ref="name_operator" />
-            <text key="voltage" text="Voltage" />
-            <text key="amperage" text="Amperage" />
+            <reference ref="name_ref_operator" />
+            <reference ref="oh" />
+            <reference ref="fee" />
+            <space />
+            <combo key="voltage" text="Voltage" values="230,400"/>
+            <combo key="amperage" text="Amperage" values="16,32" />
+            <combo key="capacity" text="Capacity" values="1,2,3,4,5,6" />
+            <space />
+            <label text="Types of vehicles which can be charged:" />
+            <checkgroup columns="4">
+                <check key="bicycle" text="Bicycle" />
+                <check key="scooter" text="Scooter" />
+                <check key="car" text="Car" />
+                <check key="truck" text="Truck" />
+            </checkgroup>
+            <space />
+            <label text="Number of Sockets:" />
+            <combo key="socket:type1" text="Type 1 (Yazaki)" values="1,2,3,4,5,6" />
+            <combo key="socket:type1_combo" text="Type 1 Combo" values="1,2,3,4,5,6" />
+            <combo key="socket:type2" text="Type 2 (Mennekes)" values="1,2,3,4,5,6" />
+            <combo key="socket:type2_combo" text="Type 2 Combo" values="1,2,3,4,5,6" />
+            <combo key="socket:type3" text="Type 3 (SCAME)" values="1,2,3,4,5,6" />
+            <combo key="socket:chademo" text="CHAdeMO" values="1,2,3,4,5,6" />
+            <combo key="socket:tesla_supercharger" text="Tesla Supercharger" values="1,2,3,4,5,6" />
+            <combo key="socket:schuko" text="Schuko" values="1,2,3,4,5,6" />
+            <combo key="socket:cee_blue" text="CEE blue" values="1,2,3,4,5,6" />
+            <combo key="socket:cee_red_16a" text="CEE red 16A" values="1,2,3,4,5,6" />
+            <combo key="socket:cee_red_32a" text="CEE red 32A" values="1,2,3,4,5,6" />
+            <combo key="socket:nema_5_15" text="NEMA 5-15" values="1,2,3,4,5,6" />
+            <combo key="socket:nema_5_20" text="NEMA 5-20" values="1,2,3,4,5,6" />
+            <space />
+            <label text="Authentication:" />
+            <checkgroup columns="4">
+                <check key="authentication:none" text="None" />
+                <check key="authentication:phone_call" text="Phone call" />
+                <check key="authentication:short_message" text="Short message" />
+                <check key="authentication:nfc" text="NFC" />
+            </checkgroup>
+            <combo key="authentication:membership_card" text="Membership card" values="yes" />
+            <preset_link preset_name="Payment Methods" />
         </item> <!-- Charging Station -->
         <item name="Wash" icon="presets/car_wash.png" type="node,closedway,multipolygon" preset_name_label="true">
Index: trunk/data/validator/ignoretags.cfg
===================================================================
--- trunk/data/validator/ignoretags.cfg	(revision 10329)
+++ trunk/data/validator/ignoretags.cfg	(revision 10330)
@@ -104,4 +104,6 @@
 E:exit_to
 E:distance
+E:voltage
+E:amperage
 ;
 ; Ignore valid and semi-valid keys that end with...