Index: trunk/resources/data/defaultpresets.xml
===================================================================
--- trunk/resources/data/defaultpresets.xml	(revision 16289)
+++ trunk/resources/data/defaultpresets.xml	(revision 16291)
@@ -28,4 +28,7 @@
             <list_entry value="impassable" short_description="No wheeled vehicle" />
         </combo>
+    </chunk>
+    <chunk id="sport_surface">
+        <combo key="surface" text="Surface" values="artificial_turf,asphalt,clay,concrete,decoturf,grass,sand,tartan,ground" />
     </chunk>
     <chunk id="riding_surface">
@@ -4357,5 +4360,5 @@
             <text key="name" text="Name" />
             <reference ref="sport" />
-            <combo key="surface" text="Surface" values="artificial_turf,asphalt,clay,concrete,decoturf,grass,sand,tartan,ground" />
+            <reference ref="sport_surface" />
             <reference ref="link_contact_address_payment" />
         </item> <!-- Pitch -->
@@ -4366,5 +4369,5 @@
             <text key="name" text="Name" />
             <combo key="sport" text="Sport" values="athletics,cycling,dog_racing,equestrian,horse_racing,running,roller_skating,ice_skating" values_context="sport" />
-            <combo key="surface" text="Surface" values="artificial_turf,asphalt,clay,concrete,decoturf,grass,sand,tartan,ground" />
+            <reference ref="sport_surface" />
         </item> <!-- Racetrack -->
         <group name="Golf" icon="presets/sport/golf/golf.svg">
@@ -4455,4 +4458,5 @@
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,fitness_centre,stadium,track" values_context="running" />
+            <reference ref="sport_surface" />
         </item> <!-- Multi -->
         <item name="Nine-pin Bowling" icon="presets/sport/9pin.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -4462,4 +4466,5 @@
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
+            <combo key="surface" text="Surface" values="clay,concrete,ground,wood" />
         </item> <!-- Nine-pin Bowling -->
         <item name="Ten-pin Bowling" icon="presets/sport/10pin.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -4469,4 +4474,5 @@
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
+            <combo key="surface" text="Surface" values="clay,concrete,ground,wood" />
         </item> <!-- Ten-pin Bowling -->
         <item name="Archery" icon="presets/sport/archery.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -4483,4 +4489,5 @@
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="running" default="track" />
+            <reference ref="sport_surface" />
         </item> <!-- Track and Field Athletics -->
         <item name="Running" icon="presets/sport/running.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -4490,4 +4497,5 @@
             <reference ref="name_operator" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="running" />
+            <reference ref="sport_surface" />
         </item> <!-- Running -->
         <item name="Climbing site" icon="presets/sport/climbing.svg" type="node,way,closedway,multipolygon" preset_name_label="true">
@@ -4553,4 +4561,5 @@
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="racing" />
+            <reference ref="sport_surface" />
         </item> <!-- Cycling -->
         <item name="Dog Racing" icon="presets/sport/dog_racing.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -4560,4 +4569,5 @@
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="racing" />
+            <reference ref="sport_surface" />
         </item> <!-- Dog Racing -->
         <item name="Equestrian" icon="presets/sport/equestrian.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -4595,4 +4605,5 @@
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
+            <combo key="surface" text="Surface" values="asphalt,concrete" />
         </item> <!-- Roller Skating -->
         <item name="Skateboard" icon="presets/sport/skateboard.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -4602,4 +4613,5 @@
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" default="pitch" values_context="racing" />
+            <combo key="surface" text="Surface" values="asphalt,concrete" />
         </item> <!-- Skateboard -->
         <item name="Swimming" icon="presets/sport/swimming.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -4640,4 +4652,5 @@
             <key key="sport" value="soccer" />
             <reference ref="name_leisure_pitch" />
+            <reference ref="sport_surface" />
         </item> <!-- Soccer -->
         <item name="Australian Football" icon="presets/sport/football.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -4646,4 +4659,5 @@
             <key key="sport" value="australian_football" />
             <reference ref="name_leisure_pitch" />
+            <reference ref="sport_surface" />
         </item> <!-- Australian Football -->
         <item name="American Football" icon="presets/sport/football.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -4652,4 +4666,5 @@
             <key key="sport" value="american_football" />
             <reference ref="name_leisure_pitch" />
+            <reference ref="sport_surface" />
         </item> <!-- American Football -->
         <item name="Canadian Football" icon="presets/sport/football.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -4658,4 +4673,5 @@
             <key key="sport" value="canadian_football" />
             <reference ref="name_leisure_pitch" />
+            <reference ref="sport_surface" />
         </item> <!-- Canadian Football -->
         <item name="Gaelic Games" icon="presets/sport/soccer.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -4664,4 +4680,5 @@
             <key key="sport" value="gaelic_games" />
             <reference ref="name_leisure_pitch" />
+            <reference ref="sport_surface" />
             <optional>
                 <check key="gaelic_games:hurling" text="Hurling" />
@@ -4677,4 +4694,5 @@
             <key key="sport" value="rugby_league" />
             <reference ref="name_leisure_pitch" />
+            <reference ref="sport_surface" />
         </item> <!-- Rugby League -->
         <item name="Rugby Union" icon="presets/sport/football.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -4683,4 +4701,5 @@
             <key key="sport" value="rugby_union" />
             <reference ref="name_leisure_pitch" />
+            <reference ref="sport_surface" />
         </item> <!-- Rugby Union -->
         <item name="Baseball" icon="presets/sport/baseball.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -4689,4 +4708,5 @@
             <key key="sport" value="baseball" />
             <reference ref="name_leisure_pitch" />
+            <reference ref="sport_surface" />
         </item> <!-- Baseball -->
         <item name="Basketball" icon="presets/sport/basketball.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -4695,4 +4715,6 @@
             <key key="sport" value="basketball" />
             <reference ref="name_leisure_pitch" />
+            <reference ref="sport_surface" />
+            <combo key="hoops" text="Hoops" values="1,2,3,4" />
         </item> <!-- Basketball -->
         <item name="Handball" icon="presets/sport/handball.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -4702,4 +4724,5 @@
             <reference ref="name_operator" />
             <combo key="leisure" text="Type" values="stadium,pitch,sports_centre" />
+            <reference ref="sport_surface" />
         </item> <!-- Handball -->
         <item name="Volleyball" icon="presets/sport/volleyball.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -4709,4 +4732,5 @@
             <reference ref="name_operator" />
             <combo key="leisure" text="Type" values="stadium,pitch,sports_centre" />
+            <reference ref="sport_surface" />
         </item> <!-- Volleyball -->
         <item name="Beach Volleyball" icon="presets/sport/beachvolleyball.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -4736,4 +4760,5 @@
             <key key="sport" value="boules" />
             <reference ref="name_leisure_pitch" />
+            <reference ref="sport_surface" />
         </item> <!-- Boule -->
         <item name="Lawn Bowling" icon="presets/sport/boule.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -4742,4 +4767,5 @@
             <key key="sport" value="bowls" />
             <reference ref="name_leisure_pitch" />
+            <reference ref="sport_surface" />
         </item> <!-- Lawn Bowling -->
         <item name="Cricket" icon="presets/sport/cricket.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -4748,4 +4774,5 @@
             <key key="sport" value="cricket" />
             <reference ref="name_leisure_pitch" />
+            <reference ref="sport_surface" />
         </item> <!-- Cricket -->
         <item name="Croquet" icon="presets/sport/croquet.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -4754,4 +4781,5 @@
             <key key="sport" value="croquet" />
             <reference ref="name_leisure_pitch" />
+            <reference ref="sport_surface" />
         </item> <!-- Croquet -->
         <item name="Field Hockey" icon="presets/sport/field_hockey.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -4761,4 +4789,5 @@
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
+            <reference ref="sport_surface" />
         </item> <!-- Field Hockey -->
         <item name="Ice Hockey" icon="presets/sport/ice_hockey.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -4774,4 +4803,5 @@
             <key key="sport" value="pelota" />
             <reference ref="name_leisure_pitch" />
+            <reference ref="sport_surface" />
         </item> <!-- Pelota -->
         <item name="Racquetball" icon="presets/sport/racquetball.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -4781,4 +4811,5 @@
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
+            <reference ref="sport_surface" />
         </item> <!-- Racquetball -->
         <item name="Table Tennis/Ping-Pong" icon="presets/sport/table_tennis.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -4794,4 +4825,5 @@
             <key key="sport" value="tennis" />
             <reference ref="name_leisure_pitch" />
+            <reference ref="sport_surface" />
         </item> <!-- Tennis -->
     </group> <!-- Sport (Ball) -->
@@ -4803,4 +4835,5 @@
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="racing" />
+            <combo key="surface" text="Surface" values="asphalt,concrete,ground" />
         </item> <!-- Motorsport -->
         <item name="Kart Racing" icon="presets/sport/karting.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -4810,4 +4843,5 @@
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,track" values_context="racing" />
+            <combo key="surface" text="Surface" values="asphalt,concrete,ground" />
         </item> <!-- Kart Racing -->
         <item name="Motocross" icon="presets/sport/motocross.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -4825,4 +4859,5 @@
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,track" values_context="aerialway" />
+            <combo key="surface" text="Surface" values="asphalt,concrete,ground" />
         </item> <!-- Model Aerodrome -->
         <item name="RC Car" icon="presets/sport/rc_car.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -4832,4 +4867,5 @@
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,track" values_context="racing" />
+            <combo key="surface" text="Surface" values="asphalt,concrete,ground" />
         </item> <!-- RC Car -->
     </group> <!-- Motorsport -->