Ticket #6102: UnconnectedWays.diff

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

@@ -59 +59 @@
      */
     public UnconnectedWays() {
         super(tr("Unconnected ways."),
-              tr("This test checks if a way has an endpoint very near to another way."));
+                tr("This test checks if a way has an endpoint very near to another way."));
     }
 
     @Override
@@ -70 +70 @@
         endnodes_highway = new HashSet<Node>();
         middlenodes = new HashSet<Node>();
         othernodes = new HashSet<Node>();
-        mindist = Main.pref.getDouble(PREFIX + ".node_way_distance", 10.0)/6378135.0;
-        minmiddledist = Main.pref.getDouble(PREFIX + ".way_way_distance", 0.0)/6378135.0;
+        mindist = Main.pref.getDouble(PREFIX + ".node_way_distance", 10.0);
+        minmiddledist = Main.pref.getDouble(PREFIX + ".way_way_distance", 0.0);
         this.ds = Main.main.getCurrentDataSet();
         this.ds_area = ds.getDataSourceArea();
     }
@@ -98 +98 @@
                         continue;
                     }
                     if ("turning_circle".equals(en.get("highway"))
-                        || "bus_stop".equals(en.get("highway"))
-                        || "buffer_stop".equals(en.get("railway"))
-                        || OsmUtils.isTrue(en.get("noexit"))
-                        || en.hasKey("barrier")) {
+                            || "bus_stop".equals(en.get("highway"))
+                            || "buffer_stop".equals(en.get("railway"))
+                            || OsmUtils.isTrue(en.get("noexit"))
+                            || en.hasKey("barrier")) {
                         continue;
                     }
                     // There's a small false-positive here.  Imagine an intersection
@@ -203 +203 @@
             this.highway = (highway != null || railway != null) && !isAbandoned;
             this.isBoundary = !this.highway && "administrative".equals(w.get("boundary"));
             line = new Line2D.Double(n1.getEastNorth().east(), n1.getEastNorth().north(),
-                                     n2.getEastNorth().east(), n2.getEastNorth().north());
+                    n2.getEastNorth().east(), n2.getEastNorth().north());
             len = line.getP1().distance(line.getP2());
             this.n1 = n1;
             this.n2 = n2;
@@ -295 +295 @@
 
             for (Node n : found_nodes) {
                 if (!nearby(n, dist) ||
-                     (ds_area != null && !ds_area.contains(n.getCoor()))) {
+                        (ds_area != null && !ds_area.contains(n.getCoor()))) {
                     continue;
                 }
                 // It is actually very rare for us to find a node
@@ -315 +315 @@
 
         public boolean isArea() {
             return w.hasKey("landuse")
-                || w.hasKey("leisure")
-                || w.hasKey("amenity")
-                || w.hasKey("building");
+            || w.hasKey("leisure")
+            || w.hasKey("amenity")
+            || w.hasKey("building");
         }
     }
 
     List<MyWaySegment> getWaySegments(Way w) {
         List<MyWaySegment> ret = new ArrayList<MyWaySegment>();
         if (!w.isUsable()
-            || w.hasKey("barrier")
-            || "cliff".equals(w.get("natural")))
+                || w.hasKey("barrier")
+                || "cliff".equals(w.get("natural")))
             return ret;
 
         int size = w.getNodesCount();