Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 7619)
+++ /trunk/data/defaultpresets.xml	(revision 7620)
@@ -284,7 +284,10 @@
         <reference ref="oh" />
     </chunk>
-    <chunk id="internet_smoking_wheelchair">
+    <chunk id="internet">
         <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" />
+    </chunk>
+    <chunk id="internet_smoking_wheelchair">
+        <reference ref="internet" />
         <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
         <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
@@ -326,4 +329,10 @@
         <check key="payment:account_cards" text="Account or loyalty cards" />
     </chunk>
+    <chunk id="fee">
+        <combo key="fee" text="Fee" values="yes,no" />
+    </chunk>
+    <chunk id="fee_interval">
+        <combo key="fee" text="Fee" delimiter="|" values="yes|no|06:00-20:00|Mo-Fr 09:00-18:00,Sa 08:00-14:00|May-Sep 09:30-12:30,14:15-19:30" />
+    </chunk>
     <chunk id="parking_name_type_ref">
         <text key="name" text="Name" />
@@ -334,15 +343,17 @@
         <space />
         <combo key="access" text="Access" values="yes,private,customers,permissive,no" />
-        <combo key="fee" text="Fee" values="yes,no,interval" />
+        <reference ref="fee_interval" />
         <text key="operator" text="Operator" />
         <reference ref="surface" />
-        <space />
     </chunk>
     <chunk id="maxstay">
         <combo key="maxstay" text="Time Limit (minutes)" values="0,30,60,90,120,180" />
     </chunk>
+    <chunk id="supervised">
+        <combo key="supervised" text="Supervised" delimiter="|" values="yes|no|06:00-20:00|Mo-Fr 09:00-18:00,Sa 08:00-14:00|May-Sep 09:30-12:30,14:15-19:30" />
+    </chunk>
     <chunk id="supervised_lit_oh">
-        <combo key="supervised" text="Supervised" values="yes,no,interval" />
-        <combo key="lit" text="Lit" values="yes,no,interval" />
+        <reference ref="supervised" />
+        <combo key="lit" text="Lit" delimiter="|" values="yes|no|06:00-20:00|Mo-Fr 09:00-18:00,Sa 08:00-14:00|May-Sep 09:30-12:30,14:15-19:30" />
         <reference ref="oh" />
     </chunk>
@@ -1186,5 +1197,5 @@
                 <combo key="crossing" text="Pedestrian crossing type" values="uncontrolled,traffic_signals,island,unmarked,no,unknown" />
                 <combo key="crossing_ref" text="Crossing type name (UK)" values="zebra,pelican,toucan,puffin,pegasus,tiger" />
-                <check key="supervised" text="Crossing attendant" />
+                <combo key="supervised" text="Crossing attendant" delimiter="|" values="yes|no|06:00-20:00|Mo-Fr 09:00-18:00,Sa 08:00-14:00|May-Sep 09:30-12:30,14:15-19:30" />
                 <check key="bicycle" text="Cross by bicycle" />
                 <check key="horse" text="Cross on horseback" />
@@ -1234,5 +1245,5 @@
             <combo key="crossing" text="Pedestrian crossing type" values="uncontrolled,traffic_signals,island,unmarked,no,unknown" />
             <combo key="crossing_ref" text="Crossing type name (UK)" values="zebra,pelican,toucan,puffin,pegasus,tiger" values_searchable="true" />
-            <check key="supervised" text="Crossing attendant" />
+            <combo key="supervised" text="Crossing attendant" delimiter="|" values="yes|no|06:00-20:00|Mo-Fr 09:00-18:00,Sa 08:00-14:00|May-Sep 09:30-12:30,14:15-19:30" />
             <check key="bicycle" text="Cross by bicycle" />
             <check key="horse" text="Cross on horseback" />
@@ -1987,5 +1998,5 @@
             <reference ref="name_wikipedia" />
             <optional>
-                <combo key="supervised" text="Supervised" values="yes,no,interval" />
+                <reference ref="supervised" />
                 <reference ref="oh" />
                 <reference ref="general_access" />
@@ -2244,5 +2255,5 @@
             <key key="railway" value="level_crossing" />
             <optional>
-                <check key="supervised" text="Supervised" />
+                <reference ref="supervised" />
                 <check key="crossing:light" text="Traffic lights" />
                 <check key="crossing:bell" text="Sound signals" />
@@ -2261,7 +2272,7 @@
             <optional>
                 <combo key="crossing" text="Crossing type" values="uncontrolled,traffic_signals,island,unmarked,no,unknown" />
+                <reference ref="supervised" />
                 <check key="horse" text="Cross on horseback" />
                 <check key="bicycle" text="Cross by bicycle" />
-                <check key="supervised" text="Supervised" />
                 <check key="crossing:light" text="Traffic lights" />
                 <check key="crossing:bell" text="Sound signals" />
@@ -2637,8 +2648,9 @@
             <space />
             <key key="amenity" value="motorcycle_parking" />
-            <text key="name" text="Name" />
+            <reference ref="parking_name_type_ref" />
             <text key="capacity" text="Capacity" />
-            <combo key="parking" text="Type" values="multi-storey,surface,underground,rooftop" />
-            <combo key="fee" text="Fee" values="yes,no" />
+            <reference ref="parking_access_fee_operator_surface" />
+            <reference ref="supervised_lit_oh" />
+            <check key="covered" text="Covered (with roof)" />
         </item> <!-- Parking -->
         <item name="Motorcycle Dealer" icon="presets/motorbike.png" type="node,closedway" preset_name_label="true">
@@ -2685,5 +2697,6 @@
             <combo key="bicycle_parking" text="Type" values="anchors,building,ground_slots,informal,lockers,rack,shed,stands,wall_loops" />
             <check key="covered" text="Covered" />
-            <check key="supervised" text="Supervised" />
+            <reference ref="fee_interval" />
+            <reference ref="supervised_lit_oh" />
         </item> <!-- Parking -->
         <item name="Bike Dealer" icon="presets/bike.png" type="node,closedway" preset_name_label="true">
@@ -3096,6 +3109,5 @@
             <key key="aeroway" value="terminal" />
             <text key="name" text="Name" />
-            <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="internet" />
             <reference ref="link_contact" />
         </item> <!-- Terminal -->
@@ -3224,5 +3236,5 @@
             <space />
             <text key="capacity" text="Number of places" />
-            <combo key="fee" text="Requires a fee" values="yes,no,interval" />
+            <reference ref="fee_interval" />
             <check key="power_supply" text="Power supply" />
             <check key="tents" text="Tents allowed" />
@@ -3437,6 +3449,5 @@
             <key key="information" value="office" />
             <reference ref="name_oh" />
-            <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="internet" />
             <reference ref="link_contact" />
         </item> <!-- Information Office -->
@@ -3516,7 +3527,6 @@
             <text key="description" text="Closer description" />
             <text key="ref" text="Reference number" />
-            <combo key="fee" text="Fee" values="yes,no" />
-            <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="fee" />
+            <reference ref="internet" />
         </item> <!-- Information Terminal -->
         <item name="Audio Guide" icon="presets/information.png" type="node" preset_name_label="true">
@@ -3534,5 +3544,5 @@
             <text key="description" text="Closer description" />
             <text key="ref" text="Reference number" />
-            <combo key="fee" text="Fee" values="yes,no" />
+            <reference ref="fee" />
             <space />
             <label text="Audioguide via mobile phone?" />
@@ -3642,5 +3652,5 @@
             <key key="leisure" value="horse_riding" />
             <reference ref="name_operator_oh" />
-            <text key="fee" text="Fee" />
+            <reference ref="fee" />
             <space />
             <reference ref="contact" />
@@ -3999,6 +4009,5 @@
             <space />
             <key key="amenity" value="community_centre" />
-            <reference ref="name_operator" />
-            <reference ref="oh" />
+            <reference ref="name_operator_oh" />
         </item> <!-- Community Centre -->
         <item name="Embassy" icon="presets/embassy.png" type="node,closedway,relation" preset_name_label="true">
@@ -4036,5 +4045,5 @@
             <space />
             <key key="amenity" value="prison" />
-            <text key="name" text="Name" />
+            <reference ref="name_operator" />
             <reference ref="link_contact" />
         </item> <!-- Prison -->
@@ -4079,5 +4088,5 @@
             <space />
             <key key="amenity" value="post_office" />
-            <reference ref="name_operator" />
+            <reference ref="name_operator_oh" />
         </item> <!-- Post Office -->
     </group> <!-- Public Buildings -->
@@ -4093,5 +4102,5 @@
             <space />
             <key key="amenity" value="kindergarten" />
-            <text key="name" text="Name" />
+            <reference ref="name_operator_oh" />
             <reference ref="link_contact" />
         </item> <!-- Kindergarten -->
@@ -4109,5 +4118,5 @@
             <space />
             <key key="amenity" value="school" />
-            <text key="name" text="Name" />
+            <reference ref="name_operator_oh" />
             <reference ref="link_contact" />
         </item> <!-- School -->
@@ -4124,5 +4133,5 @@
             <space />
             <key key="amenity" value="university" />
-            <text key="name" text="Name" />
+            <reference ref="name_operator" />
             <reference ref="link_contact" />
         </item> <!-- University -->
@@ -4136,5 +4145,5 @@
             <space />
             <key key="amenity" value="college" />
-            <text key="name" text="Name" />
+            <reference ref="name_operator" />
             <reference ref="link_contact" />
         </item> <!-- College -->
@@ -4145,5 +4154,5 @@
             <space />
             <key key="amenity" value="driving_school" />
-            <reference ref="name_operator" />
+            <reference ref="name_operator_oh" />
             <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" />
             <reference ref="link_contact" />
@@ -4170,5 +4179,5 @@
             <space />
             <key key="amenity" value="clinic" />
-            <text key="name" text="Name" />
+            <reference ref="name_operator" />
             <reference ref="link_contact" />
         </item> <!-- Clinic -->
@@ -4313,5 +4322,5 @@
             <optional>
                 <text key="description" text="Description" />
-                <combo key="fee" text="Fee" values="yes,no" />
+                <reference ref="fee" />
                 <text key="operator" text="Operator" />
                 <combo key="toilets:position" text="Usage Position" values="seated,seated;urinal,squat,urinal" />
@@ -4376,6 +4385,5 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:internet_access" />
             <space />
-            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" match="key" />
-            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" match="key" />
+            <reference ref="internet" />
         </item> <!-- Internet Access -->
         <item name="Automated Defibrillator" icon="presets/aed.svg" type="node" preset_name_label="true">
@@ -6945,5 +6953,5 @@
             <reference ref="oh" />
             <reference ref="general_access" />
-            <combo key="fee" text="Fee" values="yes,no" />
+            <reference ref="fee" />
         </item> <!-- Cave Entrance -->
         <separator/>
Index: /trunk/data/validator/deprecated.mapcss
===================================================================
--- /trunk/data/validator/deprecated.mapcss	(revision 7619)
+++ /trunk/data/validator/deprecated.mapcss	(revision 7620)
@@ -302,4 +302,9 @@
 }
 
+/* See #10530 - Incorrect tag proposed in internal preset for years */
+*[fee=interval] {
+  throwWarning: tr("{0} is deprecated. Please specify ìnterval by using opening_hours syntax", "{0.tag}");
+}
+
 /* See #10582 - JOSM supported this tag as "don't upload this" feature, before the introduction of upload flag at layer level */
 *[/josm\/ignore/] {