Changeset 11608 in josm for trunk/src/org/openstreetmap/josm/data/validation/tests/Highways.java

Timestamp:

2017-02-25T03:14:20+01:00 (7 years ago)

Author:

Don-vip

Message:

fix #14402 - add blacklist for leisure area values to avoid false positives - improve globally the detection of keys/tags

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/Highways.java (modified) (2 diffs)

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

@@ -92 +92 @@
     public void visit(Way w) {
         if (w.isUsable()) {
-            if (w.isClosed() && w.hasKey("highway") && CLASSIFIED_HIGHWAYS.contains(w.get("highway"))
-                    && w.hasKey("junction") && "roundabout".equals(w.get("junction"))) {
+            if (w.isClosed() && w.hasTag("highway", CLASSIFIED_HIGHWAYS) && w.hasTag("junction", "roundabout")) {
                 // TODO: find out how to handle splitted roundabouts (see #12841)
                 testWrongRoundabout(w);
@@ -131 +130 @@
                 if (list.size() > 2 || oneway1 == null || oneway2 == null || !oneway1 || !oneway2) {
                     // Error when the highway tags do not match
-                    if (!w.get("highway").equals(s)) {
+                    String value = w.get("highway");
+                    if (!value.equals(s)) {
                         errors.add(TestError.builder(this, Severity.WARNING, WRONG_ROUNDABOUT_HIGHWAY)
-                                .message(tr("Incorrect roundabout (highway: {0} instead of {1})", w.get("highway"), s))
+                                .message(tr("Incorrect roundabout (highway: {0} instead of {1})", value, s))
                                 .primitives(w)
                                 .fix(() -> new ChangePropertyCommand(w, "highway", s))