Changeset 17466 in josm


Ignore:
Timestamp:
2021-01-18T13:47:54+01:00 (3 months ago)
Author:
Klumbumbus
Message:

fix #20326 - Support railway:position instead of distance for railway=milestone

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/resources/data/defaultpresets.xml

    r17433 r17466  
    23742374            <link wiki="Tag:railway=milestone" />
    23752375            <key key="railway" value="milestone" />
    2376             <text key="distance" text="Distance (kilometers)" />
     2376            <text key="railway:position" text="Position (kilometers)" />
    23772377            <text key="ref" text="Reference" />
    23782378        </item> <!-- Railway Milestone -->
  • trunk/resources/data/validator/deprecated.mapcss

    r17284 r17466  
    670670/* #11330, #18642 */
    671671*[/^.$/],
    672 node[/^..$/],
     672node[/^..$/][!kp][!pk],
    673673way[/^..$/][route=ferry][!to],
    674674way[/^..$/][route!=ferry],
     
    681681  assertMatch: "node fo=bar";
    682682  assertMatch: "node f=b";
     683  assertNoMatch: "node kp=5"; /* already has a deprecated warning */
     684  assertNoMatch: "node pk=7"; /* already has a deprecated warning */
    683685}
    684686
     
    725727}
    726728
    727 /* #8717 */
    728 *[kp][highway=milestone],
    729 *[kp][railway=milestone],
    730 *[kp][waterway=milestone] {
     729/* #8717, #20326 */
     730*[kp][railway!=milestone] {
    731731  throwWarning: tr("{0} is deprecated", "{0.key}");
    732732  suggestAlternative: "distance";
     
    734734  fixChangeKey: "kp => distance";
    735735}
    736 *[pk][highway=milestone],
    737 *[pk][railway=milestone],
    738 *[pk][waterway=milestone] {
     736*[pk][railway!=milestone] {
    739737  throwWarning: tr("{0} is deprecated", "{0.key}");
    740738  suggestAlternative: "distance";
    741739  group: tr("deprecated tagging");
    742740  fixChangeKey: "pk => distance";
     741}
     742*[kp][railway=milestone] {
     743  throwWarning: tr("{0} is deprecated", "{0.key}");
     744  suggestAlternative: "railway:position";
     745  group: tr("deprecated tagging");
     746  fixChangeKey: "kp => railway:position";
     747}
     748*[pk][railway=milestone] {
     749  throwWarning: tr("{0} is deprecated", "{0.key}");
     750  suggestAlternative: "railway:position";
     751  group: tr("deprecated tagging");
     752  fixChangeKey: "pk => railway:position";
     753}
     754*[distance][railway=milestone] {
     755  throwWarning: tr("{0} is deprecated for {1}", "{0.key}", "{1.tag}");
     756  suggestAlternative: "railway:position";
     757  group: tr("deprecated tagging");
     758  fixChangeKey: "distance => railway:position";
    743759}
    744760
  • trunk/resources/data/validator/ignoretags.cfg

    r17451 r17466  
    699699K:cuisine=BBQ
    700700E:pole:type
     701E:kp
     702E:pk
    701703;
    702704; Tags not yet decided (to remove from this section when added or moved up when deprecated)
  • trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/LabelCompositionStrategy.java

    r16438 r17466  
    150150            "int_name",
    151151            "distance",
     152            "railway:position",
    152153            "ref",
    153154            "operator",
Note: See TracChangeset for help on using the changeset viewer.