Changeset 11049 in josm for trunk

Timestamp:

2016-09-24T19:25:18+02:00 (8 years ago)

Author:

Klumbumbus

Message:

adjust some validator rules

Location:

trunk/data/validator

Files:

• deprecated.mapcss (modified) (2 diffs)
• geometry.mapcss (modified) (4 diffs)
• highway.mapcss (modified) (2 diffs)

trunk/data/validator/deprecated.mapcss

@@ -505 +505 @@
   set samecolor;
   fixRemove: "color";
+  assertMatch: "way color=red colour=red";
+  assertNoMatch: "way color=red colour=green";
 }
 *[color][colour]!.samecolor {
   throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.tag}");
+  assertNoMatch: "way color=red colour=red";
+  assertMatch: "way color=red colour=green";
 }
 *[/:color/]{
   throwWarning: tr("{0} is deprecated", "{0.key}");
   suggestAlternative: ":colour";
+  assertNoMatch: "way color=red";
+  assertMatch: "way roof:color=grey";
 }
 *[/color:/] {
@@ -529 +535 @@
 relation[/^..$/][!to] {
   throwWarning: tr("uncommon short key");
+  assertNoMatch: "relation to=Berlin";
+  assertMatch: "relation fo=bar";
+  assertMatch: "way to=bar";
+  assertMatch: "node fo=bar";
+  assertMatch: "node f=b";
 }
 

trunk/data/validator/geometry.mapcss

@@ -73 +73 @@
 }
 
-/* {0} on a node, should be a relation; see #10252, #10769 */
+/* {0} on a node, should be a relation; Error level; see #10252, #10769 */
 node[route],
 node[restriction] {
-  throwWarning: tr("{0}=* on a node. Should be used in a relation", "{0.key}"); 
+  throwError: tr("{0}=* on a node. Should be used in a relation", "{0.key}"); 
 }
 
@@ -221 +221 @@
 }
 
-/*see #11127*/
+/* #11127 */
 way[railway][bridge] > node,
 way[highway][bridge] > node {
@@ -230 +230 @@
 }
 
-/*see #11128*/
+/* #11128 */
 way[highway] > node[tourism=information][information=guidepost] {
   set guidepost;
@@ -262 +262 @@
 }
 
-/* 12561 - building larger than Aalsmeer Flower Auction */
-area:closed[building][eval(areasize()) > 500000] {
-  throwWarning: tr("Too large building");
+/* #12561 - building larger than Aalsmeer Flower Auction (518000) and Tesla factory (510000) */
+area:closed[building][building!=no][eval(areasize()) > 520000] {
+  throwError: tr("Too large building");
 }
 

trunk/data/validator/highway.mapcss

@@ -17 +17 @@
 }
 
-node[highway =~ /motorway|trunk|primary|secondary|tertiary|unclassified|residential|service|living_street|pedestrian|track|path|footway|cycleway|bus_guideway|bridleway/][highway!=motorway_junction][highway!=services] {
+node[highway =~ /motorway|trunk|primary|secondary|tertiary|unclassified|residential|service|living_street|pedestrian|track|path|footway|cycleway|bus_guideway|bridleway/] {
   throwWarning: tr("wrong highway tag on a node");
   assertMatch: "node highway=primary";
@@ -109 +109 @@
 way[footway][footway!=sidewalk][footway!=crossing]!.footway_to_sidewalk { /* do not trigger this rule if already one of the two previous rules applied */
   throwWarning: tr("Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use ''{3}'' instead.", "{0.key}", "{1.value}", "{2.value}", "sidewalk=left|right|both|no");
+  assertNoMatch: "way footway=left";
+  assertNoMatch: "way footway=none";
+  assertMatch: "way footway=bar";
 }