Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 3419)
+++ trunk/data/defaultpresets.xml	(revision 3420)
@@ -1594,5 +1594,16 @@
             <key key="tourism" value="hotel" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="operator" text="Operator" default="" delete_if_empty="true" />
             <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" default="" delete_if_empty="true" />
+            <space />
+            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" default="" delete_if_empty="true" />
+            <combo key="internet_access:fee" text="Internet access fee" values="yes,3/h,8/d,no" default="" delete_if_empty="true" />
+            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" default="" delete_if_empty="true" />
+            <combo key="wheelchair" text="Wheelchairs" values="yes,no" default="" delete_if_empty="true" />
+            <space />
+            <text key="phone" text="Phone Number" default="" delete_if_empty="true" />
+            <text key="fax" text="Fax Number" default="" delete_if_empty="true" />
+            <text key="website" text="Website" default="" delete_if_empty="true" />
+            <text key="email" text="Email Address" default="" delete_if_empty="true" />
         </item>
         <item name="Motel" icon="presets/bed.png" type="node,closedway">
@@ -1601,4 +1612,16 @@
             <key key="tourism" value="motel" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="operator" text="Operator" default="" delete_if_empty="true" />
+            <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" default="" delete_if_empty="true" />
+            <space />
+            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" default="" delete_if_empty="true" />
+            <combo key="internet_access:fee" text="Internet access fee" values="yes,3/h,8/d,no" default="" delete_if_empty="true" />
+            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" default="" delete_if_empty="true" />
+            <combo key="wheelchair" text="Wheelchairs" values="yes,no" default="" delete_if_empty="true" />
+            <space />
+            <text key="phone" text="Phone Number" default="" delete_if_empty="true" />
+            <text key="fax" text="Fax Number" default="" delete_if_empty="true" />
+            <text key="website" text="Website" default="" delete_if_empty="true" />
+            <text key="email" text="Email Address" default="" delete_if_empty="true" />
         </item>
         <item name="Guest House" icon="presets/bed.png" type="node,closedway">
@@ -1606,4 +1629,15 @@
             <key key="tourism" value="guest_house" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" default="" delete_if_empty="true" />
+            <space />
+            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" default="" delete_if_empty="true" />
+            <combo key="internet_access:fee" text="Internet access fee" values="yes,3/h,8/d,no" default="" delete_if_empty="true" />
+            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" default="" delete_if_empty="true" />
+            <combo key="wheelchair" text="Wheelchairs" values="yes,no" default="" delete_if_empty="true" />
+            <space />
+            <text key="phone" text="Phone Number" default="" delete_if_empty="true" />
+            <text key="fax" text="Fax Number" default="" delete_if_empty="true" />
+            <text key="website" text="Website" default="" delete_if_empty="true" />
+            <text key="email" text="Email Address" default="" delete_if_empty="true" />
         </item>
         <item name="Chalet" icon="presets/empty.png" type="node,closedway">
@@ -1612,4 +1646,15 @@
             <key key="tourism" value="chalet" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" default="" delete_if_empty="true" />
+            <space />
+            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" default="" delete_if_empty="true" />
+            <combo key="internet_access:fee" text="Internet access fee" values="yes,3/h,8/d,no" default="" delete_if_empty="true" />
+            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" default="" delete_if_empty="true" />
+            <combo key="wheelchair" text="Wheelchairs" values="yes,no" default="" delete_if_empty="true" />
+            <space />
+            <text key="phone" text="Phone Number" default="" delete_if_empty="true" />
+            <text key="fax" text="Fax Number" default="" delete_if_empty="true" />
+            <text key="website" text="Website" default="" delete_if_empty="true" />
+            <text key="email" text="Email Address" default="" delete_if_empty="true" />
         </item>
         <item name="Hostel" icon="presets/hostel.png" type="node,closedway">
@@ -1618,4 +1663,16 @@
             <key key="tourism" value="hostel" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="operator" text="Operator" default="" delete_if_empty="true" />
+            <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" default="" delete_if_empty="true" />
+            <space />
+            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" default="" delete_if_empty="true" />
+            <combo key="internet_access:fee" text="Internet access fee" values="yes,3/h,8/d,no" default="" delete_if_empty="true" />
+            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" default="" delete_if_empty="true" />
+            <combo key="wheelchair" text="Wheelchairs" values="yes,no" default="" delete_if_empty="true" />
+            <space />
+            <text key="phone" text="Phone Number" default="" delete_if_empty="true" />
+            <text key="fax" text="Fax Number" default="" delete_if_empty="true" />
+            <text key="website" text="Website" default="" delete_if_empty="true" />
+            <text key="email" text="Email Address" default="" delete_if_empty="true" />
         </item>
         <item name="Alpine Hut" icon="presets/hostel.png" type="node,closedway">
@@ -1623,5 +1680,16 @@
             <key key="tourism" value="alpine_hut" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="operator" text="Operator" default="" delete_if_empty="true" />
             <text key="ele" text="Elevation" default="" delete_if_empty="true" />
+            <space />
+            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" default="" delete_if_empty="true" />
+            <combo key="internet_access:fee" text="Internet access fee" values="yes,3/h,8/d,no" default="" delete_if_empty="true" />
+            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" default="" delete_if_empty="true" />
+            <combo key="wheelchair" text="Wheelchairs" values="yes,no" default="" delete_if_empty="true" />
+            <space />
+            <text key="phone" text="Phone Number" default="" delete_if_empty="true" />
+            <text key="fax" text="Fax Number" default="" delete_if_empty="true" />
+            <text key="website" text="Website" default="" delete_if_empty="true" />
+            <text key="email" text="Email Address" default="" delete_if_empty="true" />
         </item>
         <item name="Caravan Site" icon="presets/caravan2.png" type="node,closedway">
@@ -1629,4 +1697,15 @@
             <key key="tourism" value="caravan_site" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" default="" delete_if_empty="true" />
+            <space />
+            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" default="" delete_if_empty="true" />
+            <combo key="internet_access:fee" text="Internet access fee" values="yes,3/h,8/d,no" default="" delete_if_empty="true" />
+            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" default="" delete_if_empty="true" />
+            <combo key="wheelchair" text="Wheelchairs" values="yes,no" default="" delete_if_empty="true" />
+            <space />
+            <text key="phone" text="Phone Number" default="" delete_if_empty="true" />
+            <text key="fax" text="Fax Number" default="" delete_if_empty="true" />
+            <text key="website" text="Website" default="" delete_if_empty="true" />
+            <text key="email" text="Email Address" default="" delete_if_empty="true" />
         </item>
         <item name="Camping Site" icon="presets/tent.png" type="node,closedway">
@@ -1635,4 +1714,15 @@
             <key key="tourism" value="camp_site" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" default="" delete_if_empty="true" />
+            <space />
+            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" default="" delete_if_empty="true" />
+            <combo key="internet_access:fee" text="Internet access fee" values="yes,3/h,8/d,no" default="" delete_if_empty="true" />
+            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" default="" delete_if_empty="true" />
+            <combo key="wheelchair" text="Wheelchairs" values="yes,no" default="" delete_if_empty="true" />
+            <space />
+            <text key="phone" text="Phone Number" default="" delete_if_empty="true" />
+            <text key="fax" text="Fax Number" default="" delete_if_empty="true" />
+            <text key="website" text="Website" default="" delete_if_empty="true" />
+            <text key="email" text="Email Address" default="" delete_if_empty="true" />
         </item>
     </group> <!-- Accomodation -->
@@ -1643,7 +1733,19 @@
             <key key="amenity" value="restaurant" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="operator" text="Operator" default="" delete_if_empty="true" />
             <combo key="cuisine" text="Cuisine" values="italian,chinese,pizza,burger,greek,german,indian,regional,kebab,turkish,asian,thai,mexican,japanese,french,sandwich,sushi" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
             <check key="microbrewery" text="Microbrewery" default="off" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" default="" delete_if_empty="true" />
+            <space />
+            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" default="" delete_if_empty="true" />
+            <combo key="internet_access:fee" text="Internet access fee" values="yes,3/h,8/d,no" default="" delete_if_empty="true" />
+            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" default="" delete_if_empty="true" />
+            <combo key="wheelchair" text="Wheelchairs" values="yes,no" default="" delete_if_empty="true" />
+            <space />
+            <text key="phone" text="Phone Number" default="" delete_if_empty="true" />
+            <text key="fax" text="Fax Number" default="" delete_if_empty="true" />
+            <text key="website" text="Website" default="" delete_if_empty="true" />
+            <text key="email" text="Email Address" default="" delete_if_empty="true" />
         </item>
         <item name="Fast Food" icon="presets/fastfood.png" type="node,closedway">
@@ -1652,6 +1754,34 @@
             <key key="amenity" value="fast_food" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="operator" text="Operator" default="" delete_if_empty="true" />
             <combo key="cuisine" text="Cuisine" values="italian,chinese,pizza,burger,greek,german,indian,regional,kebab,turkish,asian,thai,mexican,japanese,french,sandwich,sushi,fish_and_chips,chicken" default="" delete_if_empty="true" />
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <space />
+            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" default="" delete_if_empty="true" />
+            <combo key="internet_access:fee" text="Internet access fee" values="yes,3/h,8/d,no" default="" delete_if_empty="true" />
+            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" default="" delete_if_empty="true" />
+            <combo key="wheelchair" text="Wheelchairs" values="yes,no" default="" delete_if_empty="true" />
+            <space />
+            <text key="phone" text="Phone Number" default="" delete_if_empty="true" />
+            <text key="fax" text="Fax Number" default="" delete_if_empty="true" />
+            <text key="website" text="Website" default="" delete_if_empty="true" />
+            <text key="email" text="Email Address" default="" delete_if_empty="true" />
+        </item>
+        <item name="Food Court" icon="presets/fastfood.png" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
+            <label text="Edit Food Court" />
+            <key key="amenity" value="food_court" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <space />
+            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" default="" delete_if_empty="true" />
+            <combo key="internet_access:fee" text="Internet access fee" values="yes,3/h,8/d,no" default="" delete_if_empty="true" />
+            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" default="" delete_if_empty="true" />
+            <combo key="wheelchair" text="Wheelchairs" values="yes,no" default="" delete_if_empty="true" />
+            <space />
+            <text key="phone" text="Phone Number" default="" delete_if_empty="true" />
+            <text key="fax" text="Fax Number" default="" delete_if_empty="true" />
+            <text key="website" text="Website" default="" delete_if_empty="true" />
+            <text key="email" text="Email Address" default="" delete_if_empty="true" />
         </item>
         <item name="Cafe" icon="presets/cafe.png" type="node,closedway">
@@ -1660,5 +1790,16 @@
             <key key="amenity" value="cafe" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="operator" text="Operator" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <space />
+            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" default="" delete_if_empty="true" />
+            <combo key="internet_access:fee" text="Internet access fee" values="yes,3/h,8/d,no" default="" delete_if_empty="true" />
+            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" default="" delete_if_empty="true" />
+            <combo key="wheelchair" text="Wheelchairs" values="yes,no" default="" delete_if_empty="true" />
+            <space />
+            <text key="phone" text="Phone Number" default="" delete_if_empty="true" />
+            <text key="fax" text="Fax Number" default="" delete_if_empty="true" />
+            <text key="website" text="Website" default="" delete_if_empty="true" />
+            <text key="email" text="Email Address" default="" delete_if_empty="true" />
         </item>
         <item name="Pub" icon="presets/pub.png" type="node,closedway">
@@ -1667,6 +1808,17 @@
             <key key="amenity" value="pub" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="operator" text="Operator" default="" delete_if_empty="true" />
             <check key="microbrewery" text="Microbrewery" default="off" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <space />
+            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" default="" delete_if_empty="true" />
+            <combo key="internet_access:fee" text="Internet access fee" values="yes,3/h,8/d,no" default="" delete_if_empty="true" />
+            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" default="" delete_if_empty="true" />
+            <combo key="wheelchair" text="Wheelchairs" values="yes,no" default="" delete_if_empty="true" />
+            <space />
+            <text key="phone" text="Phone Number" default="" delete_if_empty="true" />
+            <text key="fax" text="Fax Number" default="" delete_if_empty="true" />
+            <text key="website" text="Website" default="" delete_if_empty="true" />
+            <text key="email" text="Email Address" default="" delete_if_empty="true" />
         </item>
         <item name="Biergarten" icon="presets/biergarten.png" type="node,closedway">
@@ -1675,4 +1827,14 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <space />
+            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" default="" delete_if_empty="true" />
+            <combo key="internet_access:fee" text="Internet access fee" values="yes,3/h,8/d,no" default="" delete_if_empty="true" />
+            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" default="" delete_if_empty="true" />
+            <combo key="wheelchair" text="Wheelchairs" values="yes,no" default="" delete_if_empty="true" />
+            <space />
+            <text key="phone" text="Phone Number" default="" delete_if_empty="true" />
+            <text key="fax" text="Fax Number" default="" delete_if_empty="true" />
+            <text key="website" text="Website" default="" delete_if_empty="true" />
+            <text key="email" text="Email Address" default="" delete_if_empty="true" />
         </item>
         <item name="Bar" icon="presets/bar.png" type="node,closedway">
@@ -1682,4 +1844,14 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <space />
+            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" default="" delete_if_empty="true" />
+            <combo key="internet_access:fee" text="Internet access fee" values="yes,3/h,8/d,no" default="" delete_if_empty="true" />
+            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" default="" delete_if_empty="true" />
+            <combo key="wheelchair" text="Wheelchairs" values="yes,no" default="" delete_if_empty="true" />
+            <space />
+            <text key="phone" text="Phone Number" default="" delete_if_empty="true" />
+            <text key="fax" text="Fax Number" default="" delete_if_empty="true" />
+            <text key="website" text="Website" default="" delete_if_empty="true" />
+            <text key="email" text="Email Address" default="" delete_if_empty="true" />
         </item>
         <item name="Nightclub" icon="presets/bar.png" type="node,closedway">
@@ -1689,4 +1861,12 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <space />
+            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" default="" delete_if_empty="true" />
+            <combo key="wheelchair" text="Wheelchairs" values="yes,no" default="" delete_if_empty="true" />
+            <space />
+            <text key="phone" text="Phone Number" default="" delete_if_empty="true" />
+            <text key="fax" text="Fax Number" default="" delete_if_empty="true" />
+            <text key="website" text="Website" default="" delete_if_empty="true" />
+            <text key="email" text="Email Address" default="" delete_if_empty="true" />
         </item>
     </group> <!-- Food+Drinks -->