Index: trunk/resources/data/defaultpresets.xml
===================================================================
--- trunk/resources/data/defaultpresets.xml	(revision 18841)
+++ trunk/resources/data/defaultpresets.xml	(revision 18843)
@@ -682,4 +682,7 @@
         <preset_link preset_name="Access Restrictions" />
     </chunk>
+    <chunk id="school_common">
+        <combo key="school:gender" values="mixed,male,female,separated" text="Gender of students"/>
+    </chunk>
   <!-- Groups -->
   <group name="Highways" icon="presets/transport/way/way_secondary.svg">
@@ -990,4 +993,19 @@
             <reference ref="link_road_access_restrictions" />
         </item> <!-- Pedestrian -->
+        <item name="Busway" icon="presets/transport/way/way_busway.svg" type="way,closedway" preset_name_label="true">
+            <link wiki="Tag:highway=busway"/>
+            <space />
+            <key key="highway" value="busway" />
+            <optional>
+                <text key="name" text="Name" />
+                <space />
+                <reference ref="highway_base" />
+                <reference ref="highway_yesno_incline_oneway_lit_width_busbay_sidewalk" />
+                <text key="operator" text="Operator" />
+                <combo key="embedded_rails" values="abandoned,construction,disused,funicular,light_rail,miniature,narrow_gauge,rail,tram,yes" />
+                <check key="trolley_wire" text="Trolley wire" />
+            </optional>
+            <reference ref="link_road_access_restrictions" />
+        </item> <!-- Busway -->
         <item name="Service" icon="presets/transport/way/way_service.svg" type="way,closedway" preset_name_label="true">
             <link wiki="Tag:highway=service" />
@@ -2235,12 +2253,12 @@
             <space />
             <key key="landuse" value="basin" />
-            <combo key="basin" text="Type" values="retention,infiltration,detention" />
+            <combo key="basin" text="Type" values="retention,infiltration,detention,evaporation,settling" />
             <reference ref="optional_name" />
         </item> <!-- Basin -->
         <item name="Reservoir" icon="presets/landuse/reservoir.svg" type="node,closedway,multipolygon" preset_name_label="true">
-            <link wiki="Tag:landuse=reservoir" />
-            <space />
-            <key key="landuse" value="reservoir" />
-            <combo key="reservoir_type" text="Type" values="evaporator,sewage,tailings,water_storage" />
+            <link wiki="Tag:water=reservoir" />
+            <space />
+            <key key="natural" value="water" />
+            <key key="water" value="reservoir" />
             <reference ref="optional_name" />
         </item> <!-- Reservoir -->
@@ -2281,4 +2299,16 @@
             <reference ref="water_access" />
         </item> <!-- Water -->
+        <item name="Tailings Pond" icon="presets/misc/tailings_pond.svg" type="closedway,multipolygon" preset_name_label="true">
+            <link wiki="Tag:man_made=tailings_pond" />
+            <space />
+            <label text="An area in which waterborn tailings are pumped to allow the separation of solids from the water" />
+            <space />
+            <key key="man_made" value="tailings_pond" />
+            <optional>
+                <combo key="resource" text="Material associated with the tailings" values="aggregate,bauxite,basalt,clay,coal,copper,dimension_stone,gold,ilmenite,iron_ore,lead,limestone,nickel,rutile,salt,silver,tin,zinc,zircon" />
+                <check key="intermittent" text="Intermittent (sometimes wet, sometimes dry)" />
+                <check key="hazard" value_on="contamination" disable_off="true" text="Hazardous to human health due to chemical contamination"/>
+            </optional>
+        </item>
         <item name="Coastline" icon="presets/nautical/coast_line.svg" type="way,closedway" preset_name_label="true">
             <link wiki="Tag:natural=coastline" />
@@ -4520,4 +4550,5 @@
             <reference ref="max_age" />
             <combo key="isced:level" text="ISCED level" values="0" />
+            <reference ref="school_common"/>
             <reference ref="link_contact_address" />
             <preset_link preset_name="Building" />
@@ -4530,4 +4561,5 @@
             <reference ref="min_age" />
             <multiselect key="isced:level" text="ISCED level" values="0;1;2;3;4" rows="5" />
+            <reference ref="school_common"/>
             <reference ref="link_contact_address" />
             <preset_link preset_name="Building" />
@@ -4539,4 +4571,5 @@
             <reference ref="name_operator_oh_wheelchair" />
             <multiselect key="isced:level" text="ISCED level" values="4;5;6;7;8" rows="5" />
+            <reference ref="school_common"/>
             <reference ref="link_contact_address" />
         </item> <!-- University -->
@@ -4547,4 +4580,5 @@
             <reference ref="name_operator_oh_wheelchair" />
             <multiselect key="isced:level" text="ISCED level" values="3;4;5;6;7" rows="5" />
+            <reference ref="school_common"/>
             <reference ref="link_contact_address" />
         </item> <!-- College -->
@@ -4555,4 +4589,5 @@
             <reference ref="name_operator_oh_wheelchair" />
             <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="school_common"/>
             <reference ref="link_contact_address" />
         </item> <!-- Driving School -->
@@ -4562,4 +4597,5 @@
             <key key="amenity" value="language_school" />
             <reference ref="name_operator_oh_wheelchair" />
+            <reference ref="school_common"/>
             <reference ref="link_contact_address" />
         </item> <!-- Language school -->
@@ -6678,4 +6714,16 @@
                 </combo>
                 <reference ref="power_output" />
+                <combo key="generator:solar:tracking" text="Solar tracking type">
+                    <list_entry value="no" short_description="fixed"/>
+                    <list_entry value="yes" />
+                    <list_entry value="single_axis" />
+                    <list_entry value="horizontal" short_description="horizontal axis (HSAT)" />
+                    <list_entry value="horizontal_tilted" short_description="horizontal axis, tilted modules (HTSAT)" />
+                    <list_entry value="tilted" short_description="tilted axis (TSAT)" />
+                    <list_entry value="vertical" short_description="vertical (VSAT)" />
+                    <list_entry value="dual_axis" />
+                    <list_entry value="tip-tilt" short_description="tip-tilt dual axis (TTDAT)" />
+                    <list_entry value="alt-azimuth" short_description="azimuth-altitude dual axis (AADAT)" />
+                </combo>
             </item> <!-- Solar Power Generator -->
             <item name="Waste Power Generator" icon="presets/power/power_source-waste.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -8228,6 +8276,6 @@
         <combo key="diplomatic" text="Type" values="consulate,embassy,liaison" />
         <reference ref="oh_wheelchair" />
-        <text key="country" text="Country" length="2" />
-        <text key="target" text="Receiving country" length="2" />
+        <combo key="country" text="Country code" values_from="java.util.Locale#getISOCountries" use_last_as_default="force" match="key" values_context="country codes" />
+        <combo key="target" text="Receiving country code" values_from="java.util.Locale#getISOCountries" use_last_as_default="force" match="key" values_context="country codes" />
         <reference ref="link_contact_address" />
     </item> <!-- Diplomatic -->
@@ -8407,4 +8455,19 @@
         <reference ref="link_contact_address" />
     </item> <!-- Electrician -->
+      <item name="Electronics Repair" icon="presets/craft/electronics_repair.svg" type="node,closedway,multipolygon" preset_name_label="true">
+          <link wiki="Tag:craft=electronics_repair" />
+          <space />
+          <key key="craft" value="electronics_repair" />
+          <reference ref="name_operator_oh_wheelchair" />
+          <reference ref="link_contact_address" />
+          <optional>
+              <checkgroup>
+                  <check key="mobile_phone:repair" text="Repairs mobile phones" />
+                  <check key="computer:repair" text="Repairs computers" />
+                  <check key="camera:repair" text="Repairs cameras" />
+                  <check key="hifi:repair" text="Repairs hifi equipment" />
+              </checkgroup>
+          </optional>
+      </item> <!-- Electrician -->
     <item name="Plumber" icon="presets/craft/plumber.svg" type="node,closedway,multipolygon" preset_name_label="true">
         <link wiki="Tag:craft=plumber" />
@@ -8686,4 +8749,12 @@
             <text key="website" text="Website" />
         </item> <!-- Neighbourhood -->
+        <item name="Municipality" icon="presets/place/municipality.svg" type="node,closedway,multipolygon,relation" preset_name_label="true">
+            <link wiki="Tag:place=municipality" />
+            <space />
+            <key key="place" value="municipality" />
+            <reference ref="name_wikipedia_wikidata" />
+            <text key="population" text="Population" />
+            <text key="website" text="Website" />
+        </item>
         <item name="Farm" icon="presets/place/farm.svg" type="node,closedway,multipolygon,relation" preset_name_label="true">
             <link wiki="Tag:place=farm" />
@@ -8790,4 +8861,18 @@
             <text key="height" text="Height (meters)" length="7" />
         </item> <!-- Cliff -->
+        <item name="Earth Bank" icon="presets/misc/earth_bank.svg" type="way" preset_name_label="true">
+            <link wiki="Tag:natural=earth_bank" />
+            <space />
+            <label text="A steep earth bank, with significant vertical, or near vertical (leave the lower face to the right of the way)." />
+            <space />
+            <key key="natural" value="earth_bank" />
+            <text key="depth" text="Depth (meters)" />
+            <combo key="earth_bank" values="gully,scarp,cut_bank,grassy_steep_slope" />
+
+            <preset_link preset_name="Cliff" text="Similar but different tags:" />
+            <preset_link preset_name="Ditch" text="Similar but different tags:" />
+            <preset_link preset_name="Embankment" text="Similar but different tags:" />
+            <preset_link preset_name="Valley" text="Similar but different tags:" />
+        </item> <!-- Earth Bank -->
         <item name="Sinkhole" icon="presets/landmark/sinkhole.svg" type="node,closedway" preset_name_label="true">
             <link wiki="Tag:natural=sinkhole" />
@@ -9317,5 +9402,5 @@
                 <text key="addr:city" text="City name" use_last_as_default="force" match="key" />
                 <text key="addr:postcode" text="Post code" use_last_as_default="force" match="key" />
-                <combo key="addr:country" text="Country code" values_from="java.util.Locale#getISOCountries" use_last_as_default="force" match="key" />
+                <combo key="addr:country" text="Country code" values_from="java.util.Locale#getISOCountries" use_last_as_default="force" match="key" values_context="country codes" />
             </optional>
             <optional text="Optional tag only for address without addr:street">
Index: trunk/resources/data/validator/deprecated.mapcss
===================================================================
--- trunk/resources/data/validator/deprecated.mapcss	(revision 18841)
+++ trunk/resources/data/validator/deprecated.mapcss	(revision 18843)
@@ -73,4 +73,33 @@
   fixAdd: "wetland=marsh";
 }
+#23185
+*[landuse=reservoir][!reservoir_type],
+*[landuse=reservoir][reservoir_type=water_storage] {
+  group: tr("deprecated tagging");
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "natural=water + water=reservoir";
+  fixAdd: "natural=water";
+  fixAdd: "water=reservoir";
+  fixRemove: "reservoir_type";
+}
+*[landuse=reservoir][reservoir_type=tailings] {
+  group: tr("deprecated tagging");
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "man_made=tailings_pond";
+  fixAdd: "man_made=tailings_pond";
+  fixRemove: "reservoir_type";
+  fixRemove: "reservoir_type";
+}
+*[landuse=reservoir][reservoir_type=evaporator] {
+  group: tr("deprecated tagging");
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "basin=evaporation or landuse=salt_pond";
+}
+*[landuse=reservoir][reservoir_type=sewage] {
+  group: tr("deprecated tagging");
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "natural=water + water=wastewater or landuse=basin + basin=settling or man_made=basin + basin=settling";
+}
+
 *[highway=byway] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
Index: trunk/resources/data/validator/ignoretags.cfg
===================================================================
--- trunk/resources/data/validator/ignoretags.cfg	(revision 18841)
+++ trunk/resources/data/validator/ignoretags.cfg	(revision 18843)
@@ -50,4 +50,6 @@
 S:taxon:
 S:colour:
+; check_date and check_date:* is used by some surveying applications
+S:check_date
 ;
 ; Ignore valid and semi-valid keys that equal...
@@ -792,4 +794,6 @@
 ; orchard=meadow_orchard seems to be more of a boolean value, "also happens to be a meadow". Don't know how we want to handle it.
 K:orchard=meadow_orchard
+; boundary=religious_administration is not well documented (2023-09-21)
+K:boundary=religious_administration
 ; Streetside parking tags (see #22901 22901.patch for starting icons)
 ; There is an external preset for these tags