Changeset 17957 in josm

Timestamp:

2021-07-07T23:04:44+02:00 (3 years ago)

Author:

Klumbumbus

Message:

fix #20902 - Warn about solo layer and level tags, remove relations from checks, warn about area on relations (patch by skyper)

Location:

trunk/resources/data/validator

Files:

• combinations.mapcss (modified) (2 diffs)
• geometry.mapcss (modified) (1 diff)
• unnecessary.mapcss (modified) (1 diff)

trunk/resources/data/validator/combinations.mapcss

@@ -345 +345 @@
 }
 
-/* only {0.key}, #11104, #12422, #14950, #19572 */
-*[lanes][eval(number_of_tags()) = 1],
-*[surface][eval(number_of_tags()) = 1],
-*[access][eval(number_of_tags()) = 1],
-*[area][eval(number_of_tags()) = 1]!.area_yes_autofix,
-*[name][eval(number_of_tags()) = 1],
-*[ref][eval(number_of_tags()) = 1],
-*[lit][eval(number_of_tags()) = 1] {
+/* only {0.key}, #11104, #12422, #14950, #19572, #20902 */
+/* relations excluded as there is a test for missing type=* plus several other test depending on the type exist */
+node[access][eval(number_of_tags()) = 1],
+way[access][eval(number_of_tags()) = 1],
+node[area][eval(number_of_tags()) = 1]!.area_yes_autofix,
+way[area][eval(number_of_tags()) = 1]!.area_yes_autofix,
+node[lanes][eval(number_of_tags()) = 1],
+way[lanes][eval(number_of_tags()) = 1],
+node[layer][eval(number_of_tags()) = 1],
+way[layer][eval(number_of_tags()) = 1],
+way[level][eval(number_of_tags()) = 1], /* nodes might be valid, e.g. start and end nodes of steps */
+node[lit][eval(number_of_tags()) = 1],
+way[lit][eval(number_of_tags()) = 1],
+node[name][eval(number_of_tags()) = 1],
+way[name][eval(number_of_tags()) = 1],
+node[ref][eval(number_of_tags()) = 1],
+way[ref][eval(number_of_tags()) = 1],
+node[surface][eval(number_of_tags()) = 1],
+way[surface][eval(number_of_tags()) = 1] {
   throwWarning: tr("incomplete object: only {0}", "{0.key}");
   set only_one_tag;
@@ -358 +369 @@
 }
 /* only {0.key} and {1.key} */
-*[name][area][eval(number_of_tags()) = 2],
-*[name][ref][eval(number_of_tags()) = 2] {
+node[name][area][eval(number_of_tags()) = 2],
+way[name][area][eval(number_of_tags()) = 2],
+node[name][ref][eval(number_of_tags()) = 2],
+way[name][ref][eval(number_of_tags()) = 2] {
   throwWarning: tr("incomplete object: only {0} and {1}", "{0.key}", "{1.key}");
   group: tr("missing tag");
 }
 /* only {0.tag}, #15269 */
-*[tourism=attraction][eval(number_of_tags()) = 1] {
+node[tourism=attraction][eval(number_of_tags()) = 1], 
+way[tourism=attraction][eval(number_of_tags()) = 1] {
   throwWarning: tr("incomplete object: only {0}", "{0.tag}");
   group: tr("missing tag");
 }
 /* only {0.key} and {1.tag} */
-*[name][tourism=attraction][eval(number_of_tags()) = 2] {
+node[name][tourism=attraction][eval(number_of_tags()) = 2],
+way[name][tourism=attraction][eval(number_of_tags()) = 2] {
   throwWarning: tr("incomplete object: only {0} and {1}", "{0.key}", "{1.tag}");
   group: tr("missing tag");

trunk/resources/data/validator/geometry.mapcss

@@ -138 +138 @@
 way:closed[power=line] {
   throwWarning: tr("{0} on a closed way. Should be used on an unclosed way.", "{1.tag}"); 
+}
+
+/* #20902 */
+relation[area?] {
+  throwWarning: tr("{0} on a relation", "{0.key}");
+  fixRemove: "{0.key}";
 }
 

trunk/resources/data/validator/unnecessary.mapcss

@@ -20 +20 @@
 }
 
-area:closed[amenity ][area?][!highway],
-area:closed[building][area?],
-area:closed[landuse ][area?][!highway],
-area:closed[leisure ][area?][!highway][leisure!=track][leisure!=slipway],
-area:closed[natural ][area?],
-area:closed[shop    ][area?] {
+way:closed[amenity ][area?][!highway],
+way:closed[building][area?],
+way:closed[landuse ][area?][!highway],
+way:closed[leisure ][area?][!highway][leisure!=track][leisure!=slipway],
+way:closed[natural ][area?],
+way:closed[shop    ][area?] {
   throwWarning: tr("{0} is unnecessary for {1}", "{2.tag}", "{1.key}");
   group: tr("unnecessary tag");