Changeset 7932 in josm for trunk

Timestamp:

2015-01-07T01:01:35+01:00 (10 years ago)

Author:

Don-vip

Message:

see #10938 - take noname=yes into account in validator tests

Location:

trunk

Files:

• data/validator/combinations.mapcss (modified) (1 diff)
• data/validator/highway.mapcss (modified) (1 diff)
• src/org/openstreetmap/josm/data/validation/tests/UntaggedWay.java (modified) (1 diff)

trunk/data/validator/combinations.mapcss

@@ -156 +156 @@
 }
 
-node[amenity =~ /^(restaurant|cafe|fast_food)$/][!name] {
+node[amenity =~ /^(restaurant|cafe|fast_food)$/][!name][noname!=yes] {
   throwOther: tr("restaurant without name");
   assertMatch: "node amenity=restaurant";
+  assertNoMatch: "node amenity=restaurant noname=yes";
   assertNoMatch: "node amenity=restaurant name=Foobar";
 }

trunk/data/validator/highway.mapcss

@@ -44 +44 @@
 }
 
-way[highway=unclassified][!name] {
+way[highway=unclassified][!name][noname!=yes] {
   throwOther: tr("Unnamed unclassified highway");
   assertMatch: "way highway=unclassified";
+  assertNoMatch: "way highway=unclassified noname=yes";
   assertNoMatch: "way highway=unclassified name=Foo";
 }

trunk/src/org/openstreetmap/josm/data/validation/tests/UntaggedWay.java

@@ -79 +79 @@
         if (!tags.isEmpty()) {
             String highway = tags.get("highway");
-            if (highway != null && NAMED_WAYS.contains(highway) && !tags.containsKey("name") && !tags.containsKey("ref")) {
+            if (highway != null && NAMED_WAYS.contains(highway) && !tags.containsKey("name") && !tags.containsKey("ref")
+                    && !"yes".equals(tags.get("noname"))) {
                 boolean isRoundabout = false;
                 boolean hasName = false;