Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 3603)
+++ /trunk/data/defaultpresets.xml	(revision 3604)
@@ -1414,4 +1414,12 @@
             </optional>
         </item>
+        <item name="Charging Station" icon="styles/standard/accommodation/camping/hookup.png" type="node">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fuel"/>
+            <label text="Edit Charging Station (for electric cars)" />
+            <key key="amenity" value="charging_station" />
+            <text key="operator" text="Operator" default="" delete_if_empty="true" />
+            <text key="voltage" text="Voltage" default="" delete_if_empty="true" />
+            <text key="amperage" text="Amperage" default="" delete_if_empty="true" />
+        </item>            
         <item name="Parking" icon="presets/parking.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
Index: /trunk/styles/standard/elemstyles.xml
===================================================================
--- /trunk/styles/standard/elemstyles.xml	(revision 3603)
+++ /trunk/styles/standard/elemstyles.xml	(revision 3604)
@@ -2177,4 +2177,11 @@
 
 	<rule>
+		<condition k="amenity" v="charging_station"/>
+		<icon annotate="true" src="accommodation/camping/hookup.png" priority="1000"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
 		<condition k="amenity" v="grit_bin"/>
 		<icon annotate="true" src="misc/grit_bin.png"/>