Index: trunk/resources/data/defaultpresets.xml
===================================================================
--- trunk/resources/data/defaultpresets.xml	(revision 18842)
+++ 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 18842)
+++ 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 18842)
+++ 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
Index: trunk/resources/images/presets/craft/electronics_repair.svg
===================================================================
--- trunk/resources/images/presets/craft/electronics_repair.svg	(revision 18843)
+++ trunk/resources/images/presets/craft/electronics_repair.svg	(revision 18843)
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 4.2333333 4.2333333"
+   version="1.1"
+   id="svg1"
+   inkscape:version="1.3 (0e150ed, 2023-07-21)"
+   sodipodi:docname="electronics_repair.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     showgrid="true"
+     inkscape:zoom="26.910887"
+     inkscape:cx="10.237493"
+     inkscape:cy="8.6210463"
+     inkscape:window-width="1920"
+     inkscape:window-height="1027"
+     inkscape:window-x="3600"
+     inkscape:window-y="25"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1">
+    <inkscape:grid
+       id="grid1"
+       units="px"
+       originx="0"
+       originy="0"
+       spacingx="0.26458333"
+       spacingy="0.26458333"
+       empcolor="#0099e5"
+       empopacity="0.30196078"
+       color="#0099e5"
+       opacity="0.14901961"
+       empspacing="5"
+       dotted="false"
+       gridanglex="30"
+       gridanglez="30"
+       visible="true" />
+  </sodipodi:namedview>
+  <defs
+     id="defs1" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:#07b100;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="M 0,0 H 4.233333 V 3.1749997 H 2.6458332 V 4.233333 H 0 V 0"
+       id="path1" />
+    <path
+       style="fill:#f8ff00;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="M 0.52916663,0.52916663 H 3.7041664 V 1.3229166 H 3.439583 V 0.79374996 H 0.52916663 V 0.52916663"
+       id="path2" />
+    <path
+       style="fill:#f8ff00;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="M 3.439583,1.5874999 H 0.52916663 V 1.0583333 H 0.79374996 V 1.3229166 H 3.1749997 Z"
+       id="path3" />
+    <path
+       style="fill:#f8ff00;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 0.5291668,2.9104166 h 3.1749998 v -0.79375 H 3.4395832 V 2.6458332 H 0.5291668 v 0.2645834"
+       id="path2-3" />
+    <path
+       style="fill:#f8ff00;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 3.4395832,1.8520833 H 0.5291668 V 2.3812499 H 0.79375013 V 2.1166666 H 3.1749999 Z"
+       id="path3-1" />
+    <path
+       style="fill:#f8ff00;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="M 0.52916663,3.1749997 H 2.3812499 V 3.439583 H 0.52916663 Z"
+       id="path4" />
+    <path
+       style="fill:#f8ff00;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="M 2.3812499,3.7041664 H 1.0583333 v 0.2645833 h 1.3229166 z"
+       id="path5" />
+  </g>
+</svg>
Index: trunk/resources/images/presets/misc/earth_bank.svg
===================================================================
--- trunk/resources/images/presets/misc/earth_bank.svg	(revision 18843)
+++ trunk/resources/images/presets/misc/earth_bank.svg	(revision 18843)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 4.2333333 4.2333333"
+   version="1.1"
+   id="svg1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <g
+     id="layer1">
+    <path
+       style="fill:#9c6f32;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="M 4.233333,4.233333 0,4.2333333 V 0.79374996 c 0,0 0.79374996,-0.12232893 1.3229166,0.52916664 C 1.8520832,1.9744121 1.9337753,3.0068157 2.6458332,3.439583 3.3578911,3.8723506 4.233333,3.9687497 4.233333,3.9687497 Z"
+       id="path1" />
+  </g>
+</svg>
Index: trunk/resources/images/presets/misc/earth_bank_pattern.svg
===================================================================
--- trunk/resources/images/presets/misc/earth_bank_pattern.svg	(revision 18843)
+++ trunk/resources/images/presets/misc/earth_bank_pattern.svg	(revision 18843)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="9"
+   height="9"
+   viewBox="0 0 9 9"
+   id="svg2"
+   version="1.1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs4" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     transform="translate(0,-1043.3622)">
+    <path
+       style="fill:#9c6f32;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 2,1044.3622 5,0 -2.5,8 z"
+       id="path4145" />
+  </g>
+</svg>
Index: trunk/resources/images/presets/misc/tailings_pond.svg
===================================================================
--- trunk/resources/images/presets/misc/tailings_pond.svg	(revision 18843)
+++ trunk/resources/images/presets/misc/tailings_pond.svg	(revision 18843)
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg2"
+   version="1.1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs4" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#af0073;fill-opacity:1;fill-rule:evenodd;stroke:#333333;stroke-width:1.76193774;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4134"
+       width="14.238063"
+       height="14.238062"
+       x="0.88096887"
+       y="1037.2432"
+       ry="4.2717662" />
+  </g>
+</svg>
Index: trunk/resources/images/presets/place/municipality.svg
===================================================================
--- trunk/resources/images/presets/place/municipality.svg	(revision 18843)
+++ trunk/resources/images/presets/place/municipality.svg	(revision 18843)
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="12"
+   viewBox="0 0 16 12"
+   id="svg2"
+   version="1.1"
+   inkscape:version="1.3 (0e150ed, 2023-07-21)"
+   sodipodi:docname="municipality.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="6.734375"
+     inkscape:cy="7.5"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1027"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="1"
+     inkscape:showpageshadow="2"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4136"
+       originx="0"
+       originy="0"
+       spacingy="1"
+       spacingx="1"
+       units="px"
+       visible="false" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1040.3622)">
+    <path
+       style="fill:#3266cd;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.97307134;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 8.5380631,1049.6846 c -0.603283,-2.4222 1.9922899,-1.3924 3.2209819,0 0.756162,0.511 1.507072,0.3248 2.257945,0.1345 1.957005,-0.36 1.461761,-3.0218 1.379903,-3.4492 -0.277846,-0.8432 -0.22161,-1.061 -1.438908,-2.1021 -1.073374,-0.499 -2.076717,-0.1483 -2.459486,-0.4388 -0.707308,-0.3481 0.356589,-2.2339 -1.187385,-2.3689 -2.8155432,0.2884 -3.877829,0.1299 -4.0699413,-0.067 -1.060499,-0.6232 -1.1916803,-0.7814 -2.4885151,-0.1017 -1.6245177,1.2331 -1.0990479,2.7364 -1.2962578,4.0287 -0.3541192,1.4112 -1.97341599,2.4273 -1.95745343,3.1791 -0.20462469,2.8006 1.90658613,2.653 2.27351833,2.9443 1.051048,0.4388 6.4448484,0.9064 6.6276018,-0.5853 -3.162e-4,-0.6497 -0.7628576,-0.6939 -0.8620034,-1.1738 z"
+       id="path4145"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccccccc" />
+  </g>
+</svg>
Index: trunk/resources/images/presets/transport/way/way_busway.svg
===================================================================
--- trunk/resources/images/presets/transport/way/way_busway.svg	(revision 18843)
+++ trunk/resources/images/presets/transport/way/way_busway.svg	(revision 18843)
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs4266">
+    <pattern
+       y="0"
+       x="0"
+       height="6"
+       width="6"
+       patternUnits="userSpaceOnUse"
+       id="EMFhbasepattern" />
+    <clipPath
+       id="clipPath19">
+      <path
+         d="M 0.496094,0.0351562 H 5952.9961 V 7934.6752 H 0.496094 Z"
+         id="path21" />
+    </clipPath>
+  </defs>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1"
+       height="16.000042"
+       width="9.0000019"
+       y="1036.3621"
+       x="-4.7683727e-07"
+       id="XMLID_61_" />
+    <rect
+       style="fill:#808080;fill-opacity:1;stroke:none;stroke-width:1"
+       height="16.000042"
+       width="1.0000002"
+       y="1036.3621"
+       x="8.000001"
+       id="rect4151" />
+    <path
+       style="fill:#808080;fill-opacity:1"
+       id="path3387-0"
+       d="m 4.9999557,1039.3655 h -1.000003 v -2 h 1.000003 z" />
+    <path
+       style="fill:#808080;fill-opacity:1"
+       id="path3387-0-9"
+       d="m 4.9999587,1043.3655 h -1.000004 v -2 h 1.000004 z" />
+    <path
+       style="fill:#808080;fill-opacity:1"
+       id="path3387-0-9-7"
+       d="m 4.9999587,1047.3655 h -1.000004 v -2 h 1.000004 z" />
+    <rect
+       id="rect4149"
+       x="-4.7683727e-07"
+       y="1036.3621"
+       width="1.0000002"
+       height="16.000042"
+       style="fill:#808080;fill-opacity:1;stroke:none;stroke-width:1" />
+    <path
+       d="m 5.0000004,1051.3621 h -1.000004 v -2 h 1.000004 z"
+       id="path4153"
+       style="fill:#808080;fill-opacity:1" />
+    <g
+       id="g1"
+       transform="matrix(1.6666045,0,0,1.6666045,-11.665674,-701.67672)">
+      <path
+         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.15;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 11.181818,1044.3621 c -0.672282,0 -1.181818,0.5022 -1.181818,1.1667 v 4.0833 c 0,0.3535 0.30238,0.5834 0.590909,0.5834 v 1.1666 c 2.409091,0 2.909091,0 5.318182,0 v -1.1666 c 0.280796,0 0.590909,-0.2578 0.590909,-0.5834 v -4.0833 c 0,-0.6645 -0.509536,-1.1667 -1.181818,-1.1667 z"
+         id="rect4152-0-5" />
+      <path
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.15;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 11.499999,1044.8623 c -0.568854,0 -1,0.4305 -1,1 v 3.5 c 0,0.303 0.255859,0.5 0.5,0.5 v 1 H 12 v -1 h 2.5 v 1 h 1.000001 v -1 c 0.237597,0 0.5,-0.221 0.5,-0.5 v -3.5 c 0,-0.5695 -0.431146,-1 -1.000001,-1 z"
+         id="rect4152-0" />
+      <rect
+         rx="0.50000012"
+         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.15;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect4152-9-3"
+         width="4.500001"
+         height="2.0000112"
+         x="10.999999"
+         y="-1047.3621"
+         ry="0.50000006"
+         transform="scale(1,-1)" />
+      <ellipse
+         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.15;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path4177-4"
+         cx="11.5"
+         cy="-1048.8621"
+         rx="0.50000012"
+         ry="0.50000173"
+         transform="scale(1,-1)" />
+      <ellipse
+         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.15;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path4177-6-5"
+         cx="15"
+         cy="-1048.8621"
+         rx="0.5"
+         ry="0.50000179"
+         transform="scale(1,-1)" />
+    </g>
+  </g>
+</svg>
Index: trunk/resources/styles/standard/elemstyles.mapcss
===================================================================
--- trunk/resources/styles/standard/elemstyles.mapcss	(revision 18842)
+++ trunk/resources/styles/standard/elemstyles.mapcss	(revision 18843)
@@ -3591,4 +3591,5 @@
 area[craft=metal_construction],
 area[craft=electrician],
+area[craft=electronics_repair],
 area[craft=brewery],
 area[craft=plumber],
@@ -3627,6 +3628,11 @@
     icon-image: "presets/craft/metal_construction.svg";
     set icon_z17;
-}node[craft=electrician] {
+}
+node[craft=electrician] {
     icon-image: "presets/craft/electrician.svg";
+    set icon_z17;
+}
+node[craft=electronics_repair] {
+    icon-image: "presets/craft/electronics_repair.svg";
     set icon_z17;
 }
@@ -4043,6 +4049,10 @@
 }
 area[landuse=basin],
-area[landuse=reservoir] {
+area[landuse=reservoir],
+area[natural=water][water=reservoir] {
     fill-color: basin#0000bf;
+}
+area[man_made=tailings_pond] {
+    fill-color:tailings_pond#af0073;
 }
 area[landuse=forest] {
@@ -4965,4 +4975,11 @@
     icon-image: "presets/misc/cliff.svg";
     set icon_z17;
+}
+way[natural=earth_bank] {
+    repeat-image: "presets/misc/earth_bank_pattern.svg";
+    repeat-image-align: top;
+    repeat-image-offset: 0.5;
+    width: 1;
+    color: #9c6f32;
 }
 way[natural=arete] {
@@ -5464,4 +5481,5 @@
 area[setting("place_fill_colour")][place=village],
 area[setting("place_fill_colour")][place=hamlet],
+area[setting("place_fill_colour")][place=municipality],
 area[setting("place_fill_colour")][place=farm],
 area[setting("place_fill_colour")][place=isolated_dwelling],
@@ -5487,4 +5505,5 @@
 node[place=neighbourhood],
 node[place=hamlet],
+node[place=municipality],
 node[place=isolated_dwelling],
 node[place=farm],
@@ -5536,4 +5555,8 @@
     icon-image: "presets/place/hamlet.svg";
     z-index: 2.3;
+}
+node[place=municipality] {
+    icon-image: "presets/place/municipality.svg";
+    z-index: 2.21;
 }
 node[place=isolated_dwelling] {