Changeset 18843 in josm for trunk/resources


Ignore:
Timestamp:
2023-09-25T18:00:35+02:00 (14 months ago)
Author:
taylor.smock
Message:

Fix #23184: Add/ignore popular tags

Add

Ignore

  • check_date:?*: Used by surveying applications (fix #23182)
  • boundary=religious_administration: Not well documented

Replace

This additionally fixes an issue discovered by gaben in #23183, whereby
values_from="java.util.Locale#getISOCountries" could have some values
translated. This was fixed by adding a values_context attribute; in this case,
I used "country codes".

Location:
trunk/resources
Files:
6 added
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/resources/data/defaultpresets.xml

    r18841 r18843  
    682682        <preset_link preset_name="Access Restrictions" />
    683683    </chunk>
     684    <chunk id="school_common">
     685        <combo key="school:gender" values="mixed,male,female,separated" text="Gender of students"/>
     686    </chunk>
    684687  <!-- Groups -->
    685688  <group name="Highways" icon="presets/transport/way/way_secondary.svg">
    … …  
    990993            <reference ref="link_road_access_restrictions" />
    991994        </item> <!-- Pedestrian -->
     995        <item name="Busway" icon="presets/transport/way/way_busway.svg" type="way,closedway" preset_name_label="true">
     996            <link wiki="Tag:highway=busway"/>
     997            <space />
     998            <key key="highway" value="busway" />
     999            <optional>
     1000                <text key="name" text="Name" />
     1001                <space />
     1002                <reference ref="highway_base" />
     1003                <reference ref="highway_yesno_incline_oneway_lit_width_busbay_sidewalk" />
     1004                <text key="operator" text="Operator" />
     1005                <combo key="embedded_rails" values="abandoned,construction,disused,funicular,light_rail,miniature,narrow_gauge,rail,tram,yes" />
     1006                <check key="trolley_wire" text="Trolley wire" />
     1007            </optional>
     1008            <reference ref="link_road_access_restrictions" />
     1009        </item> <!-- Busway -->
    9921010        <item name="Service" icon="presets/transport/way/way_service.svg" type="way,closedway" preset_name_label="true">
    9931011            <link wiki="Tag:highway=service" />
    … …  
    22352253            <space />
    22362254            <key key="landuse" value="basin" />
    2237             <combo key="basin" text="Type" values="retention,infiltration,detention" />
     2255            <combo key="basin" text="Type" values="retention,infiltration,detention,evaporation,settling" />
    22382256            <reference ref="optional_name" />
    22392257        </item> <!-- Basin -->
    22402258        <item name="Reservoir" icon="presets/landuse/reservoir.svg" type="node,closedway,multipolygon" preset_name_label="true">
    2241             <link wiki="Tag:landuse=reservoir" />
    2242             <space />
    2243             <key key="landuse" value="reservoir" />
    2244             <combo key="reservoir_type" text="Type" values="evaporator,sewage,tailings,water_storage" />
     2259            <link wiki="Tag:water=reservoir" />
     2260            <space />
     2261            <key key="natural" value="water" />
     2262            <key key="water" value="reservoir" />
    22452263            <reference ref="optional_name" />
    22462264        </item> <!-- Reservoir -->
    … …  
    22812299            <reference ref="water_access" />
    22822300        </item> <!-- Water -->
     2301        <item name="Tailings Pond" icon="presets/misc/tailings_pond.svg" type="closedway,multipolygon" preset_name_label="true">
     2302            <link wiki="Tag:man_made=tailings_pond" />
     2303            <space />
     2304            <label text="An area in which waterborn tailings are pumped to allow the separation of solids from the water" />
     2305            <space />
     2306            <key key="man_made" value="tailings_pond" />
     2307            <optional>
     2308                <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" />
     2309                <check key="intermittent" text="Intermittent (sometimes wet, sometimes dry)" />
     2310                <check key="hazard" value_on="contamination" disable_off="true" text="Hazardous to human health due to chemical contamination"/>
     2311            </optional>
     2312        </item>
    22832313        <item name="Coastline" icon="presets/nautical/coast_line.svg" type="way,closedway" preset_name_label="true">
    22842314            <link wiki="Tag:natural=coastline" />
    … …  
    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" />
    … …  
    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" />
    … …  
    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 -->
    … …  
    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 -->
    … …  
    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 -->
    … …  
    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 -->
    … …  
    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">
    … …  
    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" values_context="country codes" />
     8279        <combo key="target" text="Receiving country code" values_from="java.util.Locale#getISOCountries" use_last_as_default="force" match="key" values_context="country codes" />
    82328280        <reference ref="link_contact_address" />
    82338281    </item> <!-- Diplomatic -->
    … …  
    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" />
    … …  
    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" />
    … …  
    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" />
    … …  
    93179402                <text key="addr:city" text="City name" use_last_as_default="force" match="key" />
    93189403                <text key="addr:postcode" text="Post code" use_last_as_default="force" match="key" />
    9319                 <combo key="addr:country" text="Country code" values_from="java.util.Locale#getISOCountries" use_last_as_default="force" match="key" />
     9404                <combo key="addr:country" text="Country code" values_from="java.util.Locale#getISOCountries" use_last_as_default="force" match="key" values_context="country codes" />
    93209405            </optional>
    93219406            <optional text="Optional tag only for address without addr:street">

  • trunk/resources/data/validator/deprecated.mapcss

    r18834 r18843  
    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}");

  • trunk/resources/data/validator/ignoretags.cfg

    r18812 r18843  
    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...
    … …  
    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

  • trunk/resources/styles/standard/elemstyles.mapcss

    r18835 r18843  
    35913591area[craft=metal_construction],
    35923592area[craft=electrician],
     3593area[craft=electronics_repair],
    35933594area[craft=brewery],
    35943595area[craft=plumber],
    … …  
    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";
     3633    set icon_z17;
     3634}
     3635node[craft=electronics_repair] {
     3636    icon-image: "presets/craft/electronics_repair.svg";
    36313637    set icon_z17;
    36323638}
    … …  
    40434049}
    40444050area[landuse=basin],
    4045 area[landuse=reservoir] {
     4051area[landuse=reservoir],
     4052area[natural=water][water=reservoir] {
    40464053    fill-color: basin#0000bf;
     4054}
     4055area[man_made=tailings_pond] {
     4056    fill-color:tailings_pond#af0073;
    40474057}
    40484058area[landuse=forest] {
    … …  
    49654975    icon-image: "presets/misc/cliff.svg";
    49664976    set icon_z17;
     4977}
     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;
    49674984}
    49684985way[natural=arete] {
    … …  
    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],
    … …  
    54875505node[place=neighbourhood],
    54885506node[place=hamlet],
     5507node[place=municipality],
    54895508node[place=isolated_dwelling],
    54905509node[place=farm],
    … …  
    55365555    icon-image: "presets/place/hamlet.svg";
    55375556    z-index: 2.3;
     5557}
     5558node[place=municipality] {
     5559    icon-image: "presets/place/municipality.svg";
     5560    z-index: 2.21;
    55385561}
    55395562node[place=isolated_dwelling] {
Note: See TracChangeset for help on using the changeset viewer.