Changeset 16255 in josm for trunk

Timestamp:

2020-04-11T14:31:06+02:00 (4 years ago)

Author:

Klumbumbus

Message:

fix #19066 - Improve some validator messages

Location:

trunk/resources/data/validator

Files:

• combinations.mapcss (modified) (4 diffs)
• relation.mapcss (modified) (3 diffs)

trunk/resources/data/validator/combinations.mapcss

@@ -49 +49 @@
 *[transformer                  ][!power],
 *[source:date                  ][!source],
-*[source:name                  ][!name],
+*[source:name                  ][!name][noname!=yes],
 *[source:maxspeed:forward      ][!maxspeed:forward][!maxspeed],
 *[source:maxspeed:backward     ][!maxspeed:backward][!maxspeed],
 *[source:building              ][!building],
-*[source:ref                   ][!ref],
+*[source:ref                   ][!ref][noref!=yes],
 *[source:population            ][!population],
 *[source:postal_code           ][!postal_code],
@@ -72 +72 @@
 *[source:housenumber           ][!addr:housenumber],
 *[source:addr:postcode         ][!addr:postcode],
-*[source:addr:housenumber      ][!addr:housenumber],
-*[source:addr                  ][!/^addr:/],
-*[source:maxspeed              ][!/^maxspeed:?/] {
+*[source:addr:housenumber      ][!addr:housenumber] {
   throwWarning: tr("{0} without {1}", "{0.key}", "{1.key}");
   group: tr("missing tag");
@@ -367 +365 @@
 *[boundary][/^addr:/],
 *[highway][/^addr:/][highway!=services][highway!=rest_area][!"addr:postcode"] {
-  throwWarning: tr("{0} together with addr:*", "{0.key}");
+  throwWarning: tr("{0} together with {1}", "{0.key}", "addr:*");
   group: tr("suspicious tag combination");
   assertMatch: "node place=foo addr:housenumber=5";
@@ -680 +678 @@
   group: tr("missing tag");
 }
+*[source:addr][!/^addr:/] {
+  throwWarning: tr("{0} without {1}", "{0.key}", "addr:*");
+  group: tr("missing tag");
+}
+*[source:maxspeed][!/^maxspeed:?/] {
+  throwWarning: tr("{0} without {1} or {2}", "{0.key}", "maxspeed", "maxspeed:*");
+  group: tr("missing tag");
+}

trunk/resources/data/validator/relation.mapcss

@@ -11 +11 @@
 relation[type=route][!route],
 relation[type=route_master][!route_master],
-relation[type=restriction][!/^restriction/], /* see #11586 */
 relation[type=boundary][!boundary][!disused:boundary],
 relation[type=public_transport][!public_transport],
@@ -22 +21 @@
   assertMatch: "relation type=route_master";
   assertNoMatch: "relation type=route_master route_master=train";
-  assertMatch: "relation type=restriction";
-  assertNoMatch: "relation type=restriction restriction=no_left_turn";
   assertMatch: "relation type=boundary";
   assertNoMatch: "relation type=boundary boundary=administrative";
@@ -35 +32 @@
 }
 
+/* #11586 */
+relation[type=restriction][!/^restriction/]{ 
+  throwWarning: tr("{0} relation without {0} tag", "restriction");
+  group: tr("missing tag");
+  assertMatch: "relation type=restriction";
+  assertNoMatch: "relation type=restriction restriction=no_left_turn";
+  assertNoMatch: "relation type=restriction restriction:hgv=no_left_turn";
+}
+
 /* #15208, #16242 */
 relation[type=route][route=mtb    ] > way[bicycle=no],