Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 8122)
+++ /trunk/data/defaultpresets.xml	(revision 8123)
@@ -176,8 +176,6 @@
         <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
     </chunk>
-    <chunk id="optional_sport">
-        <optional text="Select sport:">
+    <chunk id="sport">
             <combo key="sport" text="Sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,boules,bowls,canadian_football,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,gaelic_games,golf,gymnastics,handball,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,soccer,swimming,table_tennis,tennis" values_context="sport" />
-        </optional>
     </chunk>
     <chunk id="fee">
@@ -4581,5 +4579,5 @@
             <key key="leisure" value="stadium" />
             <text key="name" text="Name" />
-            <reference ref="optional_sport" />
+            <reference ref="sport" />
             <reference ref="link_contact_address_payment" />
         </item> <!-- Stadium -->
@@ -4594,5 +4592,5 @@
             <key key="leisure" value="sports_centre" />
             <text key="name" text="Name" />
-            <reference ref="optional_sport" />
+            <reference ref="sport" />
             <reference ref="link_contact_address_payment" />
         </item> <!-- Sports Centre -->
@@ -4610,5 +4608,6 @@
             <key key="leisure" value="pitch" />
             <text key="name" text="Name" />
-            <reference ref="optional_sport" />
+            <reference ref="sport" />
+            <combo key="surface" text="Surface" values="artificial_turf,asphalt,clay,concrete,decoturf,grass,sand,tartan,ground" />
             <reference ref="link_contact_address_payment" />
         </item> <!-- Pitch -->
@@ -4624,5 +4623,5 @@
             <key key="leisure" value="track" />
             <text key="name" text="Name" />
-            <reference ref="optional_sport" />
+            <reference ref="sport" />
         </item> <!-- Racetrack -->
         <item name="Golf Course" icon="styles/standard/sport/golf.svg" type="node,closedway" preset_name_label="true">