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

Timestamp:

2013-09-20T22:44:07+02:00 (13 years ago)

Author:

Don-vip

Message:

Sonar - fix some issues in data.validation.tests

File:

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

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

@@ -53 +53 @@
     @Override
     public void visit(Way w) {
-        if (w.isUsable()) {
-            if (w.hasKey("highway") && w.hasKey("junction") && w.get("junction").equals("roundabout")) {
-                Map<String, List<Way>> map = new HashMap<String, List<Way>>();
-                // Count all highways (per type) connected to this roundabout
-                // As roundabouts are closed ways, take care of not processing the first/last node twice
-                for (Node n : new HashSet<Node>(w.getNodes())) {
-                    for (Way h : Utils.filteredCollection(n.getReferrers(), Way.class)) {
-                        if (h != w && h.hasKey("highway")) {
-                            List<Way> list = map.get(h.get("highway"));
-                            if (list == null) {
-                                map.put(h.get("highway"), list = new ArrayList<Way>());
-                            }
-                            list.add(h);
+        if (w.isUsable() && w.hasKey("highway") && w.hasKey("junction") && w.get("junction").equals("roundabout")) {
+            Map<String, List<Way>> map = new HashMap<String, List<Way>>();
+            // Count all highways (per type) connected to this roundabout
+            // As roundabouts are closed ways, take care of not processing the first/last node twice
+            for (Node n : new HashSet<Node>(w.getNodes())) {
+                for (Way h : Utils.filteredCollection(n.getReferrers(), Way.class)) {
+                    if (h != w && h.hasKey("highway")) {
+                        List<Way> list = map.get(h.get("highway"));
+                        if (list == null) {
+                            map.put(h.get("highway"), list = new ArrayList<Way>());
                         }
+                        list.add(h);
                     }
                 }
-                // The roundabout should carry the highway tag of its two biggest highways
-                for (String s : CLASSIFIED_HIGHWAYS) {
-                    List<Way> list = map.get(s);
-                    if (list != null && list.size() >= 2) {
-                        // Except when a single road is connected, but with two oneway segments
-                        Boolean oneway1 = OsmUtils.getOsmBoolean(list.get(0).get("oneway"));
-                        Boolean oneway2 = OsmUtils.getOsmBoolean(list.get(1).get("oneway"));
-                        if (list.size() > 2 || oneway1 == null || oneway2 == null || !oneway1 || !oneway2) {
-                            // Error when the highway tags do not match
-                            if (!w.get("highway").equals(s)) {
-                                errors.add(new TestError(this, Severity.WARNING, 
-                                        tr("Incorrect roundabout (highway: {0} instead of {1})", w.get("highway"), s), 
-                                        WRONG_ROUNDABOUT_HIGHWAY, w));
-                            }
-                            break;
+            }
+            // The roundabout should carry the highway tag of its two biggest highways
+            for (String s : CLASSIFIED_HIGHWAYS) {
+                List<Way> list = map.get(s);
+                if (list != null && list.size() >= 2) {
+                    // Except when a single road is connected, but with two oneway segments
+                    Boolean oneway1 = OsmUtils.getOsmBoolean(list.get(0).get("oneway"));
+                    Boolean oneway2 = OsmUtils.getOsmBoolean(list.get(1).get("oneway"));
+                    if (list.size() > 2 || oneway1 == null || oneway2 == null || !oneway1 || !oneway2) {
+                        // Error when the highway tags do not match
+                        if (!w.get("highway").equals(s)) {
+                            errors.add(new TestError(this, Severity.WARNING, 
+                                    tr("Incorrect roundabout (highway: {0} instead of {1})", w.get("highway"), s), 
+                                    WRONG_ROUNDABOUT_HIGHWAY, w));
                         }
+                        break;
                     }
                 }