Changeset 6386 in josm for trunk/src/org

Timestamp:

2013-11-15T02:00:02+01:00 (11 years ago)

Author:

Don-vip

Message:

fix #9291 - validator: do not warn for unclosed ways and sport=climbing

Location:

trunk/src/org/openstreetmap/josm/data/validation/tests

Files:

• MultipolygonTest.java (modified) (1 diff)
• UnclosedWays.java (modified) (1 diff)

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

@@ -124 +124 @@
             List<Node> nodes = w.getNodes();
             if (nodes.size()<1) return; // fix zero nodes bug
-            errors.add(new TestError(this, Severity.WARNING, tr("Area style way is not closed"), NOT_CLOSED,
-                    Collections.singletonList(w), Arrays.asList(nodes.get(0), nodes.get(nodes.size() - 1))));
+            // Fix #9291 - Do not raise warning for sport=climbing + natural=cliff
+            if (!(w.hasTag("sport", "climbing") && w.hasTag("natural", "cliff"))) {
+                errors.add(new TestError(this, Severity.WARNING, tr("Area style way is not closed"), NOT_CLOSED,
+                        Collections.singletonList(w), Arrays.asList(nodes.get(0), nodes.get(nodes.size() - 1))));
+            }
         }
     }

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

@@ -68 +68 @@
         }
         test = w.get("sport");
-        if (test != null && !test.equals("water_slide")) {
+        if (test != null && !test.equals("water_slide") && !test.equals("climbing")) {
             set(1104, marktr("sport type {0}"), test);
         }