Changeset 15004 in josm for trunk


Ignore:
Timestamp:
2019-04-20T22:52:50+02:00 (7 years ago)
Author:
Klumbumbus
Message:
  • see #17567 - make validator warnings more comprehensible
  • fix #17630 - warn about building:part=* together with building=*
  • fix #17593 - warn about sport=football
Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/data/validator/combinations.mapcss

    r14998 r15004  
    267267}
    268268
    269 /* {0.key} together with {1.key}, #17604 */
     269/* {0.key} together with {1.key}, #17630, #17604 */
     270*[building:part][building],
    270271*[addr:street][addr:place] {
    271272  throwWarning: tr("{0} together with {1}", "{0.key}", "{1.key}");

  • trunk/data/validator/deprecated.mapcss

    r14957 r15004  
    14211421  fixRemove: "{0.key}";
    14221422}
     1423
     1424/* #17593 */
     1425*[sport=football] {
     1426  throwWarning: tr("{0} is deprecated", "{0.tag}");
     1427  suggestAlternative: "sport=soccer";
     1428  suggestAlternative: "sport=american_football";
     1429  suggestAlternative: "sport=australian_football";
     1430  suggestAlternative: "sport=canadian_football";
     1431  suggestAlternative: "sport=rugby_league";
     1432  suggestAlternative: "sport=rugby_union";
     1433  suggestAlternative: "sport=gaelic_games";
     1434  group: tr("deprecated tagging");
     1435}

  • trunk/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java

    r15003 r15004  
    6363        if (!r.hasTag("restriction", SUPPORTED_RESTRICTIONS)) {
    6464            errors.add(TestError.builder(this, Severity.ERROR, UNKNOWN_RESTRICTION)
    65                     .message(tr("Unknown restriction"))
     65                    .message(tr("Unknown turnrestriction"))
    6666                    .primitives(r)
    6767                    .build());
    … …  
    116116                default:
    117117                    errors.add(TestError.builder(this, Severity.WARNING, UNEXPECTED_ROLE)
    118                             .message(tr("Unexpected role ''{0}'' in restriction", m.getRole()))
     118                            .message(tr("Unexpected role ''{0}'' in turnrestriction", m.getRole()))
    119119                            .primitives(l)
    120120                            .highlight(m.getMember())
    … …  
    135135                } else {
    136136                    errors.add(TestError.builder(this, Severity.WARNING, UNEXPECTED_ROLE)
    137                             .message(tr("Unexpected role ''{0}'' in restriction", m.getRole()))
     137                            .message(tr("Unexpected role ''{0}'' in turnrestriction", m.getRole()))
    138138                            .primitives(l)
    139139                            .highlight(m.getMember())
    … …  
    142142            } else {
    143143                errors.add(TestError.builder(this, Severity.WARNING, UNEXPECTED_TYPE)
    144                         .message(tr("Unexpected member type in restriction"))
     144                        .message(tr("Unexpected member type in turnrestriction"))
    145145                        .primitives(l)
    146146                        .highlight(m.getMember())
Note: See TracChangeset for help on using the changeset viewer.