Changeset 17017 in josm for trunk


Ignore:
Timestamp:
2020-09-12T17:22:27+02:00 (4 years ago)
Author:
Klumbumbus
Message:
  • see #19739 - Add natural=sinkhole (one icon for all types for now, self created, PC and CC0 licensed), deprecate natural=sink_hole
  • Remove TLD from IANA
Location:
trunk
Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/resources/data/defaultpresets.xml

    r16996 r17017  
    78847884            <text key="height" text="Height (meters)" length="7" />
    78857885        </item> <!-- Cliff -->
     7886        <item name="Sinkhole" icon="presets/landmark/sinkhole.svg" type="node,closedway" preset_name_label="true">
     7887            <link wiki="Tag:natural=sinkhole" />
     7888            <space />
     7889            <key key="natural" value="sinkhole" />
     7890            <combo key="sinkhole" text="Type" values="bluehole,doline,estavelle,pit,ponor" />
     7891            <optional>
     7892                <reference ref="name_wikipedia_wikidata" />
     7893            </optional>
     7894        </item> <!-- Sinkhole -->
    78867895        <item name="Cave Entrance" icon="presets/landmark/cave_entrance.svg" type="node,closedway" preset_name_label="true">
    78877896            <link wiki="Tag:natural=cave_entrance" />

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

    r16787 r17017  
    20472047}
    20482048
     2049/* #19739 */
     2050*[natural=sink_hole] {
     2051  throwWarning: tr("{0} is deprecated", "{0.tag}");
     2052  suggestAlternative: "natural=sinkhole";
     2053  group: tr("deprecated tagging");
     2054  fixAdd: "natural=sinkhole";
     2055}
     2056
    20492057/* When tags are deprecated they should be added to ignoretags.cfg too. */

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

    r16858 r17017  
    695695K:generator:type=solar_photovoltaic_panels
    696696K:building=part
     697K:natural=sink_hole
    697698;
    698699; Tags not yet decided (to remove from this section when added or moved up when deprecated)

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

    r16993 r17017  
    47704770}
    47714771area[natural=cape],
     4772area[natural=sinkhole],
    47724773area[natural=cave_entrance] {
    47734774    fill-color: natural#002f00;
    … …  
    47754776node[natural=cape] {
    47764777    icon-image: "presets/nautical/cape.svg";
     4778    set icon_z17;
     4779}
     4780node[natural=sinkhole] {
     4781    icon-image: "presets/landmark/sinkhole.svg";
    47774782    set icon_z17;
    47784783}

  • trunk/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java

    r16819 r17017  
    944944        "menu", // menu Wedding TLD2, LLC
    945945        "merckmsd", // merckmsd MSD Registry Holdings, Inc.
    946         "metlife", // metlife MetLife Services and Solutions, LLC
    947946        "miami", // miami Top Level Domain Holdings Limited
    948947        "microsoft", // microsoft Microsoft Corporation
Note: See TracChangeset for help on using the changeset viewer.