Ticket #23184: 23184.2.patch

File 23184.2.patch, 34.4 KB (added by taylor.smock, 17 months ago)

Update reservoir preset

  • resources/data/validator/deprecated.mapcss 

    Subject: [PATCH] #23184
---
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/resources/data/validator/deprecated.mapcss b/resources/data/validator/deprecated.mapcss
    a b  
    7272  fixAdd: "natural=wetland";
    7373  fixAdd: "wetland=marsh";
    7474}
     75#23185
     76*[landuse=reservoir][!reservoir_type],
     77*[landuse=reservoir][reservoir_type=water_storage] {
     78  group: tr("deprecated tagging");
     79  throwWarning: tr("{0} is deprecated", "{0.tag}");
     80  suggestAlternative: "natural=water + water=reservoir";
     81  fixAdd: "natural=water";
     82  fixAdd: "water=reservoir";
     83  fixRemove: "reservoir_type";
     84}
     85*[landuse=reservoir][reservoir_type=tailings] {
     86  group: tr("deprecated tagging");
     87  throwWarning: tr("{0} is deprecated", "{0.tag}");
     88  suggestAlternative: "man_made=tailings_pond";
     89  fixAdd: "man_made=tailings_pond";
     90  fixRemove: "reservoir_type";
     91  fixRemove: "reservoir_type";
     92}
     93*[landuse=reservoir][reservoir_type=evaporator] {
     94  group: tr("deprecated tagging");
     95  throwWarning: tr("{0} is deprecated", "{0.tag}");
     96  suggestAlternative: "basin=evaporation or landuse=salt_pond";
     97}
     98*[landuse=reservoir][reservoir_type=sewage] {
     99  group: tr("deprecated tagging");
     100  throwWarning: tr("{0} is deprecated", "{0.tag}");
     101  suggestAlternative: "natural=water + water=wastewater or landuse=basin + basin=settling or man_made=basin + basin=settling";
     102}
     103
    75104*[highway=byway] {
    76105  throwWarning: tr("{0} is deprecated", "{0.tag}");
    77106  group: tr("deprecated tagging");

  • resources/data/validator/ignoretags.cfg 

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/resources/data/validator/ignoretags.cfg b/resources/data/validator/ignoretags.cfg
    a b  
    4949S:seamark:
    5050S:taxon:
    5151S:colour:
     52; check_date and check_date:* is used by some surveying applications
     53S:check_date
    5254;
    5355; Ignore valid and semi-valid keys that equal...
    5456;
    … …  
    791793K:natural=crevasse
    792794; 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.
    793795K:orchard=meadow_orchard
     796; boundary=religious_administration is not well documented (2023-09-21)
     797K:boundary=religious_administration
    794798; Streetside parking tags (see #22901 22901.patch for starting icons)
    795799; There is an external preset for these tags
    796800S:parking:both

  • resources/data/defaultpresets.xml 

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/resources/data/defaultpresets.xml b/resources/data/defaultpresets.xml
    a b  
    989989            </optional>
    990990            <reference ref="link_road_access_restrictions" />
    991991        </item> <!-- Pedestrian -->
     992        <item name="Busway" icon="presets/transport/way/way_busway.svg" type="way,closedway" preset_name_label="true">
     993            <link wiki="Tag:highway=busway"/>
     994            <space />
     995            <key key="highway" value="busway" />
     996            <optional>
     997                <text key="name" text="Name" />
     998                <space />
     999                <reference ref="highway_base" />
     1000                <reference ref="highway_yesno_incline_oneway_lit_width_busbay_sidewalk" />
     1001                <text key="operator" text="Operator" />
     1002                <combo key="embedded_rails" values="abandoned,construction,disused,funicular,light_rail,miniature,narrow_gauge,rail,tram,yes" />
     1003                <check key="trolley_wire" text="Trolley wire" />
     1004            </optional>
     1005            <reference ref="link_road_access_restrictions" />
     1006        </item> <!-- Busway -->
    9921007        <item name="Service" icon="presets/transport/way/way_service.svg" type="way,closedway" preset_name_label="true">
    9931008            <link wiki="Tag:highway=service" />
    9941009            <space />
    … …  
    22342249            <link wiki="Tag:landuse=basin" />
    22352250            <space />
    22362251            <key key="landuse" value="basin" />
    2237             <combo key="basin" text="Type" values="retention,infiltration,detention" />
     2252            <combo key="basin" text="Type" values="retention,infiltration,detention,evaporation,settling" />
    22382253            <reference ref="optional_name" />
    22392254        </item> <!-- Basin -->
    22402255        <item name="Reservoir" icon="presets/landuse/reservoir.svg" type="node,closedway,multipolygon" preset_name_label="true">
    2241             <link wiki="Tag:landuse=reservoir" />
     2256            <link wiki="Tag:water=reservoir" />
    22422257            <space />
    2243             <key key="landuse" value="reservoir" />
    2244             <combo key="reservoir_type" text="Type" values="evaporator,sewage,tailings,water_storage" />
     2258            <key key="natural" value="water" />
     2259            <key key="water" value="reservoir" />
    22452260            <reference ref="optional_name" />
    22462261        </item> <!-- Reservoir -->
    22472262        <item name="Covered Reservoir" icon="presets/landmark/reservoir_covered.svg" type="node,closedway,multipolygon" preset_name_label="true">
    … …  
    22802295            <reference ref="wikipedia_wikidata" />
    22812296            <reference ref="water_access" />
    22822297        </item> <!-- Water -->
     2298        <item name="Tailings Pond" icon="presets/misc/tailings_pond.svg" type="closedway,multipolygon" preset_name_label="true">
     2299            <link wiki="Tag:man_made=tailings_pond" />
     2300            <space />
     2301            <label text="An area in which waterborn tailings are pumped to allow the separation of solids from the water" />
     2302            <space />
     2303            <key key="man_made" value="tailings_pond" />
     2304            <optional>
     2305                <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" />
     2306                <check key="intermittent" text="Intermittent (sometimes wet, sometimes dry)" />
     2307                <check key="hazard" value_on="contamination" disable_off="true" text="Hazardous to human health due to chemical contamination"/>
     2308            </optional>
     2309        </item>
    22832310        <item name="Coastline" icon="presets/nautical/coast_line.svg" type="way,closedway" preset_name_label="true">
    22842311            <link wiki="Tag:natural=coastline" />
    22852312            <space />
    … …  
    45114538        </item> <!-- Post Office -->
    45124539    </group> <!-- Public Buildings -->
    45134540    <group name="Education" icon="presets/education/school.svg">
     4541        <chunk id="school_common">
     4542            <combo key="school:gender" values="mixed,male,female,separated" text="Gender of students"/>
     4543        </chunk>
    45144544        <item name="Kindergarten" icon="presets/education/kindergarten.svg" type="node,closedway,multipolygon" preset_name_label="true">
    45154545            <link wiki="Tag:amenity=kindergarten" />
    45164546            <space />
    … …  
    45194549            <reference ref="min_age" />
    45204550            <reference ref="max_age" />
    45214551            <combo key="isced:level" text="ISCED level" values="0" />
     4552            <reference ref="school_common"/>
    45224553            <reference ref="link_contact_address" />
    45234554            <preset_link preset_name="Building" />
    45244555        </item> <!-- Kindergarten -->
    … …  
    45294560            <reference ref="name_operator_oh_wheelchair" />
    45304561            <reference ref="min_age" />
    45314562            <multiselect key="isced:level" text="ISCED level" values="0;1;2;3;4" rows="5" />
     4563            <reference ref="school_common"/>
    45324564            <reference ref="link_contact_address" />
    45334565            <preset_link preset_name="Building" />
    45344566        </item> <!-- School -->
    … …  
    45384570            <key key="amenity" value="university" />
    45394571            <reference ref="name_operator_oh_wheelchair" />
    45404572            <multiselect key="isced:level" text="ISCED level" values="4;5;6;7;8" rows="5" />
     4573            <reference ref="school_common"/>
    45414574            <reference ref="link_contact_address" />
    45424575        </item> <!-- University -->
    45434576        <item name="College" icon="presets/education/college.svg" type="node,closedway,multipolygon" preset_name_label="true">
    … …  
    45464579            <key key="amenity" value="college" />
    45474580            <reference ref="name_operator_oh_wheelchair" />
    45484581            <multiselect key="isced:level" text="ISCED level" values="3;4;5;6;7" rows="5" />
     4582            <reference ref="school_common"/>
    45494583            <reference ref="link_contact_address" />
    45504584        </item> <!-- College -->
    45514585         <item name="Driving School" icon="presets/education/driving_school.svg" type="node,closedway,multipolygon" preset_name_label="true">
    … …  
    45544588            <key key="amenity" value="driving_school" />
    45554589            <reference ref="name_operator_oh_wheelchair" />
    45564590            <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" />
     4591            <reference ref="school_common"/>
    45574592            <reference ref="link_contact_address" />
    45584593        </item> <!-- Driving School -->
    45594594        <item name="Language school" icon="presets/education/language_school.svg" type="node,closedway,multipolygon" preset_name_label="true">
    … …  
    45614596            <space />
    45624597            <key key="amenity" value="language_school" />
    45634598            <reference ref="name_operator_oh_wheelchair" />
     4599            <reference ref="school_common"/>
    45644600            <reference ref="link_contact_address" />
    45654601        </item> <!-- Language school -->
    45664602    </group> <!-- Education -->
    … …  
    66776713                    <list_entry value="steam_turbine" short_description="thermal" />
    66786714                </combo>
    66796715                <reference ref="power_output" />
     6716                <combo key="generator:solar:tracking" text="Solar tracking type">
     6717                    <list_entry value="no" short_description="fixed"/>
     6718                    <list_entry value="yes" />
     6719                    <list_entry value="single_axis" />
     6720                    <list_entry value="horizontal" short_description="horizontal axis (HSAT)" />
     6721                    <list_entry value="horizontal_tilted" short_description="horizontal axis, tilted modules (HTSAT)" />
     6722                    <list_entry value="tilted" short_description="tilted axis (TSAT)" />
     6723                    <list_entry value="vertical" short_description="vertical (VSAT)" />
     6724                    <list_entry value="dual_axis" />
     6725                    <list_entry value="tip-tilt" short_description="tip-tilt dual axis (TTDAT)" />
     6726                    <list_entry value="alt-azimuth" short_description="azimuth-altitude dual axis (AADAT)" />
     6727                </combo>
    66806728            </item> <!-- Solar Power Generator -->
    66816729            <item name="Waste Power Generator" icon="presets/power/power_source-waste.svg" type="node,closedway,multipolygon" preset_name_label="true">
    66826730                <link wiki="Tag:generator:source=waste" />
    … …  
    82278275        <text key="name" text="Name" />
    82288276        <combo key="diplomatic" text="Type" values="consulate,embassy,liaison" />
    82298277        <reference ref="oh_wheelchair" />
    8230         <text key="country" text="Country" length="2" />
    8231         <text key="target" text="Receiving country" length="2" />
     8278        <combo key="country" text="Country code" values_from="java.util.Locale#getISOCountries" use_last_as_default="force" match="key" />
     8279        <combo key="target" text="Receiving country code" values_from="java.util.Locale#getISOCountries" use_last_as_default="force" match="key" />
    82328280        <reference ref="link_contact_address" />
    82338281    </item> <!-- Diplomatic -->
    82348282    <item name="Educational institution" icon="presets/office/educational_institution.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
    … …  
    84068454        <reference ref="name_operator_oh_wheelchair" />
    84078455        <reference ref="link_contact_address" />
    84088456    </item> <!-- Electrician -->
     8457      <item name="Electronics Repair" icon="presets/craft/electronics_repair.svg" type="node,closedway,multipolygon" preset_name_label="true">
     8458          <link wiki="Tag:craft=electronics_repair" />
     8459          <space />
     8460          <key key="craft" value="electronics_repair" />
     8461          <reference ref="name_operator_oh_wheelchair" />
     8462          <reference ref="link_contact_address" />
     8463          <optional>
     8464              <checkgroup>
     8465                  <check key="mobile_phone:repair" text="Repairs mobile phones" />
     8466                  <check key="computer:repair" text="Repairs computers" />
     8467                  <check key="camera:repair" text="Repairs cameras" />
     8468                  <check key="hifi:repair" text="Repairs hifi equipment" />
     8469              </checkgroup>
     8470          </optional>
     8471      </item> <!-- Electrician -->
    84098472    <item name="Plumber" icon="presets/craft/plumber.svg" type="node,closedway,multipolygon" preset_name_label="true">
    84108473        <link wiki="Tag:craft=plumber" />
    84118474        <space />
    … …  
    86858748            <text key="population" text="Population" />
    86868749            <text key="website" text="Website" />
    86878750        </item> <!-- Neighbourhood -->
     8751        <item name="Municipality" icon="presets/place/municipality.svg" type="node,closedway,multipolygon,relation" preset_name_label="true">
     8752            <link wiki="Tag:place=municipality" />
     8753            <space />
     8754            <key key="place" value="municipality" />
     8755            <reference ref="name_wikipedia_wikidata" />
     8756            <text key="population" text="Population" />
     8757            <text key="website" text="Website" />
     8758        </item>
    86888759        <item name="Farm" icon="presets/place/farm.svg" type="node,closedway,multipolygon,relation" preset_name_label="true">
    86898760            <link wiki="Tag:place=farm" />
    86908761            <space />
    … …  
    87898860            <text key="name" text="Name" />
    87908861            <text key="height" text="Height (meters)" length="7" />
    87918862        </item> <!-- Cliff -->
     8863        <item name="Earth Bank" icon="presets/misc/earth_bank.svg" type="way" preset_name_label="true">
     8864            <link wiki="Tag:natural=earth_bank" />
     8865            <space />
     8866            <label text="A steep earth bank, with significant vertical, or near vertical (leave the lower face to the right of the way)." />
     8867            <space />
     8868            <key key="natural" value="earth_bank" />
     8869            <text key="depth" text="Depth (meters)" />
     8870            <combo key="earth_bank" values="gully,scarp,cut_bank,grassy_steep_slope" />
     8871
     8872            <preset_link preset_name="Cliff" text="Similar but different tags:" />
     8873            <preset_link preset_name="Ditch" text="Similar but different tags:" />
     8874            <preset_link preset_name="Embankment" text="Similar but different tags:" />
     8875            <preset_link preset_name="Valley" text="Similar but different tags:" />
     8876        </item> <!-- Earth Bank -->
    87928877        <item name="Sinkhole" icon="presets/landmark/sinkhole.svg" type="node,closedway" preset_name_label="true">
    87938878            <link wiki="Tag:natural=sinkhole" />
    87948879            <space />

  • new file resources/images/presets/craft/electronics_repair.svg 

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/resources/images/presets/craft/electronics_repair.svg b/resources/images/presets/craft/electronics_repair.svg
new file mode 100644
    - +  
     1<?xml version="1.0" encoding="UTF-8" standalone="no"?>
     2<!-- Created with Inkscape (http://www.inkscape.org/) -->
     3
     4<svg
     5   width="16"
     6   height="16"
     7   viewBox="0 0 4.2333333 4.2333333"
     8   version="1.1"
     9   id="svg1"
     10   inkscape:version="1.3 (0e150ed, 2023-07-21)"
     11   sodipodi:docname="electronics_repair.svg"
     12   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
     13   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
     14   xmlns="http://www.w3.org/2000/svg"
     15   xmlns:svg="http://www.w3.org/2000/svg">
     16  <sodipodi:namedview
     17     id="namedview1"
     18     pagecolor="#ffffff"
     19     bordercolor="#666666"
     20     borderopacity="1.0"
     21     inkscape:showpageshadow="2"
     22     inkscape:pageopacity="0.0"
     23     inkscape:pagecheckerboard="0"
     24     inkscape:deskcolor="#d1d1d1"
     25     inkscape:document-units="mm"
     26     showgrid="true"
     27     inkscape:zoom="26.910887"
     28     inkscape:cx="10.237493"
     29     inkscape:cy="8.6210463"
     30     inkscape:window-width="1920"
     31     inkscape:window-height="1027"
     32     inkscape:window-x="3600"
     33     inkscape:window-y="25"
     34     inkscape:window-maximized="1"
     35     inkscape:current-layer="layer1">
     36    <inkscape:grid
     37       id="grid1"
     38       units="px"
     39       originx="0"
     40       originy="0"
     41       spacingx="0.26458333"
     42       spacingy="0.26458333"
     43       empcolor="#0099e5"
     44       empopacity="0.30196078"
     45       color="#0099e5"
     46       opacity="0.14901961"
     47       empspacing="5"
     48       dotted="false"
     49       gridanglex="30"
     50       gridanglez="30"
     51       visible="true" />
     52  </sodipodi:namedview>
     53  <defs
     54     id="defs1" />
     55  <g
     56     inkscape:label="Layer 1"
     57     inkscape:groupmode="layer"
     58     id="layer1">
     59    <path
     60       style="fill:#07b100;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
     61       d="M 0,0 H 4.233333 V 3.1749997 H 2.6458332 V 4.233333 H 0 V 0"
     62       id="path1" />
     63    <path
     64       style="fill:#f8ff00;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
     65       d="M 0.52916663,0.52916663 H 3.7041664 V 1.3229166 H 3.439583 V 0.79374996 H 0.52916663 V 0.52916663"
     66       id="path2" />
     67    <path
     68       style="fill:#f8ff00;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
     69       d="M 3.439583,1.5874999 H 0.52916663 V 1.0583333 H 0.79374996 V 1.3229166 H 3.1749997 Z"
     70       id="path3" />
     71    <path
     72       style="fill:#f8ff00;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
     73       d="m 0.5291668,2.9104166 h 3.1749998 v -0.79375 H 3.4395832 V 2.6458332 H 0.5291668 v 0.2645834"
     74       id="path2-3" />
     75    <path
     76       style="fill:#f8ff00;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
     77       d="M 3.4395832,1.8520833 H 0.5291668 V 2.3812499 H 0.79375013 V 2.1166666 H 3.1749999 Z"
     78       id="path3-1" />
     79    <path
     80       style="fill:#f8ff00;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
     81       d="M 0.52916663,3.1749997 H 2.3812499 V 3.439583 H 0.52916663 Z"
     82       id="path4" />
     83    <path
     84       style="fill:#f8ff00;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
     85       d="M 2.3812499,3.7041664 H 1.0583333 v 0.2645833 h 1.3229166 z"
     86       id="path5" />
     87  </g>
     88</svg>

  • new file resources/images/presets/misc/earth_bank.svg 

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/resources/images/presets/misc/earth_bank.svg b/resources/images/presets/misc/earth_bank.svg
new file mode 100644
    - +  
     1<?xml version="1.0" encoding="UTF-8" standalone="no"?>
     2<!-- Created with Inkscape (http://www.inkscape.org/) -->
     3
     4<svg
     5   width="16"
     6   height="16"
     7   viewBox="0 0 4.2333333 4.2333333"
     8   version="1.1"
     9   id="svg1"
     10   xmlns="http://www.w3.org/2000/svg"
     11   xmlns:svg="http://www.w3.org/2000/svg">
     12  <defs
     13     id="defs1" />
     14  <g
     15     id="layer1">
     16    <path
     17       style="fill:#9c6f32;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
     18       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"
     19       id="path1" />
     20  </g>
     21</svg>

  • new file resources/images/presets/misc/earth_bank_pattern.svg 

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/resources/images/presets/misc/earth_bank_pattern.svg b/resources/images/presets/misc/earth_bank_pattern.svg
new file mode 100644
    - +  
     1<?xml version="1.0" encoding="UTF-8" standalone="no"?>
     2<!-- Created with Inkscape (http://www.inkscape.org/) -->
     3
     4<svg
     5   width="9"
     6   height="9"
     7   viewBox="0 0 9 9"
     8   id="svg2"
     9   version="1.1"
     10   xmlns="http://www.w3.org/2000/svg"
     11   xmlns:svg="http://www.w3.org/2000/svg"
     12   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
     13   xmlns:cc="http://creativecommons.org/ns#"
     14   xmlns:dc="http://purl.org/dc/elements/1.1/">
     15  <defs
     16     id="defs4" />
     17  <metadata
     18     id="metadata7">
     19    <rdf:RDF>
     20      <cc:Work
     21         rdf:about="">
     22        <dc:format>image/svg+xml</dc:format>
     23        <dc:type
     24           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
     25        <cc:license
     26           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
     27      </cc:Work>
     28      <cc:License
     29         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
     30        <cc:permits
     31           rdf:resource="http://creativecommons.org/ns#Reproduction" />
     32        <cc:permits
     33           rdf:resource="http://creativecommons.org/ns#Distribution" />
     34        <cc:permits
     35           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
     36      </cc:License>
     37    </rdf:RDF>
     38  </metadata>
     39  <g
     40     id="layer1"
     41     transform="translate(0,-1043.3622)">
     42    <path
     43       style="fill:#9c6f32;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
     44       d="m 2,1044.3622 5,0 -2.5,8 z"
     45       id="path4145" />
     46  </g>
     47</svg>

  • new file resources/images/presets/place/municipality.svg 

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/resources/images/presets/place/municipality.svg b/resources/images/presets/place/municipality.svg
new file mode 100644
    - +  
     1<?xml version="1.0" encoding="UTF-8" standalone="no"?>
     2<!-- Created with Inkscape (http://www.inkscape.org/) -->
     3
     4<svg
     5   width="16"
     6   height="12"
     7   viewBox="0 0 16 12"
     8   id="svg2"
     9   version="1.1"
     10   inkscape:version="1.3 (0e150ed, 2023-07-21)"
     11   sodipodi:docname="municipality.svg"
     12   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
     13   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
     14   xmlns="http://www.w3.org/2000/svg"
     15   xmlns:svg="http://www.w3.org/2000/svg"
     16   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
     17   xmlns:cc="http://creativecommons.org/ns#"
     18   xmlns:dc="http://purl.org/dc/elements/1.1/">
     19  <defs
     20     id="defs4" />
     21  <sodipodi:namedview
     22     id="base"
     23     pagecolor="#ffffff"
     24     bordercolor="#666666"
     25     borderopacity="1.0"
     26     inkscape:pageopacity="0.0"
     27     inkscape:pageshadow="2"
     28     inkscape:zoom="32"
     29     inkscape:cx="6.734375"
     30     inkscape:cy="7.5"
     31     inkscape:document-units="px"
     32     inkscape:current-layer="layer1"
     33     showgrid="false"
     34     units="px"
     35     inkscape:window-width="1920"
     36     inkscape:window-height="1027"
     37     inkscape:window-x="0"
     38     inkscape:window-y="25"
     39     inkscape:window-maximized="1"
     40     inkscape:showpageshadow="2"
     41     inkscape:pagecheckerboard="0"
     42     inkscape:deskcolor="#d1d1d1">
     43    <inkscape:grid
     44       type="xygrid"
     45       id="grid4136"
     46       originx="0"
     47       originy="0"
     48       spacingy="1"
     49       spacingx="1"
     50       units="px"
     51       visible="false" />
     52  </sodipodi:namedview>
     53  <metadata
     54     id="metadata7">
     55    <rdf:RDF>
     56      <cc:Work
     57         rdf:about="">
     58        <dc:format>image/svg+xml</dc:format>
     59        <dc:type
     60           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
     61        <cc:license
     62           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
     63      </cc:Work>
     64      <cc:License
     65         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
     66        <cc:permits
     67           rdf:resource="http://creativecommons.org/ns#Reproduction" />
     68        <cc:permits
     69           rdf:resource="http://creativecommons.org/ns#Distribution" />
     70        <cc:permits
     71           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
     72      </cc:License>
     73    </rdf:RDF>
     74  </metadata>
     75  <g
     76     inkscape:label="Layer 1"
     77     inkscape:groupmode="layer"
     78     id="layer1"
     79     transform="translate(0,-1040.3622)">
     80    <path
     81       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"
     82       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"
     83       id="path4145"
     84       inkscape:connector-curvature="0"
     85       sodipodi:nodetypes="cccccccccccccc" />
     86  </g>
     87</svg>

  • new file resources/images/presets/transport/way/way_busway.svg 

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/resources/images/presets/transport/way/way_busway.svg b/resources/images/presets/transport/way/way_busway.svg
new file mode 100644
    - +  
     1<?xml version="1.0" encoding="UTF-8" standalone="no"?>
     2<!-- Created with Inkscape (http://www.inkscape.org/) -->
     3
     4<svg
     5   width="16"
     6   height="16"
     7   viewBox="0 0 16 16"
     8   id="svg4264"
     9   version="1.1"
     10   xmlns="http://www.w3.org/2000/svg"
     11   xmlns:svg="http://www.w3.org/2000/svg"
     12   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
     13   xmlns:cc="http://creativecommons.org/ns#"
     14   xmlns:dc="http://purl.org/dc/elements/1.1/">
     15  <defs
     16     id="defs4266">
     17    <pattern
     18       y="0"
     19       x="0"
     20       height="6"
     21       width="6"
     22       patternUnits="userSpaceOnUse"
     23       id="EMFhbasepattern" />
     24    <clipPath
     25       id="clipPath19">
     26      <path
     27         d="M 0.496094,0.0351562 H 5952.9961 V 7934.6752 H 0.496094 Z"
     28         id="path21" />
     29    </clipPath>
     30  </defs>
     31  <metadata
     32     id="metadata4269">
     33    <rdf:RDF>
     34      <cc:Work
     35         rdf:about="">
     36        <dc:format>image/svg+xml</dc:format>
     37        <dc:type
     38           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
     39        <cc:license
     40           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
     41      </cc:Work>
     42      <cc:License
     43         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
     44        <cc:permits
     45           rdf:resource="http://creativecommons.org/ns#Reproduction" />
     46        <cc:permits
     47           rdf:resource="http://creativecommons.org/ns#Distribution" />
     48        <cc:permits
     49           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
     50      </cc:License>
     51    </rdf:RDF>
     52  </metadata>
     53  <g
     54     id="layer1"
     55     transform="translate(0,-1036.3621)">
     56    <rect
     57       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1"
     58       height="16.000042"
     59       width="9.0000019"
     60       y="1036.3621"
     61       x="-4.7683727e-07"
     62       id="XMLID_61_" />
     63    <rect
     64       style="fill:#808080;fill-opacity:1;stroke:none;stroke-width:1"
     65       height="16.000042"
     66       width="1.0000002"
     67       y="1036.3621"
     68       x="8.000001"
     69       id="rect4151" />
     70    <path
     71       style="fill:#808080;fill-opacity:1"
     72       id="path3387-0"
     73       d="m 4.9999557,1039.3655 h -1.000003 v -2 h 1.000003 z" />
     74    <path
     75       style="fill:#808080;fill-opacity:1"
     76       id="path3387-0-9"
     77       d="m 4.9999587,1043.3655 h -1.000004 v -2 h 1.000004 z" />
     78    <path
     79       style="fill:#808080;fill-opacity:1"
     80       id="path3387-0-9-7"
     81       d="m 4.9999587,1047.3655 h -1.000004 v -2 h 1.000004 z" />
     82    <rect
     83       id="rect4149"
     84       x="-4.7683727e-07"
     85       y="1036.3621"
     86       width="1.0000002"
     87       height="16.000042"
     88       style="fill:#808080;fill-opacity:1;stroke:none;stroke-width:1" />
     89    <path
     90       d="m 5.0000004,1051.3621 h -1.000004 v -2 h 1.000004 z"
     91       id="path4153"
     92       style="fill:#808080;fill-opacity:1" />
     93    <g
     94       id="g1"
     95       transform="matrix(1.6666045,0,0,1.6666045,-11.665674,-701.67672)">
     96      <path
     97         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"
     98         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"
     99         id="rect4152-0-5" />
     100      <path
     101         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"
     102         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"
     103         id="rect4152-0" />
     104      <rect
     105         rx="0.50000012"
     106         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"
     107         id="rect4152-9-3"
     108         width="4.500001"
     109         height="2.0000112"
     110         x="10.999999"
     111         y="-1047.3621"
     112         ry="0.50000006"
     113         transform="scale(1,-1)" />
     114      <ellipse
     115         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"
     116         id="path4177-4"
     117         cx="11.5"
     118         cy="-1048.8621"
     119         rx="0.50000012"
     120         ry="0.50000173"
     121         transform="scale(1,-1)" />
     122      <ellipse
     123         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"
     124         id="path4177-6-5"
     125         cx="15"
     126         cy="-1048.8621"
     127         rx="0.5"
     128         ry="0.50000179"
     129         transform="scale(1,-1)" />
     130    </g>
     131  </g>
     132</svg>

  • resources/styles/standard/elemstyles.mapcss 

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/resources/styles/standard/elemstyles.mapcss b/resources/styles/standard/elemstyles.mapcss
    a b  
    35903590area[craft=photographer],
    35913591area[craft=metal_construction],
    35923592area[craft=electrician],
     3593area[craft=electronics_repair],
    35933594area[craft=brewery],
    35943595area[craft=plumber],
    35953596area[craft=sawmill],
    … …  
    36263627node[craft=metal_construction] {
    36273628    icon-image: "presets/craft/metal_construction.svg";
    36283629    set icon_z17;
    3629 }node[craft=electrician] {
     3630}
     3631node[craft=electrician] {
    36303632    icon-image: "presets/craft/electrician.svg";
    36313633    set icon_z17;
     3634}
     3635node[craft=electronics_repair] {
     3636    icon-image: "presets/craft/electronics_repair.svg";
     3637    set icon_z17;
    36323638}
    36333639node[craft=brewery] {
    36343640    icon-image: "presets/craft/brewery.svg";
    … …  
    40424048    fill-color: landfill#663300;
    40434049}
    40444050area[landuse=basin],
    4045 area[landuse=reservoir] {
     4051area[landuse=reservoir],
     4052area[natural=water][water=reservoir] {
    40464053    fill-color: basin#0000bf;
    40474054}
     4055area[man_made=tailings_pond] {
     4056    fill-color:tailings_pond#af0073;
     4057}
    40484058area[landuse=forest] {
    40494059    fill-color: forest#b1efc8;
    40504060}
    … …  
    49654975    icon-image: "presets/misc/cliff.svg";
    49664976    set icon_z17;
    49674977}
     4978way[natural=earth_bank] {
     4979    repeat-image: "presets/misc/earth_bank_pattern.svg";
     4980    repeat-image-align: top;
     4981    repeat-image-offset: 0.5;
     4982    width: 1;
     4983    color: #9c6f32;
     4984}
    49684985way[natural=arete] {
    49694986    width: 1;
    49704987    color: arete#e6e6e6;
    … …  
    54635480area[setting("place_fill_colour")][place=town],
    54645481area[setting("place_fill_colour")][place=village],
    54655482area[setting("place_fill_colour")][place=hamlet],
     5483area[setting("place_fill_colour")][place=municipality],
    54665484area[setting("place_fill_colour")][place=farm],
    54675485area[setting("place_fill_colour")][place=isolated_dwelling],
    54685486area[setting("place_fill_colour")][place=neighbourhood],
    … …  
    54865504node[place=quarter],
    54875505node[place=neighbourhood],
    54885506node[place=hamlet],
     5507node[place=municipality],
    54895508node[place=isolated_dwelling],
    54905509node[place=farm],
    54915510node[place=city_block],
    … …  
    55365555    icon-image: "presets/place/hamlet.svg";
    55375556    z-index: 2.3;
    55385557}
     5558node[place=municipality] {
     5559    icon-image: "presets/place/municipality.svg";
     5560    z-index: 2.21;
     5561}
    55395562node[place=isolated_dwelling] {
    55405563    icon-image: "presets/place/isolated_dwelling.svg";
    55415564    z-index: 2.2;