Index: /trunk/resources/data/defaultpresets.xml
===================================================================
--- /trunk/resources/data/defaultpresets.xml	(revision 18551)
+++ /trunk/resources/data/defaultpresets.xml	(revision 18552)
@@ -7,5 +7,5 @@
     <!-- Item chunks -->
     <chunk id="surface">
-        <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,concrete:plates,concrete:lanes,paving_stones,sett,cobblestone,unhewn_cobblestone,grass_paver,compacted,fine_gravel,gravel,pebblestone,ground,mud,sand,grass,wood,metal" />
+        <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,concrete:plates,concrete:lanes,paving_stones,sett,cobblestone,unhewn_cobblestone,grass_paver,compacted,fine_gravel,gravel,pebblestone,ground,mud,rock,sand,grass,wood,metal" />
     </chunk>
     <chunk id="surface_smoothness">
@@ -53,4 +53,7 @@
         <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
     </chunk>
+    <chunk id="lit_common_no_times">
+        <combo key="lit" text="Lit" values="yes,no,24/7,automatic,limited,disused"/>
+    </chunk>
     <chunk id="highway_yesno_incline_oneway_lit_width">
         <checkgroup columns="4">
@@ -60,6 +63,6 @@
             <check key="cutting" text="Cutting" disable_off="true" />
             <check key="oneway" text="Oneway" />
-            <check key="lit" text="Lit" />
         </checkgroup>
+        <reference ref="lit_common_no_times"/>
         <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
         <text key="width" text="Width (meters)" />
@@ -132,5 +135,5 @@
         <combo key="animated" text="Animated" values="yes,winding_posters,screen,trivision_blades,revolving,digital_messages,digital_prices,no" values_sort="false" />
         <check key="luminous" text="Luminous" />
-        <check key="lit" text="Lit" />
+        <reference ref="lit_common_no_times"/>
     </chunk>
     <chunk id="min_age">
@@ -347,5 +350,5 @@
     </chunk>
     <chunk id="other_religions"> <!-- religions which don't have an own preset -->
-        <combo key="religion" text="Religion" values="bahai,caodaism,confucian,jain,sikh,spiritualist,taoist,tenrikyo,unitarian_universalist,zoroastrian" match="keyvalue!" values_searchable="true" />
+        <combo key="religion" text="Religion" values="bahai,caodaism,confucian,jain,none,sikh,spiritualist,taoist,tenrikyo,unitarian_universalist,zoroastrian" match="keyvalue!" values_searchable="true" />
     </chunk>
     <chunk id="christian_denominations"> <!-- christian denominations -->
@@ -676,7 +679,7 @@
                 <checkgroup columns="4">
                     <check key="oneway" text="Oneway" default="on" />
-                    <check key="lit" text="Lit" />
                     <check key="toll" text="Toll" />
                 </checkgroup>
+                <reference ref="lit_common_no_times"/>
                 <reference ref="placement_shoulder" />
             </optional>
@@ -698,7 +701,7 @@
                 <checkgroup columns="4">
                     <check key="oneway" text="Oneway" default="on" />
-                    <check key="lit" text="Lit" />
                     <check key="toll" text="Toll" />
                 </checkgroup>
+                <reference ref="lit_common_no_times"/>
                 <reference ref="placement_shoulder" />
             </optional>
@@ -722,8 +725,8 @@
                 <checkgroup columns="4">
                     <check key="oneway" text="Oneway" default="on" />
-                    <check key="lit" text="Lit" />
                     <check key="toll" text="Toll" />
                     <check key="motorroad" text="Motorroad" default="on" />
                 </checkgroup>
+                <reference ref="lit_common_no_times"/>
                 <reference ref="placement_shoulder" />
             </optional>
@@ -746,8 +749,8 @@
                 <checkgroup columns="4">
                     <check key="oneway" text="Oneway" default="on" />
-                    <check key="lit" text="Lit" />
                     <check key="toll" text="Toll" />
                     <check key="motorroad" text="Motorroad" default="on" />
                 </checkgroup>
+                <reference ref="lit_common_no_times"/>
                 <reference ref="placement_shoulder" />
             </optional>
@@ -886,6 +889,6 @@
                     <check key="oneway" text="Oneway" />
                     <check key="oneway:bicycle" text="Oneway for bicycle" />
-                    <check key="lit" text="Lit" />
                 </checkgroup>
+                <reference ref="lit_common_no_times"/>
                 <text key="width" text="Width (meters)" />
                 <combo key="bus_bay" text="Bus bay" values="both,left,right" />
@@ -916,6 +919,6 @@
                     <check key="oneway" text="Oneway" />
                     <check key="oneway:bicycle" text="Oneway for bicycle" />
-                    <check key="lit" text="Lit" />
                 </checkgroup>
+                <reference ref="lit_common_no_times"/>
                 <text key="width" text="Width (meters)" />
                 <combo key="bus_bay" text="Bus bay" values="both,left,right" />
@@ -953,5 +956,5 @@
                 <check key="area" text="Area" />
                 <reference ref="highway_yesno_incline" />
-                <check key="lit" text="Lit" />
+                <reference ref="lit_common_no_times"/>
                 <text key="width" text="Width (meters)" />
             </optional>
@@ -979,5 +982,5 @@
                 <reference ref="surface_smoothness" />
                 <check key="oneway" text="Oneway" />
-                <check key="lit" text="Lit" />
+                <reference ref="lit_common_no_times"/>
             </optional>
             <reference ref="link_road_access_restrictions" />
@@ -991,5 +994,5 @@
                 <reference ref="surface" />
                 <text key="width" text="Width (meters)" />
-                <check key="lit" text="Lit" />
+                <reference ref="lit_common_no_times"/>
             </optional>
         </item> <!-- Escape -->
@@ -1838,4 +1841,5 @@
             <reference ref="check_access_nomotor" />
             <reference ref="check_access_motor" />
+            <check key="locked" text="Usually locked"/>
             <preset_link preset_name="Access Restrictions" />
         </item> <!-- Gate -->
@@ -1851,4 +1855,5 @@
             <reference ref="check_access_nomotor" />
             <reference ref="check_access_motor" />
+            <check key="locked" text="Usually locked"/>
             <preset_link preset_name="Access Restrictions" />
         </item> <!-- Lift Gate -->
@@ -1864,4 +1869,5 @@
             <reference ref="check_access_nomotor" />
             <reference ref="check_access_motor" />
+            <check key="locked" text="Usually locked"/>
             <preset_link preset_name="Access Restrictions" />
         </item> <!-- Swing Gate -->
@@ -1876,4 +1882,5 @@
             <reference ref="check_access_nomotor" />
             <reference ref="check_access_motor" />
+            <check key="locked" text="Usually locked"/>
             <preset_link preset_name="Access Restrictions" />
         </item> <!-- Hampshire Gate -->
@@ -1888,4 +1895,5 @@
             <reference ref="check_access_nomotor" />
             <reference ref="check_access_motor" />
+            <check key="locked" text="Usually locked"/>
             <preset_link preset_name="Access Restrictions" />
         </item> <!-- Bump Gate -->
@@ -1900,4 +1908,5 @@
             <reference ref="highway_access_vehicle" />
             <reference ref="check_access_nomotor" />
+            <check key="locked" text="Usually locked"/>
             <preset_link preset_name="Access Restrictions" />
         </item> <!-- Kissing Gate -->
@@ -1922,4 +1931,5 @@
             <reference ref="check_access_nomotor" />
             <reference ref="check_access_motor" />
+            <check key="locked" text="Usually locked"/>
             <preset_link preset_name="Access Restrictions" />
         </item> <!-- Chain -->
@@ -3944,5 +3954,5 @@
             <key key="leisure" value="dog_park" />
             <reference ref="name_oh_wheelchair" />
-            <check key="lit" text="Lit" />
+            <reference ref="lit_common_no_times"/>
         </item> <!-- Dog Park -->
         <item name="Amusement/Theme Park" icon="presets/leisure/theme_park.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -5666,5 +5676,5 @@
             <link wiki="Key:building" />
             <space />
-            <combo key="building" text="Building" values="allotment_house,bakehouse,barn,basilica,boathouse,bunker,cabin,carport,cathedral,chapel,church,college,commercial,construction,cowshed,digester,farm_auxiliary,fire_station,garage,garages,gasometer,gatehouse,grandstand,greenhouse,hangar,hospital,industrial,kindergarten,kiosk,manufacture,monastery,mosque,office,parking,public,retail,roof,ruins,school,service,shed,silo,stable,storage_tank,sty,supermarket,synagogue,temple,tent,toilets,train_station,transformer_tower,transportation,university,warehouse,yes" values_context="building" default="yes" match="keyvalue!" values_searchable="true" />
+            <combo key="building" text="Building" values="allotment_house,bakehouse,barn,basilica,boathouse,bunker,cabin,carport,cathedral,chapel,church,college,commercial,construction,cowshed,digester,farm_auxiliary,fire_station,garage,garages,gasometer,gatehouse,grandstand,greenhouse,hangar,hospital,industrial,kindergarten,kiosk,manufacture,monastery,mosque,office,pavilion,parking,public,retail,roof,ruins,school,service,shed,silo,stable,storage_tank,sty,supermarket,synagogue,temple,tent,toilets,train_station,transformer_tower,transportation,university,warehouse,yes" values_context="building" default="yes" match="keyvalue!" values_searchable="true" />
             <optional>
                 <reference ref="name_operator" />
@@ -5701,5 +5711,5 @@
             <space />
             <key key="building" value="construction" />
-            <combo key="construction" text="Building type" values="allotment_house,apartments,bakehouse,barn,basilica,boathouse,bungalow,bunker,cabin,carport,cathedral,chapel,church,college,commercial,cowshed,detached,digester,dormitory,farm,farm_auxiliary,fire_station,garage,garages,gasometer,gatehouse,ger,grandstand,greenhouse,hangar,hospital,hotel,house,hut,industrial,kindergarten,kiosk,manufacture,monastery,mosque,office,parking,public,residential,retail,roof,ruins,school,service,shed,silo,stable,stilt_house,storage_tank,sty,supermarket,synagogue,temple,tent,terrace,toilets,train_station,transformer_tower,transportation,university,warehouse,wayside_shrine" values_context="building" />
+            <combo key="construction" text="Building type" values="allotment_house,apartments,bakehouse,barn,basilica,boathouse,bungalow,bunker,cabin,carport,cathedral,chapel,church,college,commercial,cowshed,detached,digester,dormitory,farm,farm_auxiliary,fire_station,garage,garages,gasometer,gatehouse,ger,grandstand,greenhouse,hangar,hospital,hotel,house,hut,industrial,kindergarten,kiosk,manufacture,monastery,mosque,office,parking,pavilion,public,residential,retail,roof,ruins,school,service,shed,silo,stable,stilt_house,storage_tank,sty,supermarket,synagogue,temple,tent,terrace,toilets,train_station,transformer_tower,transportation,university,warehouse,wayside_shrine" values_context="building" />
             <optional>
                 <reference ref="name_operator" />
@@ -5717,4 +5727,5 @@
                 <list_entry value="main" icon="presets/misc/entrance_main.svg" />
                 <list_entry value="service" icon="presets/misc/entrance_service.svg" />
+                <list_entry value="shop" icon="presets/misc/entrance_yes.svg" />
                 <list_entry value="exit" icon="presets/misc/entrance_exit.svg" />
                 <list_entry value="emergency" icon="presets/misc/entrance_emergency.svg" />
@@ -5753,4 +5764,7 @@
             <key key="man_made" value="works" />
             <text key="name" text="Name" />
+            <optional>
+                <combo key="product" text="Product" values="bakery_products,beer,bricks,dairy,electronics,food,furniture,machinery,meat,oil,packaging,rice,steel,sugar"/>
+            </optional>
         </item> <!-- Works -->
         <item name="Chimney" icon="presets/landmark/chimney.svg" type="node,closedway" preset_name_label="true">
@@ -7978,5 +7992,5 @@
         <space />
         <key key="amenity" value="vending_machine" />
-        <multiselect key="vending" text="Vending products" values="admission_tickets;animal_feed;bicycle_tube;cigarettes;coffee;condoms;drinks;elongated_coin;excrement_bags;food;milk;newspapers;parking_tickets;parcel_pickup;parcel_mail_in;public_transport_tickets;SIM_cards;stamps;sweets;telephone_vouchers;toys;water" values_searchable="true" />
+        <multiselect key="vending" text="Vending products" values="admission_tickets;animal_feed;bicycle_tube;cigarettes;coffee;condoms;drinks;elongated_coin;excrement_bags;food;fuel;milk;newspapers;parking_tickets;parcel_pickup;parcel_mail_in;public_transport_tickets;SIM_cards;stamps;sweets;telephone_vouchers;toys;water" values_searchable="true" />
         <text key="operator" text="Operator" />
         <text key="ref" text="Reference number" />
Index: /trunk/resources/data/validator/deprecated.mapcss
===================================================================
--- /trunk/resources/data/validator/deprecated.mapcss	(revision 18551)
+++ /trunk/resources/data/validator/deprecated.mapcss	(revision 18552)
@@ -2400,3 +2400,10 @@
 }
 
+/* Replaced by type=connectivity */
+*[type="turnlanes:turns"] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "type=connectivity";
+  group: tr("deprecated tagging");
+}
+
 /* When tags are deprecated they should be added to ignoretags.cfg too. */
Index: /trunk/resources/data/validator/highway.mapcss
===================================================================
--- /trunk/resources/data/validator/highway.mapcss	(revision 18551)
+++ /trunk/resources/data/validator/highway.mapcss	(revision 18552)
@@ -208,2 +208,10 @@
   assertNoMatch: "way highway=trunk";
 }
+
+/* #21396 comment 39 */
+*[surface=~/^paving_stones:(\d+)$/] {
+  throwWarning: tr("{0} with trailing number", "paving_stones");
+  group: tr("questionable value (ending with a number)");
+  suggestAlternative: "paving_stones:length";
+  suggestAlternative: "paving_stones:width";
+}
Index: /trunk/resources/data/validator/ignoretags.cfg
===================================================================
--- /trunk/resources/data/validator/ignoretags.cfg	(revision 18551)
+++ /trunk/resources/data/validator/ignoretags.cfg	(revision 18552)
@@ -104,4 +104,5 @@
 E:interval
 E:maxspeed
+E:maxspeed:type
 E:maxstay
 E:maxweight:signed
@@ -732,28 +733,56 @@
 E:voltage-low
 E:toilet
+K:type=turnlanes:turns
+K:surface=paving_stones:30
 ;
 ; Tags not yet decided (to remove from this section when added or moved up when deprecated) 
-; see josm tickets: 17770 15309 15774 16315 16658 16793 19982
-;
-K:service=irrigation
-K:man_made=tunnel
+; see josm tickets: 17770 15309 15774 16315 16658 16793 19982 21396
+;
+K:advertising=board
 K:amenity=childcare
-K:landuse=logging
-K:indoor=wall
-K:indoor=room
-K:indoor=corridor
-K:highway=corridor
+K:amenity=loading_dock
+K:amenity=parcel_locker
+K:amenity=payment_terminal
+K:barrier=sliding_gate
+K:boundary=forest_compartment
+K:craft=grinding_mill
 K:crossing=zebra
+K:emergency=access_point
+K:golf=cartpath
+K:healthcare:speciality=general
 K:healthcare=alternative
+K:healthcare=centre
+K:healthcare=clinic
 K:healthcare=dentist
 K:healthcare=doctor
 K:healthcare=hospital
 K:healthcare=pharmacy
-K:healthcare=clinic
-K:healthcare=centre
 K:healthcare=physiotherapist
 K:healthcare=yes
-K:golf=cartpath
+K:hedge=hedge_bank
+K:highway=corridor
+K:historic=bomb_crater
+K:indoor=area
+K:indoor=corridor
+K:indoor=room
+K:indoor=wall
+K:landuse=logging
+; See #21964/#21907 for WIP patch for leisure=sports_hall
+K:leisure=sports_hall
+K:man_made=courtyard
+K:man_made=gantry
+K:man_made=tunnel
 K:man_made=water_tap
+K:military=trench
+K:natural=crevasse
+K:path=crossing
+K:railway=proposed
 K:railway=tram_crossing
 K:railway=tram_level_crossing
+K:road_marking=solid_stop_line
+K:service=irrigation
+
+; These tags should probably have better software support, but maybe they can be in the appropriate section in this file.
+; Examples: oneway:moped and cycleway:right:oneway.
+F::oneway
+S:oneway: