Changeset 13005 in josm

Timestamp:

2017-10-16T20:49:43+02:00 (7 years ago)

Author:

Klumbumbus

Message:

fix #15439 - fine tune some validator rules (patch by nyurik)

Location:

trunk/data/validator

Files:

• highway.mapcss (modified) (2 diffs)
• numeric.mapcss (modified) (2 diffs)
• unnecessary.mapcss (modified) (1 diff)

trunk/data/validator/highway.mapcss

@@ -86 +86 @@
 }
 
-/* footway, see #10851, #10976 */
-way[footway=left][/footway:/],
-way[footway=right][/footway:/],
-way[footway=both][/footway:/],
-way[footway=no][/footway:/] {
+/* footway, see #10851, #10976, #15439 */
+way[footway=left][/^footway:/],
+way[footway=right][/^footway:/],
+way[footway=both][/^footway:/],
+way[footway=no][/^footway:/] {
   throwWarning: tr("{0} is deprecated, use {1} instead. Also check similar tags like {2}", "{0.tag}", "sidewalk", "{1.key}");
   group: tr("deprecated tagging");
@@ -127 +127 @@
 }
 
-/* #11270, #9297 */
+/* #11270, #9297, #15439 */
 way[railway =~ /^(light_rail|miniature|narrow_gauge|preserved|rail)$/][!highway] > node { set .is_in_railway }
 way[highway =~ /^(bridleway|cycleway|footway|path|steps)$/] > node { set .is_in_minor_road }
-way[highway =~ /^(bus_guideway|living_street|motorway|pedestrian|primary|raceway|residential|road|secondary|service|tertiary|track|trunk|unclassified)/] > node { set .is_in_major_road }
+way[highway =~ /^(bus_guideway|living_street|motorway|motorway_link|pedestrian|primary|primary_link|raceway|residential|road|secondary|secondary_link|service|tertiary|tertiary_link|track|trunk|trunk_link|unclassified)$/] > node { set .is_in_major_road }
 node[railway!=crossing].is_in_railway.is_in_minor_road!.is_in_major_road {
   throwWarning: tr("pedestrian railway crossing without {0}", "{0.tag}");

trunk/data/validator/numeric.mapcss

@@ -7 +7 @@
 }
 
-*[layer =~ /\+.*/] {
+*[layer =~ /^\+\d/] {
   throwWarning: tr("layer tag with + sign");
   fixAdd: concat("layer=", replace(tag("layer"), "+", ""));
@@ -13 +13 @@
   assertNoMatch: "node layer=1";
   assertNoMatch: "node layer=-1";
+  assertNoMatch: "node layer=+foo";
 }
 

trunk/data/validator/unnecessary.mapcss

@@ -1 +1 @@
 *[access][highway=proposed],
-*[motor_vehicle?][vehicle!=no][access!=no][bicycle_road!=yes][highway =~ /motorway|trunk|primary|secondary|tertiary|unclassified|residential|service|living_street/],
+*[motor_vehicle?][vehicle!=no][access!=no][bicycle_road!=yes][highway =~ /^(motorway|motorway_link|trunk|trunk_link|primary|primary_link|secondary|secondary_link|tertiary|tertiary_link|unclassified|residential|service|living_street)$/],
 *[bridge=no],
 *[building=no],