Changeset 11587 in josm for trunk/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java

Timestamp:

2017-02-19T23:52:08+01:00 (7 years ago)

Author:

Don-vip

Message:

checkstyle - enable BooleanExpressionComplexity / 6

File:

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

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

@@ -57 +57 @@
             return super.isPrimitiveUsable(w)
                     && !isProposedOrAbandoned(w)
-                    && ((w.hasKey(HIGHWAY) && !w.hasTag(HIGHWAY, "rest_area", "services"))
+                    && (isHighway(w)
                     || w.hasKey(WATERWAY)
-                    || (w.hasKey(RAILWAY) && !isSubwayOrTramOrRazed(w))
+                    || isRailway(w)
                     || isCoastline(w)
                     || isBuilding(w));
@@ -238 +238 @@
     static boolean isCoastline(OsmPrimitive w) {
         return w.hasTag("natural", "water", "coastline") || w.hasTag("landuse", "reservoir");
+    }
+
+    static boolean isHighway(OsmPrimitive w) {
+        return w.hasKey(HIGHWAY) && !w.hasTag(HIGHWAY, "rest_area", "services");
+    }
+
+    static boolean isRailway(OsmPrimitive w) {
+        return w.hasKey(RAILWAY) && !isSubwayOrTramOrRazed(w);
     }