Changeset 16255 in josm


Ignore:
Timestamp:
2020-04-11T14:31:06+02:00 (20 months ago)
Author:
Klumbumbus
Message:

fix #19066 - Improve some validator messages

Location:
trunk/resources/data/validator
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/resources/data/validator/combinations.mapcss

    r16254 r16255  
    4949*[transformer                  ][!power],
    5050*[source:date                  ][!source],
    51 *[source:name                  ][!name],
     51*[source:name                  ][!name][noname!=yes],
    5252*[source:maxspeed:forward      ][!maxspeed:forward][!maxspeed],
    5353*[source:maxspeed:backward     ][!maxspeed:backward][!maxspeed],
    5454*[source:building              ][!building],
    55 *[source:ref                   ][!ref],
     55*[source:ref                   ][!ref][noref!=yes],
    5656*[source:population            ][!population],
    5757*[source:postal_code           ][!postal_code],
     
    7272*[source:housenumber           ][!addr:housenumber],
    7373*[source:addr:postcode         ][!addr:postcode],
    74 *[source:addr:housenumber      ][!addr:housenumber],
    75 *[source:addr                  ][!/^addr:/],
    76 *[source:maxspeed              ][!/^maxspeed:?/] {
     74*[source:addr:housenumber      ][!addr:housenumber] {
    7775  throwWarning: tr("{0} without {1}", "{0.key}", "{1.key}");
    7876  group: tr("missing tag");
     
    367365*[boundary][/^addr:/],
    368366*[highway][/^addr:/][highway!=services][highway!=rest_area][!"addr:postcode"] {
    369   throwWarning: tr("{0} together with addr:*", "{0.key}");
     367  throwWarning: tr("{0} together with {1}", "{0.key}", "addr:*");
    370368  group: tr("suspicious tag combination");
    371369  assertMatch: "node place=foo addr:housenumber=5";
     
    680678  group: tr("missing tag");
    681679}
     680*[source:addr][!/^addr:/] {
     681  throwWarning: tr("{0} without {1}", "{0.key}", "addr:*");
     682  group: tr("missing tag");
     683}
     684*[source:maxspeed][!/^maxspeed:?/] {
     685  throwWarning: tr("{0} without {1} or {2}", "{0.key}", "maxspeed", "maxspeed:*");
     686  group: tr("missing tag");
     687}
  • trunk/resources/data/validator/relation.mapcss

    r15771 r16255  
    1111relation[type=route][!route],
    1212relation[type=route_master][!route_master],
    13 relation[type=restriction][!/^restriction/], /* see #11586 */
    1413relation[type=boundary][!boundary][!disused:boundary],
    1514relation[type=public_transport][!public_transport],
     
    2221  assertMatch: "relation type=route_master";
    2322  assertNoMatch: "relation type=route_master route_master=train";
    24   assertMatch: "relation type=restriction";
    25   assertNoMatch: "relation type=restriction restriction=no_left_turn";
    2623  assertMatch: "relation type=boundary";
    2724  assertNoMatch: "relation type=boundary boundary=administrative";
     
    3532}
    3633
     34/* #11586 */
     35relation[type=restriction][!/^restriction/]{
     36  throwWarning: tr("{0} relation without {0} tag", "restriction");
     37  group: tr("missing tag");
     38  assertMatch: "relation type=restriction";
     39  assertNoMatch: "relation type=restriction restriction=no_left_turn";
     40  assertNoMatch: "relation type=restriction restriction:hgv=no_left_turn";
     41}
     42
    3743/* #15208, #16242 */
    3844relation[type=route][route=mtb    ] > way[bicycle=no],
Note: See TracChangeset for help on using the changeset viewer.