Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 6617)
+++ /trunk/data/defaultpresets.xml	(revision 6618)
@@ -158,4 +158,5 @@
 Note that for a match, at least one positive and no negative is required.
 -->
+    <!-- Item chunks -->
     <chunk id="surface">
         <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
@@ -286,4 +287,9 @@
         <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
     </chunk>
+  <!-- Link chunks -->
+  <chunk id="link_contact">
+    <preset_link preset_name="Contact (common schema)" />
+  </chunk>
+  <!--  Groups -->
   <group name="Highways" icon="presets/way_secondary.png">
     <group name="Streets" icon="presets/way_secondary.png">
@@ -2384,4 +2390,5 @@
             <key key="shop" value="car" />
             <reference ref="name_brand_operator_oh" />
+            <reference ref="link_contact" />
         </item>
         <item name="Repair" icon="presets/car_repair.png" type="node,closedway">
@@ -2390,4 +2397,5 @@
             <key key="shop" value="car_repair" />
             <reference ref="name_brand_operator_oh" />
+            <reference ref="link_contact" />
         </item>
         <item name="Parts" icon="presets/car_repair.png" type="node,closedway">
@@ -2398,4 +2406,5 @@
             <key key="shop" value="car_parts" />
             <reference ref="name_brand_operator_oh" />
+            <reference ref="link_contact" />
         </item>
         <item name="Tyres" icon="presets/tyres.png" type="node,closedway">
@@ -2404,9 +2413,5 @@
             <key key="shop" value="tyres" />
             <reference ref="name_brand_operator_oh" />
-            <label text="Contact:" />
-                <text key="phone" text="Phone Number" />
-                <text key="fax" text="Fax Number" />
-                <text key="website" text="Website" />
-                <text key="email" text="Email Address" />
+            <reference ref="link_contact" />
         </item>
         <separator/>
@@ -2422,4 +2427,5 @@
             <reference ref="name_brand_operator_oh" />
             <combo key="second_hand" text="Second hand" values="only,yes,no" />
+            <reference ref="link_contact" />
         </item>
         <item name="Sharing" icon="presets/car_sharing.png" type="node,closedway">
@@ -2472,10 +2478,5 @@
                 <text key="services" text="Other" />
             </optional>
-            <optional text="Contact:">
-                <text key="phone" text="Phone Number" />
-                <text key="fax" text="Fax Number" />
-                <text key="website" text="Website" />
-                <text key="email" text="Email Address" />
-            </optional>
+            <reference ref="link_contact" />
         </item>
     </group> <!-- Motorcycle -->
@@ -2521,4 +2522,5 @@
             <check key="service:bicycle:diy" text="Tools for do-it-yourself repair (may be a bike co-operative)" />
             <check key="service:bicycle:cleaning" text="Bicycles are washed (for a fee)" />
+            <reference ref="link_contact" />
         </item>
         <item name="Rental" icon="presets/bicycle_rental.png" type="node,closedway">
@@ -2538,4 +2540,5 @@
             <key key="amenity" value="bicycle_rental" />
             <text key="name" text="Name" />
+            <reference ref="link_contact" />
         </item>
     </group> <!-- Bicycle -->
@@ -2901,4 +2904,5 @@
             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
             <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
+            <reference ref="link_contact" />
         </item>
         <item name="Gate" name_context="airport" icon="presets/aeroway_gate.png" type="node">
@@ -3253,4 +3257,5 @@
             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
             <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
+            <reference ref="link_contact" />
         </item>
         <item name="Map" icon="presets/map.png" type="node">
@@ -3362,4 +3367,5 @@
             <key key="amenity" value="cinema" />
             <reference ref="name_operator_oh" />
+            <reference ref="link_contact" />
         </item>
         <item name="Zoo" icon="presets/zoo.png" type="node,closedway">
@@ -3528,4 +3534,5 @@
             <reference ref="name_operator_oh" />
             <text key="wikipedia" text="Wikipedia" />
+            <reference ref="link_contact" />
         </item>
         <item name="Theatre" icon="presets/theater.png" type="node,closedway,relation">
@@ -3539,4 +3546,5 @@
             <key key="amenity" value="theatre" />
             <reference ref="name_operator" />
+            <reference ref="link_contact" />
         </item>
         <item name="Library" icon="styles/standard/shop/rental/library.png" type="node,closedway,relation">
@@ -3553,4 +3561,5 @@
             <key key="amenity" value="library" />
             <reference ref="name_operator_oh" />
+            <reference ref="link_contact" />
         </item>
         <item name="Arts Centre" icon="presets/arts_centre.png" type="node,closedway,relation">
@@ -3564,4 +3573,5 @@
             <key key="amenity" value="arts_centre" />
             <text key="name" text="Name" />
+            <reference ref="link_contact" />
         </item>
         <item name="Artwork" icon="presets/arts_centre.png" type="node,way,closedway">
@@ -3588,6 +3598,5 @@
             <reference ref="name_operator" />
             <combo key="type" text="Type" values="audio,video" />
-            <text key="phone" text="Phone Number" />
-            <text key="website" text="Website" />
+            <reference ref="link_contact" />
         </item>
     </group> <!-- Culture -->
@@ -3779,4 +3788,5 @@
             <key key="amenity" value="townhall" />
             <text key="name" text="Name" />
+            <reference ref="link_contact" />
         </item>
         <item name="Community Centre" icon="presets/community_centre.png" type="node,closedway">
@@ -3803,4 +3813,5 @@
             <key key="amenity" value="embassy" />
             <text key="name" text="Name" />
+            <reference ref="link_contact" />
         </item>
         <item name="Courthouse" icon="presets/JusticeScales.png" type="node,closedway,relation">
@@ -3814,4 +3825,5 @@
             <key key="amenity" value="courthouse" />
             <text key="name" text="Name" />
+            <reference ref="link_contact" />
         </item>
         <item name="Prison" icon="presets/prison.png" type="node,closedway,relation">
@@ -3825,4 +3837,5 @@
             <key key="amenity" value="prison" />
             <text key="name" text="Name" />
+            <reference ref="link_contact" />
         </item>
         <item name="Police" icon="styles/standard/service/police.png" type="node,closedway,relation">
@@ -3839,4 +3852,5 @@
             <key key="amenity" value="police" />
             <text key="name" text="Name" />
+            <reference ref="link_contact" />
         </item>
         <item name="Fire Station" icon="presets/firebrigade.png" type="node,closedway,relation">
@@ -3876,5 +3890,5 @@
             <key key="amenity" value="kindergarten" />
             <text key="name" text="Name" />
-            <preset_link preset_name="Contact (common schema)" />
+            <reference ref="link_contact" />
         </item>
         <item name="School" icon="presets/school.png" type="node,closedway,relation">
@@ -3893,5 +3907,5 @@
             <key key="amenity" value="school" />
             <text key="name" text="Name" />
-            <preset_link preset_name="Contact (common schema)" />
+            <reference ref="link_contact" />
         </item>
         <item name="University" icon="styles/standard/education/university.png" type="node,closedway,relation">
@@ -3909,5 +3923,5 @@
             <key key="amenity" value="university" />
             <text key="name" text="Name" />
-            <preset_link preset_name="Contact (common schema)" />
+            <reference ref="link_contact" />
         </item>
         <item name="College" icon="styles/standard/education/college.png" type="node,closedway,relation">
@@ -3922,5 +3936,5 @@
             <key key="amenity" value="college" />
             <text key="name" text="Name" />
-            <preset_link preset_name="Contact (common schema)" />
+            <reference ref="link_contact" />
         </item>
          <item name="Driving School" icon="styles/standard/education/driving_school.png" type="node,closedway">
@@ -3931,5 +3945,5 @@
             <reference ref="name_operator" />
             <combo key="license_classes" text="License Classes" values="A;A1;B;BE;C,A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E" />
-             <preset_link preset_name="Contact (common schema)" />
+            <reference ref="link_contact" />
         </item>
     </group> <!-- Education -->
@@ -3948,4 +3962,5 @@
             <key key="amenity" value="hospital" />
             <reference ref="name_operator" />
+            <reference ref="link_contact" />
         </item>
         <item name="Clinic" icon="styles/standard/health/hospital.png" type="node,closedway">
@@ -3956,4 +3971,5 @@
             <key key="amenity" value="clinic" />
             <text key="name" text="Name" />
+            <reference ref="link_contact" />
         </item>
         <item name="Doctors" icon="styles/standard/health/doctor.png" type="node,closedway">
@@ -3966,4 +3982,5 @@
             <key key="amenity" value="doctors" />
             <reference ref="name_oh" />
+            <reference ref="link_contact" />
         </item>
         <item name="Dentist" icon="styles/standard/health/dentist.png" type="node,closedway">
@@ -3972,4 +3989,5 @@
             <key key="amenity" value="dentist" />
             <reference ref="name_oh" />
+            <reference ref="link_contact" />
         </item>
         <item name="Nursing Home" type="node,closedway">
@@ -3978,4 +3996,5 @@
             <key key="amenity" value="nursing_home" />
             <reference ref="name_operator" />
+            <reference ref="link_contact" />
         </item>
         <item name="Retirement Home" type="node,closedway">
@@ -3992,4 +4011,5 @@
             <reference ref="name_operator" />
             <text key="capacity" text="Capacity" />
+            <reference ref="link_contact" />
         </item>
         <separator/>
@@ -4009,4 +4029,5 @@
             <combo key="dispensing" text="Dispensing" values="yes,no" default="no" />
             <reference ref="oh" />
+            <reference ref="link_contact" />
         </item>
         <item name="Hearing Aids" icon="presets/hearing_aids.png" type="node,closedway">
@@ -4018,4 +4039,5 @@
             <key key="shop" value="hearing_aids" />
             <reference ref="name_operator_oh" />
+            <reference ref="link_contact" />
         </item>
         <separator/>
@@ -4069,4 +4091,5 @@
             <key key="amenity" value="veterinary" />
             <reference ref="name_oh" />
+            <reference ref="link_contact" />
         </item>
     </group> <!-- Health -->
@@ -5347,4 +5370,5 @@
             <key key="shop" value="supermarket" />
             <reference ref="name_oh" />
+            <reference ref="link_contact" />
         </item>
         <item name="Convenience Store" icon="presets/convenience.png" type="node,closedway">
@@ -5358,4 +5382,5 @@
             <key key="shop" value="convenience" />
             <reference ref="name_oh" />
+            <reference ref="link_contact" />
         </item>
         <item name="Kiosk" icon="presets/kiosk.png" type="node,closedway">
@@ -5370,4 +5395,5 @@
             <key key="shop" value="kiosk" />
             <reference ref="name_oh" />
+            <reference ref="link_contact" />
         </item>
         <separator/>
@@ -5386,4 +5412,5 @@
             <key key="shop" value="bakery" />
             <reference ref="name_oh" />
+            <reference ref="link_contact" />
         </item>
         <item name="Butcher" icon="presets/cow.png" type="node,closedway">
@@ -5399,4 +5426,5 @@
             <key key="shop" value="butcher" />
             <reference ref="name_oh" />
+            <reference ref="link_contact" />
         </item>
         <item name="Seafood" icon="presets/seafood.png" type="node,closedway">
@@ -5409,4 +5437,5 @@
             <key key="shop" value="seafood" />
             <reference ref="name_operator_oh" />
+            <reference ref="link_contact" />
         </item>
         <item name="Deli (Fine Food)" icon="presets/deli.png" type="node,closedway">
@@ -5421,4 +5450,5 @@
             <key key="shop" value="deli" />
             <reference ref="name_operator_oh" />
+            <reference ref="link_contact" />
         </item>
         <item name="Confectionery" icon="presets/confectionery.png" type="node,closedway">
@@ -5434,4 +5464,5 @@
             <key key="shop" value="confectionery" />
             <reference ref="name_oh" />
+            <reference ref="link_contact" />
         </item>
         <separator/>
@@ -5462,6 +5493,6 @@
             <key key="shop" value="greengrocer" />
             <reference ref="name_oh" />
-            <text key="website" text="Website" />
             <combo key="organic" text="Organic" values="only,yes,no" />
+            <reference ref="link_contact" />
         </item>
         <item name="Farm Stand" icon="presets/apple.png" type="node,closedway">
@@ -5475,7 +5506,6 @@
             <reference ref="name_oh" />
             <text key="description" text="Description" />
-            <text key="phone" text="Phone Number" match="key" />
-            <text key="website" text="Website" />
             <combo key="organic" text="Organic" values="only,yes,no" />
+            <reference ref="link_contact" />
         </item>
         <separator/>
@@ -5505,4 +5535,5 @@
             <key key="shop" value="alcohol" />
             <reference ref="name_oh" />
+            <reference ref="link_contact" />
         </item>
         <item name="Beverages" icon="styles/standard/shop/beverages.png" type="node,closedway">
@@ -5515,4 +5546,5 @@
             <key key="shop" value="beverages" />
             <reference ref="name_oh" />
+            <reference ref="link_contact" />
         </item>
     </group> <!-- Food -->
@@ -5531,4 +5563,5 @@
             <combo key="second_hand" text="Second hand" values="only,yes,no" />
             <combo key="organic" text="Organic" values="only,yes,no" />
+            <reference ref="link_contact" />
         </item>
         <item name="Boutique" icon="presets/boutique.png" type="node,closedway">
@@ -5542,4 +5575,5 @@
             <key key="shop" value="boutique" />
             <reference ref="name_operator_oh" />
+            <reference ref="link_contact" />
         </item>
         <item name="Shoes" icon="styles/standard/shop/shoes.png" type="node,closedway">
@@ -5554,4 +5588,5 @@
             <combo key="second_hand" text="Second hand" values="only,yes,no" />
             <combo key="organic" text="Organic" values="only,yes,no" />
+            <reference ref="link_contact" />
         </item>
         <item name="Outdoor" icon="presets/tent.png" type="node,closedway">
@@ -5564,4 +5599,5 @@
             <key key="shop" value="outdoor" />
             <reference ref="name_oh" />
+            <reference ref="link_contact" />
         </item>
         <item name="Sports" icon="presets/rowing.png" type="node,closedway">
@@ -5573,4 +5609,5 @@
             <key key="shop" value="sports" />
             <reference ref="name_oh" />
+            <reference ref="link_contact" />
         </item>
         <separator/>
@@ -5585,4 +5622,5 @@
             <key key="shop" value="dry_cleaning" />
             <reference ref="name_oh" />
+            <reference ref="link_contact" />
         </item>
         <item name="Laundry" icon="presets/laundry.png" type="node,closedway">
@@ -5595,4 +5633,5 @@
             <key key="shop" value="laundry" />
             <reference ref="name_oh" />
+            <reference ref="link_contact" />
         </item>
         <item name="Tailor" icon="styles/standard/shop/tailor.png" type="node,closedway">
@@ -5601,4 +5640,5 @@
             <key key="shop" value="tailor" />
             <reference ref="name_oh" />
+            <reference ref="link_contact" />
         </item>
         <item name="Fabric" icon="presets/fabric.png" type="node,closedway">
@@ -5610,4 +5650,5 @@
             <key key="shop" value="fabric" />
             <reference ref="name_operator_oh" />
+            <reference ref="link_contact" />
         </item>
     </group> <!-- Clothes -->
@@ -5622,4 +5663,5 @@
             <key key="shop" value="computer" />
             <reference ref="name_oh" />
+            <reference ref="link_contact" />
         </item>
         <item name="Electronics" icon="styles/standard/shop/electronics.png" type="node,closedway">
@@ -5632,4 +5674,5 @@
             <key key="shop" value="electronics" />
             <reference ref="name_oh" />
+            <reference ref="link_contact" />
         </item>
         <item name="Mobile Phone" icon="presets/mobile_phone.png" type="node,closedway">
@@ -5641,4 +5684,5 @@
             <key key="shop" value="mobile_phone" />
             <reference ref="name_operator_oh" />
+            <reference ref="link_contact" />
         </item>
         <item name="Vacuum Cleaner" icon="presets/vacuum_cleaner.png" type="node,closedway">
@@ -5650,4 +5694,5 @@
             <key key="shop" value="vacuum_cleaner" />
             <reference ref="name_operator_oh" />
+            <reference ref="link_contact" />
         </item>
         <item name="Hifi" icon="styles/standard/shop/hifi.png" type="node,closedway">
@@ -5660,4 +5705,5 @@
             <key key="shop" value="hifi" />
             <reference ref="name_oh" />
+            <reference ref="link_contact" />
         </item>
         <item name="Video" icon="styles/standard/shop/video.png" type="node,closedway">
@@ -5670,4 +5716,5 @@
             <key key="shop" value="video" />
             <reference ref="name_oh" />
+            <reference ref="link_contact" />
         </item>
     </group> <!-- Electronic -->
@@ -5689,4 +5736,5 @@
             <reference ref="name_brand_operator_oh" />
             <check key="atm" text="Automated Teller Machine" default="on" />
+            <reference ref="link_contact" />
         </item>
         <item name="Money Exchange" icon="styles/standard/money/exchange.png" type="node,closedway">
@@ -5701,4 +5749,5 @@
             <key key="amenity" value="bureau_de_change" />
             <reference ref="name_oh" />
+            <reference ref="link_contact" />
         </item>
         <item name="Automated Teller Machine" icon="styles/standard/money/atm.png" type="node">
@@ -5729,4 +5778,5 @@
             <key key="shop" value="pawnbroker" />
             <reference ref="name_oh" />
+            <reference ref="link_contact" />
         </item>
     </group> <!-- Cash -->
@@ -5742,4 +5792,5 @@
             <key key="shop" value="department_store" />
             <reference ref="name_operator_oh" />
+            <reference ref="link_contact" />
         </item>
         <item name="Mall" icon="styles/standard/shop/mall.png" type="node,closedway">
@@ -5752,4 +5803,5 @@
             <key key="shop" value="mall" />
             <reference ref="name_operator_oh" />
+            <reference ref="link_contact" />
         </item>
         <separator/>
@@ -5764,4 +5816,5 @@
             <key key="shop" value="chemist" />
             <reference ref="name_oh" />
+            <reference ref="link_contact" />
         </item>
         <item name="Hairdresser" icon="styles/standard/shop/hairdresser.png" type="node,closedway">
@@ -5776,4 +5829,5 @@
             <key key="shop" value="hairdresser" />
             <reference ref="name_oh" />
+            <reference ref="link_contact" />
         </item>
         <item name="Optician" icon="styles/standard/shop/optician.png" type="node,closedway">
@@ -5785,4 +5839,5 @@
             <key key="shop" value="optician" />
             <reference ref="name_oh" />
+            <reference ref="link_contact" />
         </item>
         <item name="Jewelry" icon="styles/standard/shop/jewelry.png" type="node,closedway">
@@ -5794,4 +5849,5 @@
             <key key="shop" value="jewelry" />
             <reference ref="name_operator_oh" />
+            <reference ref="link_contact" />
         </item>
         <item name="Gift" icon="http://openclipart.org/people/secretlondon/secretlondon_chocolate_present.svg" type="node,closedway">
@@ -5810,4 +5866,5 @@
                 <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,evangelical,jehovahs_witness,lutheran,methodist,mormon,orthodox,pentecostal,presbyterian,protestant,quaker,shia,sunni" />
             </optional>
+            <reference ref="link_contact" />
         </item>
         <item name="Erotic" icon="presets/erotic.png" type="node,closedway">
@@ -5819,4 +5876,5 @@
             <key key="shop" value="erotic" />
             <reference ref="name_operator_oh" />
+            <reference ref="link_contact" />
         </item>
         <separator/>
@@ -5832,4 +5890,5 @@
             <key key="shop" value="florist" />
             <reference ref="name_oh" />
+            <reference ref="link_contact" />
         </item>
         <item name="Garden Centre" icon="styles/standard/shop/garden_centre.png" type="node,closedway">
@@ -5845,4 +5904,5 @@
             <key key="shop" value="garden_centre" />
             <reference ref="name_brand_oh" />
+            <reference ref="link_contact" />
         </item>
         <separator/>
@@ -5858,4 +5918,5 @@
             <key key="shop" value="doityourself" />
             <reference ref="name_brand_oh" />
+            <reference ref="link_contact" />
         </item>
         <item name="Hardware" icon="presets/hardware.png" type="node,closedway">
@@ -5868,4 +5929,5 @@
             <key key="shop" value="hardware" />
             <reference ref="name_oh" />
+            <reference ref="link_contact" />
         </item>
         <item name="Paint" icon="presets/paint.png" type="node,closedway">
@@ -5878,4 +5940,5 @@
             <key key="shop" value="paint" />
             <reference ref="name_operator_oh" />
+            <reference ref="link_contact" />
         </item>
         <separator/>
@@ -5885,4 +5948,5 @@
             <key key="shop" value="furniture" />
             <reference ref="name_brand_operator_oh" />
+            <reference ref="link_contact" />
         </item>
         <item name="Kitchen" icon="presets/kitchen.png" type="node,closedway">
@@ -5896,4 +5960,5 @@
             <key key="shop" value="kitchen" />
             <reference ref="name_brand_operator_oh" />
+            <reference ref="link_contact" />
         </item>
         <item name="Curtain" icon="presets/curtain.png" type="node,closedway">
@@ -5905,4 +5970,5 @@
             <key key="shop" value="curtain" />
             <reference ref="name_operator_oh" />
+            <reference ref="link_contact" />
         </item>
         <item name="Frame" icon="presets/frame.png" type="node,closedway">
@@ -5915,4 +5981,5 @@
             <key key="shop" value="frame" />
             <reference ref="name_operator_oh" />
+            <reference ref="link_contact" />
         </item>
         <separator/>