Changeset 11587 in josm for trunk/src/org/openstreetmap/josm/data/validation

Timestamp:

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

Author:

Don-vip

Message:

checkstyle - enable BooleanExpressionComplexity / 6

Location:

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

Files:

• CrossingWays.java (modified) (2 diffs)
• UnconnectedWays.java (modified) (3 diffs)
• WayConnectedToArea.java (modified) (1 diff)

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);
     }
 

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

@@ -111 +111 @@
         @Override
         public boolean isPrimitiveUsable(OsmPrimitive p) {
-            return super.isPrimitiveUsable(p) && (p.hasKey("natural") || p.hasKey("landuse"));
+            return super.isPrimitiveUsable(p) && p.hasKey("natural", "landuse");
         }
     }
@@ -185 +185 @@
                             || en.hasTag("railway", "buffer_stop")
                             || en.isKeyTrue("noexit")
-                            || en.hasKey("entrance")
-                            || en.hasKey("barrier")) {
+                            || en.hasKey("entrance", "barrier")) {
                         continue;
                     }
@@ -451 +450 @@
             ways.addAll(getWaySegments(w));
             QuadBuckets<Node> set = endnodes;
-            if (w.hasKey("highway") || w.hasKey("railway")) {
+            if (w.hasKey("highway", "railway")) {
                 set = endnodesHighway;
             }

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

@@ -81 +81 @@
 
     private static boolean isArea(OsmPrimitive p) {
-        return (p.hasKey("landuse") || p.hasKey("natural"))
-                && ElemStyles.hasAreaElemStyle(p, false);
+        return p.hasKey("landuse", "natural") && ElemStyles.hasAreaElemStyle(p, false);
     }