Changeset 12040 in josm

Timestamp:

2017-05-03T00:00:50+02:00 (9 years ago)

Author:

michael2402

Message:

Long segment test: Make condition for using nodes/ways easier to read.

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/LongSegment.java (modified) (1 diff)

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

@@ -127 +127 @@
     @Override
     public boolean isPrimitiveUsable(OsmPrimitive p) {
-        if (!p.isUsable()) {
-            return false;
-        } else if (p instanceof Way && ((Way) p).getNodesCount() > 1) {
-            // test only Ways with at least 2 nodes
-            return true;
-        } else if (p instanceof Node && p.isDrawable()) {
-            // test all nodes - ways referred by them may not be checked automatically.
-            return true;
-        } else {
-            return false;
-        }
+        return p.isUsable() && (isUsableWay(p) || isUsableNode(p));
+    }
+
+    private boolean isUsableNode(OsmPrimitive p) {
+        // test changed nodes - ways referred by them may not be checked automatically.
+        return p instanceof Node && p.isDrawable();
+    }
+
+    private boolean isUsableWay(OsmPrimitive p) {
+        // test only Ways with at least 2 nodes
+        return p instanceof Way && ((Way) p).getNodesCount() > 1;
     }
 }