Index: applications/editors/josm/plugins/importvec/build.xml
===================================================================
--- applications/editors/josm/plugins/importvec/build.xml	(revision 35974)
+++ applications/editors/josm/plugins/importvec/build.xml	(revision 35975)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="Remove the action, add importing SVG to File/Open"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="14960"/>
+    <property name="plugin.main.version" value="18464"/>
 
     <property name="plugin.author" value="Upliner"/>
Index: applications/editors/josm/plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/SvgImportTask.java
===================================================================
--- applications/editors/josm/plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/SvgImportTask.java	(revision 35974)
+++ applications/editors/josm/plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/SvgImportTask.java	(revision 35975)
@@ -21,4 +21,5 @@
 import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.coor.ILatLon;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -136,5 +137,5 @@
                         break;
                     case PathIterator.SEG_CLOSE:
-                        if (currentway.firstNode().getCoor().equalsEpsilon(nodes.getLast().getCoor())) {
+                        if (currentway.firstNode().getCoor().equalsEpsilon(nodes.getLast().getCoor(), ILatLon.MAX_SERVER_PRECISION)) {
                             currentway.removeNode(nodes.removeLast());
                         }
@@ -205,4 +206,4 @@
         }
     }
-    
+
 }
Index: applications/editors/josm/plugins/livegps/build.xml
===================================================================
--- applications/editors/josm/plugins/livegps/build.xml	(revision 35974)
+++ applications/editors/josm/plugins/livegps/build.xml	(revision 35975)
@@ -2,5 +2,5 @@
 <project name="livegps" default="dist" basedir=".">
     <property name="commit.message" value="Changed the constructor signature of the plugin main class"/>
-    <property name="plugin.main.version" value="15502"/>
+    <property name="plugin.main.version" value="18464"/>
 	
     <!-- Configure these properties (replace "..." accordingly).
Index: applications/editors/josm/plugins/livegps/src/livegps/LiveGpsLayer.java
===================================================================
--- applications/editors/josm/plugins/livegps/src/livegps/LiveGpsLayer.java	(revision 35974)
+++ applications/editors/josm/plugins/livegps/src/livegps/LiveGpsLayer.java	(revision 35975)
@@ -13,4 +13,5 @@
 import java.util.Map;
 
+import org.openstreetmap.josm.data.coor.ILatLon;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.gpx.GpxData;
@@ -64,5 +65,5 @@
     void setCurrentPosition(double lat, double lon) {
         LatLon thisPos = new LatLon(lat, lon);
-        if ((lastPos != null) && (thisPos.equalsEpsilon(lastPos)))
+        if (lastPos != null && thisPos.equalsEpsilon(lastPos, ILatLon.MAX_SERVER_PRECISION))
             // no change in position
             // maybe show a "paused" cursor or some such
Index: applications/editors/josm/plugins/opendata/build.xml
===================================================================
--- applications/editors/josm/plugins/opendata/build.xml	(revision 35974)
+++ applications/editors/josm/plugins/opendata/build.xml	(revision 35975)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <project name="opendata" default="dist" basedir=".">
-    <property name="plugin.main.version" value="16838"/>
+    <property name="plugin.main.version" value="18464"/>
     <property name="plugin.author" value="Don-vip"/>
     <property name="plugin.class" value="org.openstreetmap.josm.plugins.opendata.OdPlugin"/>
Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/GeographicReader.java
===================================================================
--- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/GeographicReader.java	(revision 35974)
+++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/GeographicReader.java	(revision 35975)
@@ -6,4 +6,5 @@
 import java.awt.Component;
 import java.awt.GraphicsEnvironment;
+import java.awt.Point;
 import java.io.IOException;
 import java.io.InputStream;
@@ -24,4 +25,5 @@
 import javax.swing.Icon;
 import javax.swing.JOptionPane;
+import javax.xml.crypto.dsig.TransformException;
 
 import org.geotools.geometry.jts.JTS;
@@ -35,5 +37,4 @@
 import org.geotools.util.factory.Hints;
 import org.locationtech.jts.geom.LineString;
-import org.locationtech.jts.geom.Point;
 import org.opengis.geometry.MismatchedDimensionException;
 import org.opengis.referencing.FactoryException;
@@ -43,8 +44,7 @@
 import org.opengis.referencing.crs.ProjectedCRS;
 import org.opengis.referencing.cs.CoordinateSystem;
-import org.opengis.referencing.datum.Datum;
 import org.opengis.referencing.operation.MathTransform;
 import org.opengis.referencing.operation.OperationNotFoundException;
-import org.opengis.referencing.operation.TransformException;
+import org.openstreetmap.josm.data.coor.ILatLon;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -54,4 +54,5 @@
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.projection.datum.Datum;
 import org.openstreetmap.josm.data.validation.tests.DuplicateWay;
 import org.openstreetmap.josm.gui.ExtendedDialog;
@@ -112,5 +113,5 @@
             LatLon ll = new LatLon(p.getY(), p.getX());
             for (Node node : nodes.values()) {
-                if (node.getCoor().equalsEpsilon(ll)) {
+                if (node.getCoor().equalsEpsilon(ll, ILatLon.MAX_SERVER_PRECISION)) {
                     return node;
                 }
Index: applications/editors/josm/plugins/terracer/build.xml
===================================================================
--- applications/editors/josm/plugins/terracer/build.xml	(revision 35974)
+++ applications/editors/josm/plugins/terracer/build.xml	(revision 35975)
@@ -2,5 +2,5 @@
 <project name="terracer" default="dist" basedir=".">
     <property name="commit.message" value="applied #j5760 (patch by robome) - Order of housenumbers not correct"/>
-    <property name="plugin.main.version" value="18207"/>
+    <property name="plugin.main.version" value="18464"/>
     <property name="plugin.author" value="Matt Amos"/>
     <property name="plugin.class" value="org.openstreetmap.josm.plugins.terracer.TerracerPlugin"/>
Index: applications/editors/josm/plugins/terracer/src/org/openstreetmap/josm/plugins/terracer/TerracerAction.java
===================================================================
--- applications/editors/josm/plugins/terracer/src/org/openstreetmap/josm/plugins/terracer/TerracerAction.java	(revision 35974)
+++ applications/editors/josm/plugins/terracer/src/org/openstreetmap/josm/plugins/terracer/TerracerAction.java	(revision 35975)
@@ -32,4 +32,6 @@
 import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.data.UndoRedoHandler;
+import org.openstreetmap.josm.data.coor.ILatLon;
+import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
@@ -217,5 +219,5 @@
             // Don't open the dialog
             try {
-                terraceBuilding(outline, init, street, associatedStreet, 0, null, null, 0, 
+                terraceBuilding(outline, init, street, associatedStreet, 0, null, null, 0,
                         housenumbers, streetname, associatedStreet != null, false, "yes");
             } catch (UserCancelException ex) {
@@ -778,7 +780,8 @@
     private Node interpolateNode(Node a, Node b, double f) {
         Node n = new Node(a.getEastNorth().interpolate(b.getEastNorth(), f));
-        if (n.getCoor().equalsEpsilon(a.getCoor()))
+        LatLon latLon = n.getCoor();
+		if (latLon.equalsEpsilon(a.getCoor(), ILatLon.MAX_SERVER_PRECISION))
             return a;
-        if (n.getCoor().equalsEpsilon(b.getCoor()))
+        if (latLon.equalsEpsilon(b.getCoor(), ILatLon.MAX_SERVER_PRECISION))
             return b;
         return n;
Index: applications/editors/josm/plugins/tracer/build.xml
===================================================================
--- applications/editors/josm/plugins/tracer/build.xml	(revision 35974)
+++ applications/editors/josm/plugins/tracer/build.xml	(revision 35975)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="Tracer plugin can load at runtime"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="14153"/>
+    <property name="plugin.main.version" value="18464"/>
     <property name="plugin.canloadatruntime" value="true"/>
 
Index: applications/editors/josm/plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/ConnectWays.java
===================================================================
--- applications/editors/josm/plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/ConnectWays.java	(revision 35974)
+++ applications/editors/josm/plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/ConnectWays.java	(revision 35975)
@@ -19,4 +19,5 @@
 import org.openstreetmap.josm.command.MoveCommand;
 import org.openstreetmap.josm.command.SequenceCommand;
+import org.openstreetmap.josm.data.coor.ILatLon;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.BBox;
@@ -207,5 +208,6 @@
                 double angle = TracerGeometry.angleOfLines(n1, nn, nn, n2);
                 System.out.println("Angle: " + angle + " distance: " + dist + " Node: " + nod);
-                if (!n1.equalsEpsilon(nn) && !n2.equalsEpsilon(nn) && dist < minDistanceSq){ // && Math.abs(angle) < maxAngle) {
+                if (!n1.equalsEpsilon(nn, ILatLon.MAX_SERVER_PRECISION)
+                 && !n2.equalsEpsilon(nn, ILatLon.MAX_SERVER_PRECISION) && dist < minDistanceSq) { // && Math.abs(angle) < maxAngle) {
                     //maxAngle = angle;
                     nearestNode = nod;
Index: applications/editors/josm/plugins/tracer2/build.xml
===================================================================
--- applications/editors/josm/plugins/tracer2/build.xml	(revision 35974)
+++ applications/editors/josm/plugins/tracer2/build.xml	(revision 35975)
@@ -5,5 +5,5 @@
     <property name="commit.message" value="see #josm11090"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="14153"/>
+    <property name="plugin.main.version" value="18464"/>
 
     <!-- Configure these properties (replace "..." accordingly).
Index: applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/ConnectWays.java
===================================================================
--- applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/ConnectWays.java	(revision 35974)
+++ applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/ConnectWays.java	(revision 35975)
@@ -16,4 +16,5 @@
 import org.openstreetmap.josm.command.MoveCommand;
 import org.openstreetmap.josm.command.SequenceCommand;
+import org.openstreetmap.josm.data.coor.ILatLon;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.BBox;
@@ -29,468 +30,469 @@
 public final class ConnectWays {
 
-    private ConnectWays() {
-        // Hide default constructor for utilities classes
-    }
-
-    // CHECKSTYLE.OFF: SingleSpaceSeparator
-    static double s_dMinDistance     = 0.000006;  // Minimal distance, for objects
-    static double s_dMinDistanceN2N  = 0.0000005; // Minimal distance, when nodes are merged
-    static double s_dMinDistanceN2oW = 0.000001;  // Minimal distance, when node is connected to other way
-    static double s_dMinDistanceN2tW = 0.000001;  // Minimal distance, when other node is connected this way
-    static final double MAX_ANGLE    = 30;        // Minimal angle, when other node is connected this way
-    // CHECKSTYLE.ON: SingleSpaceSeparator
-
-    static Way s_oWay;
-    static Way s_oWayOld;
-    static List<Way> s_oWays;
-    static List<Node> s_oNodes;
-
-    static ServerParam s_oParam;
-    static boolean s_bCtrl;
-    static boolean s_bAlt;
-
-    static boolean s_bAddNewWay;
-
-    private static void calcDistance() {
-        double dTileSize = Double.parseDouble(s_oParam.getTileSize());
-        double dResolution = Double.parseDouble(s_oParam.getResolution());
-        double dMin = dTileSize / dResolution;
-
-        s_dMinDistance = dMin * 30;
-        s_dMinDistanceN2N = dMin * 2.5;
-        s_dMinDistanceN2oW = dMin * 5;
-        s_dMinDistanceN2tW = dMin * 5;
-    }
-
-    private static void getWays(Way way) {
-        BBox bbox = new BBox(way);
-        bbox.addPrimitive(way, s_dMinDistance);
-        s_oWays = MainApplication.getLayerManager().getEditDataSet().searchWays(bbox);
-    }
-
-    private static List<Way> getWaysOfNode(Node node) {
-        List<Way> ways;
-        ways = new LinkedList<>(Utils.filteredCollection(node.getReferrers(), Way.class));
-        return ways;
-    }
-
-    private static void getNodes(Way way) {
-        BBox bbox = new BBox(way);
-        bbox.addPrimitive(way, s_dMinDistance);
-        s_oNodes = MainApplication.getLayerManager().getEditDataSet().searchNodes(bbox);
-    }
-
-    private static double calcAlpha(LatLon oP1, Node n) {
-        LatLon oP2 = n.getCoor();
-
-        double dAlpha = Math.atan((oP2.getY() - oP1.getY()) / (oP2.getX() - oP1.getX())) * 180 / Math.PI + (oP1.getX() > oP2.getX() ? 180 : 0);
-        return checkAlpha(dAlpha);
-    }
-
-    private static Double checkAlpha(Double dAlpha) {
-        if (dAlpha > 180) {
-            return dAlpha - 360;
-        }
-        if (dAlpha <= -180) {
-            return dAlpha + 360;
-        }
-        return dAlpha;
-    }
-
-    private static boolean isNodeInsideWay(LatLon pos, Way way) {
-        List<Node> listNode = way.getNodes();
-
-        double dAlpha;
-        double dAlphaOld = calcAlpha(pos, listNode.get(listNode.size()-1));
-        double dSumAlpha = 0;
-
-        for (Node n : listNode) {
-            dAlpha = calcAlpha(pos, n);
-            dSumAlpha += checkAlpha(dAlpha - dAlphaOld);
-            dAlphaOld = dAlpha;
-        }
-        dSumAlpha = Math.abs(dSumAlpha);
-
-        return dSumAlpha > 359 && dSumAlpha < 361;
-    }
-
-    private static Way getOldWay(LatLon pos) {
-        int i;
-
-        for (i = 0; i < s_oWays.size(); i++) {
-            Way way = s_oWays.get(i);
-            if (!isSameTag(way)) {
-                continue;
-            }
-            if (isNodeInsideWay(pos, way)) {
-                s_oWays.remove(way);
-                return way;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Try connect way to other buildings.
-     * @param way Way to connect.
-     * @return Commands.
-     */
-    public static Command connect(Way newWay, LatLon pos, ServerParam param, boolean ctrl, boolean alt) {
-        LinkedList<Command> cmds = new LinkedList<>();
-        LinkedList<Command> cmds2 = new LinkedList<>();
-
-        s_oParam = param;
-        s_bCtrl = ctrl;
-        s_bAlt = alt;
-
-        boolean bAddWay = false;
-
-        calcDistance();
-        getNodes(newWay);
-        getWays(newWay);
-
-        s_oWayOld = getOldWay(pos);
-
-        if (s_oWayOld == null) {
-            s_bAddNewWay = true;
-            //cmds.add(new AddCommand(newWay));
-            bAddWay = true;
-            s_oWayOld = newWay;
-            s_oWay = new Way(newWay);
-        } else {
-            int i;
-            Way tempWay;
-            s_bAddNewWay = false;
-
-            //Main.main.getCurrentDataSet().setSelected(m_wayOld);
-
-            tempWay = new Way(s_oWayOld);
-
-            for (i = 0; i < newWay.getNodesCount(); i++) {
-                tempWay.addNode(tempWay.getNodesCount(), newWay.getNode(i));
-            }
-            i++;
-            for (i = 0; i < s_oWayOld.getNodesCount() - 1; i++) {
-                tempWay.removeNode(s_oWayOld.getNode(i));
-            }
-            //cmds.add(new ChangeCommand(m_wayOld, tempWay));
-            for (i = 0; i < s_oWayOld.getNodesCount() - 1; i++) {
-                Node n = s_oWayOld.getNode(i);
-                List<Way> ways = getWaysOfNode(n);
-                if (ways.size() <= 1) {
-                    cmds2.add(new DeleteCommand(s_oWayOld.getNode(i)));
-                }
-                s_oNodes.remove(s_oWayOld.getNode(i));
-            }
-            s_oWay = tempWay;
-        }
-
-        cmds2.addAll(connectTo());
-        DataSet ds = MainApplication.getLayerManager().getEditDataSet();
-
-        // add new Node
-        Node firstNode = null;
-        Way way = new Way(s_oWay);
-        for (Node node : s_oWay.getNodes()) {
-            if (node.getDataSet() != null) {
-                way.removeNode(node);
-            }
-        }
-        if (way.getNodes().size() > 0) {
-            if (way.firstNode() != way.lastNode()) {
-                way.addNode(way.firstNode());
-            }
-            for (Node node : way.getNodes()) {
-                if (firstNode == null || firstNode != node) {
-                    cmds.add(new AddCommand(ds, node));
-                }
-                if (firstNode == null) {
-                    firstNode = node;
-                }
-            }
-        }
-
-        // add new way
-        if (bAddWay == true) {
-            cmds.add(new AddCommand(ds, s_oWay));
-        }
-
-        cmds.add(new ChangeCommand(ds, s_oWayOld, trySplitWayByAnyNodes(s_oWay)));
-        cmds.addAll(cmds2);
-
-        TracerDebug oTracerDebug = new TracerDebug();
-        oTracerDebug.OutputCommands(cmds);
-
-        Command cmd = new SequenceCommand(tr("Merge objects nodes"), cmds);
-
-        return cmd;
-    }
-
-
-    /**
-     * Try connect way to other buildings.
-     * @param way Way to connect.
-     * @return Commands.
-     */
-    public static List<Command> connectTo() {
-        Map<Way, Way> modifiedWays = new HashMap<>();
-        LinkedList<Command> cmds = new LinkedList<>();
-        Way way = new Way(s_oWay);
-        for (int i = 0; i < way.getNodesCount() - 1; i++) {
-            Node n = way.getNode(i);
-            System.out.println("-------");
-            System.out.println("Node: " + n);
-            LatLon ll = n.getCoor();
-            //BBox bbox = new BBox(
-            //        ll.getX() - MIN_DISTANCE,
-            //        ll.getY() - MIN_DISTANCE,
-            //        ll.getX() + MIN_DISTANCE,
-            //        ll.getY() + MIN_DISTANCE);
-
-            // bude se node slucovat s jinym?
-            double minDistanceSq = s_dMinDistanceN2N;
-            //List<Node> nodes = Main.main.getCurrentDataSet().searchNodes(bbox);
-            Node nearestNode = null;
-            for (Node nn : s_oNodes) {
-                System.out.println("Node: " + nn);
-                if (!nn.isUsable() || way.containsNode(nn) || s_oWay.containsNode(nn) || !isInSameTag(nn)) {
-                    continue;
-                }
-                double dist = nn.getCoor().distance(ll);
-                if (dist < minDistanceSq) {
-                    minDistanceSq = dist;
-                    nearestNode = nn;
-                }
-            }
-
-            System.out.println("Nearest: " + nearestNode + " distance: " + minDistanceSq);
-            if (nearestNode == null) {
-                tryConnectNodeToAnyWay(n, modifiedWays);
-            } else {
-                System.out.println("+add Node distance: " + minDistanceSq);
-                cmds.addAll(mergeNodes(n, nearestNode));
-            }
-        }
-
-        for (Map.Entry<Way, Way> e : modifiedWays.entrySet()) {
-            cmds.add(new ChangeCommand(e.getKey(), e.getValue()));
-        }
-
-        //cmds.addFirst(new ChangeCommand(way, trySplitWayByAnyNodes(newWay)));
-
-        List<Command> cmd = cmds;
-        return cmd;
-    }
-
-    /**
-     * Merges two nodes
-     * @param n1 First node
-     * @param n2 Second node
-     * @param way Way containing first node
-     * @return List of Commands.
-     */
-    private static List<Command> mergeNodes(Node n1, Node n2) {
-        List<Command> cmds = new LinkedList<>();
-        cmds.add(new MoveCommand(n2,
-                (n1.getEastNorth().getX() - n2.getEastNorth().getX())/2,
-                (n1.getEastNorth().getY() - n2.getEastNorth().getY())/2
-                ));
-
-        Way newWay = new Way(s_oWay);
-
-        int j = s_oWay.getNodes().indexOf(n1);
-        newWay.addNode(j, n2);
-        if (j == 0) {
-            // first + last point
-            newWay.addNode(newWay.getNodesCount(), n2);
-        }
-
-        newWay.removeNode(n1);
-        //       cmds.add(new ChangeCommand(m_way, newWay));
-
-        if (newWay.firstNode() != newWay.lastNode()) {
-            newWay.addNode(newWay.firstNode());
-        }
-        s_oWay = new Way(newWay);
-
-        //cmds.add(new DeleteCommand(n1));
-        return cmds;
-    }
-
-    /**
-     * Try connect node "node" to way of other building.
-     *
-     * Zkusi zjistit, zda node neni tak blizko nejake usecky existujici budovy,
-     * ze by mel byt zacnenen do teto usecky. Pokud ano, provede to.
-     *
-     * @param node Node to connect.
-     * @return List of Commands.
-     */
-    private static void tryConnectNodeToAnyWay(Node node, Map<Way, Way> m)
-            throws IllegalStateException, IndexOutOfBoundsException {
-
-        //List<Command> cmds = new LinkedList<Command>();
-
-        LatLon ll = node.getCoor();
-        //BBox bbox = new BBox(
-        //        ll.getX() - MIN_DISTANCE_TW,
-        //        ll.getY() - MIN_DISTANCE_TW,
-        //        ll.getX() + MIN_DISTANCE_TW,
-        //        ll.getY() + MIN_DISTANCE_TW);
-
-        // node nebyl slouceny s jinym
-        // hledani pripadne blizke usecky, kam bod pridat
-        //List<Way> ways = Main.main.getCurrentDataSet().searchWays(bbox);
-        double minDist = Double.MAX_VALUE;
-        Way nearestWay = null;
-        int nearestNodeIndex = 0;
-        for (Way ww : s_oWays) {
-            System.out.println("Way: " + ww);
-            if (!ww.isUsable() || ww.containsNode(node) || !isSameTag(ww)) {
-                continue;
-            }
-
-            if (m.get(ww) != null) {
-                ww = m.get(ww);
-            }
-
-            for (Pair<Node, Node> np : ww.getNodePairs(false)) {
-                //double dist1 = TracerGeometry.distanceFromSegment(ll, np.a.getCoor(), np.b.getCoor());
-                double dist = distanceFromSegment2(ll, np.a.getCoor(), np.b.getCoor());
-                //System.out.println(" distance: " + dist1 + "  " + dist);
-
-                if (dist < minDist) {
-                    minDist = dist;
-                    nearestWay = ww;
-                    nearestNodeIndex = ww.getNodes().indexOf(np.a);
-                }
-            }
-        }
-        System.out.println("Nearest way: " + nearestWay + " distance: " + minDist);
-        if (minDist < s_dMinDistanceN2oW) {
-            Way newNWay = new Way(nearestWay);
-
-            newNWay.addNode(nearestNodeIndex + 1, node);
-            System.out.println("New way:" + newNWay);
-            System.out.println("+add WayOld.Node distance: " + minDist);
-            m.put(nearestWay, newNWay);
-            s_oWays.remove(newNWay);
-            s_oWays.add(nearestWay);
-        }
-    }
-
-    private static double distanceFromSegment2(LatLon c, LatLon a, LatLon b) {
-        double x;
-        double y;
-
-        StraightLine oStraightLine1 = new StraightLine(
-                new Point2D.Double(a.getX(), a.getY()),
-                new Point2D.Double(b.getX(), b.getY()));
-        StraightLine oStraightLine2 = new StraightLine(
-                new Point2D.Double(c.getX(), c.getY()),
-                new Point2D.Double(c.getX() + (a.getY()-b.getY()), c.getY() - (a.getX()-b.getX())));
-        Point2D.Double oPoint = oStraightLine1.GetIntersectionPoint(oStraightLine2);
-
-        if ((oPoint.x > a.getX() && oPoint.x > b.getX()) || (oPoint.x < a.getX() && oPoint.x < b.getX()) ||
-                (oPoint.y > a.getY() && oPoint.y > b.getY()) || (oPoint.y < a.getY() && oPoint.y < b.getY())) {
-            return 100000;
-        }
-
-        x = c.getX()-oPoint.getX();
-        y = c.getY()-oPoint.getY();
-
-        return Math.sqrt((x*x)+(y*y));
-    }
-
-    /**
-     * Try split way by any existing building nodes.
-     *
-     * Zkusi zjistit zda nejake usecka z way by nemela prochazet nejakym existujicim bodem,
-     * ktery je ji velmi blizko. Pokud ano, tak puvodni usecku rozdeli na dve tak, aby
-     * prochazela takovym bodem.
-     *
-     * @param way Way to split.
-     * @return Modified way
-     */
-    private static Way trySplitWayByAnyNodes(Way way)
-            throws IndexOutOfBoundsException, IllegalStateException {
-
-        // projdi kazdou novou usecku a zjisti, zda by nemela vest pres existujici body
-        int i = 0;
-        while (i < way.getNodesCount()) {
-            // usecka n1, n2
-            LatLon n1 = way.getNodes().get(i).getCoor();
-            LatLon n2 = way.getNodes().get((i + 1) % way.getNodesCount()).getCoor();
-            System.out.println(way.getNodes().get(i) + "-----" + way.getNodes().get((i + 1) % way.getNodesCount()));
-            double minDistanceSq = Double.MAX_VALUE;
-            //            double maxAngle = MAX_ANGLE;
-            //List<Node> nodes = Main.main.getCurrentDataSet().searchNodes(new BBox(
-            //    Math.min(n1.getX(), n2.getX()) - minDistanceSq,
-            //    Math.min(n1.getY(), n2.getY()) - minDistanceSq,
-            //    Math.max(n1.getX(), n2.getX()) + minDistanceSq,
-            //    Math.max(n1.getY(), n2.getY()) + minDistanceSq
-            //));
-
-            Node nearestNode = null;
-            for (Node nod : s_oNodes) {
-                if (!nod.isUsable() || way.containsNode(nod) || !isInSameTag(nod)) {
-                    continue;
-                }
-                LatLon nn = nod.getCoor();
-                //double dist = TracerGeometry.distanceFromSegment(nn, n1, n2);
-                double dist = distanceFromSegment2(nn, n1, n2);
-                //                double angle = TracerGeometry.angleOfLines(n1, nn, nn, n2);
-                //System.out.println("Angle: " + angle + " distance: " + dist + " Node: " + nod);
-                if (!n1.equalsEpsilon(nn) && !n2.equalsEpsilon(nn) && dist < minDistanceSq) { // && Math.abs(angle) < maxAngle) {
-                    minDistanceSq = dist;
-                    //                    maxAngle = angle;
-                    nearestNode = nod;
-                }
-            }
-            System.out.println("Nearest_: " + nearestNode + " distance: " + minDistanceSq);
-            if (nearestNode == null || minDistanceSq >= s_dMinDistanceN2tW) {
-                // tato usecka se nerozdeli
-                i++;
-                System.out.println("");
-                continue;
-            } else {
-                // rozdeleni usecky
-                way.addNode(i + 1, nearestNode);
-                i++;
-                System.out.println("+add Way.Node distance: " + minDistanceSq);
-                System.out.println("");
-                //i++;
-                continue; // i nezvetsuji, treba bude treba rozdelit usecku znovu
-            }
-        }
-        return way;
-    }
-
-    private static boolean isInSameTag(Node n) {
-        for (OsmPrimitive op : n.getReferrers()) {
-            if (op instanceof Way) {
-                if (isSameTag(op)) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Determines if the specified primitive denotes a building.
-     * @param p The primitive to be tested
-     * @return True if building key is set and different from no,entrance
-     */
-    protected static boolean isSameTag(OsmPrimitive p) {
-        String v = p.get(s_oParam.getTag());
-        if (s_bCtrl || s_oParam.getTag().equals("")) {
-            return v == null || v.equals("no");
-        }
-        if (s_oParam.getTag().equals("building")) {
-            return v != null && !v.equals("no") && !v.equals("entrance");
-        }
-        return v != null && !v.equals("no");
-    }
+	private ConnectWays() {
+		// Hide default constructor for utilities classes
+	}
+
+	// CHECKSTYLE.OFF: SingleSpaceSeparator
+	static double s_dMinDistance     = 0.000006;  // Minimal distance, for objects
+	static double s_dMinDistanceN2N  = 0.0000005; // Minimal distance, when nodes are merged
+	static double s_dMinDistanceN2oW = 0.000001;  // Minimal distance, when node is connected to other way
+	static double s_dMinDistanceN2tW = 0.000001;  // Minimal distance, when other node is connected this way
+	static final double MAX_ANGLE    = 30;        // Minimal angle, when other node is connected this way
+	// CHECKSTYLE.ON: SingleSpaceSeparator
+
+	static Way s_oWay;
+	static Way s_oWayOld;
+	static List<Way> s_oWays;
+	static List<Node> s_oNodes;
+
+	static ServerParam s_oParam;
+	static boolean s_bCtrl;
+	static boolean s_bAlt;
+
+	static boolean s_bAddNewWay;
+
+	private static void calcDistance() {
+		double dTileSize = Double.parseDouble(s_oParam.getTileSize());
+		double dResolution = Double.parseDouble(s_oParam.getResolution());
+		double dMin = dTileSize / dResolution;
+
+		s_dMinDistance = dMin * 30;
+		s_dMinDistanceN2N = dMin * 2.5;
+		s_dMinDistanceN2oW = dMin * 5;
+		s_dMinDistanceN2tW = dMin * 5;
+	}
+
+	private static void getWays(Way way) {
+		BBox bbox = new BBox(way);
+		bbox.addPrimitive(way, s_dMinDistance);
+		s_oWays = MainApplication.getLayerManager().getEditDataSet().searchWays(bbox);
+	}
+
+	private static List<Way> getWaysOfNode(Node node) {
+		List<Way> ways;
+		ways = new LinkedList<>(Utils.filteredCollection(node.getReferrers(), Way.class));
+		return ways;
+	}
+
+	private static void getNodes(Way way) {
+		BBox bbox = new BBox(way);
+		bbox.addPrimitive(way, s_dMinDistance);
+		s_oNodes = MainApplication.getLayerManager().getEditDataSet().searchNodes(bbox);
+	}
+
+	private static double calcAlpha(LatLon oP1, Node n) {
+		LatLon oP2 = n.getCoor();
+
+		double dAlpha = Math.atan((oP2.getY() - oP1.getY()) / (oP2.getX() - oP1.getX())) * 180 / Math.PI + (oP1.getX() > oP2.getX() ? 180 : 0);
+		return checkAlpha(dAlpha);
+	}
+
+	private static Double checkAlpha(Double dAlpha) {
+		if (dAlpha > 180) {
+			return dAlpha - 360;
+		}
+		if (dAlpha <= -180) {
+			return dAlpha + 360;
+		}
+		return dAlpha;
+	}
+
+	private static boolean isNodeInsideWay(LatLon pos, Way way) {
+		List<Node> listNode = way.getNodes();
+
+		double dAlpha;
+		double dAlphaOld = calcAlpha(pos, listNode.get(listNode.size()-1));
+		double dSumAlpha = 0;
+
+		for (Node n : listNode) {
+			dAlpha = calcAlpha(pos, n);
+			dSumAlpha += checkAlpha(dAlpha - dAlphaOld);
+			dAlphaOld = dAlpha;
+		}
+		dSumAlpha = Math.abs(dSumAlpha);
+
+		return dSumAlpha > 359 && dSumAlpha < 361;
+	}
+
+	private static Way getOldWay(LatLon pos) {
+		int i;
+
+		for (i = 0; i < s_oWays.size(); i++) {
+			Way way = s_oWays.get(i);
+			if (!isSameTag(way)) {
+				continue;
+			}
+			if (isNodeInsideWay(pos, way)) {
+				s_oWays.remove(way);
+				return way;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Try connect way to other buildings.
+	 * @param way Way to connect.
+	 * @return Commands.
+	 */
+	public static Command connect(Way newWay, LatLon pos, ServerParam param, boolean ctrl, boolean alt) {
+		LinkedList<Command> cmds = new LinkedList<>();
+		LinkedList<Command> cmds2 = new LinkedList<>();
+
+		s_oParam = param;
+		s_bCtrl = ctrl;
+		s_bAlt = alt;
+
+		boolean bAddWay = false;
+
+		calcDistance();
+		getNodes(newWay);
+		getWays(newWay);
+
+		s_oWayOld = getOldWay(pos);
+
+		if (s_oWayOld == null) {
+			s_bAddNewWay = true;
+			//cmds.add(new AddCommand(newWay));
+			bAddWay = true;
+			s_oWayOld = newWay;
+			s_oWay = new Way(newWay);
+		} else {
+			int i;
+			Way tempWay;
+			s_bAddNewWay = false;
+
+			//Main.main.getCurrentDataSet().setSelected(m_wayOld);
+
+			tempWay = new Way(s_oWayOld);
+
+			for (i = 0; i < newWay.getNodesCount(); i++) {
+				tempWay.addNode(tempWay.getNodesCount(), newWay.getNode(i));
+			}
+			i++;
+			for (i = 0; i < s_oWayOld.getNodesCount() - 1; i++) {
+				tempWay.removeNode(s_oWayOld.getNode(i));
+			}
+			//cmds.add(new ChangeCommand(m_wayOld, tempWay));
+			for (i = 0; i < s_oWayOld.getNodesCount() - 1; i++) {
+				Node n = s_oWayOld.getNode(i);
+				List<Way> ways = getWaysOfNode(n);
+				if (ways.size() <= 1) {
+					cmds2.add(new DeleteCommand(s_oWayOld.getNode(i)));
+				}
+				s_oNodes.remove(s_oWayOld.getNode(i));
+			}
+			s_oWay = tempWay;
+		}
+
+		cmds2.addAll(connectTo());
+		DataSet ds = MainApplication.getLayerManager().getEditDataSet();
+
+		// add new Node
+		Node firstNode = null;
+		Way way = new Way(s_oWay);
+		for (Node node : s_oWay.getNodes()) {
+			if (node.getDataSet() != null) {
+				way.removeNode(node);
+			}
+		}
+		if (way.getNodes().size() > 0) {
+			if (way.firstNode() != way.lastNode()) {
+				way.addNode(way.firstNode());
+			}
+			for (Node node : way.getNodes()) {
+				if (firstNode == null || firstNode != node) {
+					cmds.add(new AddCommand(ds, node));
+				}
+				if (firstNode == null) {
+					firstNode = node;
+				}
+			}
+		}
+
+		// add new way
+		if (bAddWay == true) {
+			cmds.add(new AddCommand(ds, s_oWay));
+		}
+
+		cmds.add(new ChangeCommand(ds, s_oWayOld, trySplitWayByAnyNodes(s_oWay)));
+		cmds.addAll(cmds2);
+
+		TracerDebug oTracerDebug = new TracerDebug();
+		oTracerDebug.OutputCommands(cmds);
+
+		Command cmd = new SequenceCommand(tr("Merge objects nodes"), cmds);
+
+		return cmd;
+	}
+
+
+	/**
+	 * Try connect way to other buildings.
+	 * @param way Way to connect.
+	 * @return Commands.
+	 */
+	public static List<Command> connectTo() {
+		Map<Way, Way> modifiedWays = new HashMap<>();
+		LinkedList<Command> cmds = new LinkedList<>();
+		Way way = new Way(s_oWay);
+		for (int i = 0; i < way.getNodesCount() - 1; i++) {
+			Node n = way.getNode(i);
+			System.out.println("-------");
+			System.out.println("Node: " + n);
+			LatLon ll = n.getCoor();
+			//BBox bbox = new BBox(
+			//        ll.getX() - MIN_DISTANCE,
+			//        ll.getY() - MIN_DISTANCE,
+			//        ll.getX() + MIN_DISTANCE,
+			//        ll.getY() + MIN_DISTANCE);
+
+			// bude se node slucovat s jinym?
+			double minDistanceSq = s_dMinDistanceN2N;
+			//List<Node> nodes = Main.main.getCurrentDataSet().searchNodes(bbox);
+			Node nearestNode = null;
+			for (Node nn : s_oNodes) {
+				System.out.println("Node: " + nn);
+				if (!nn.isUsable() || way.containsNode(nn) || s_oWay.containsNode(nn) || !isInSameTag(nn)) {
+					continue;
+				}
+				double dist = nn.getCoor().distance(ll);
+				if (dist < minDistanceSq) {
+					minDistanceSq = dist;
+					nearestNode = nn;
+				}
+			}
+
+			System.out.println("Nearest: " + nearestNode + " distance: " + minDistanceSq);
+			if (nearestNode == null) {
+				tryConnectNodeToAnyWay(n, modifiedWays);
+			} else {
+				System.out.println("+add Node distance: " + minDistanceSq);
+				cmds.addAll(mergeNodes(n, nearestNode));
+			}
+		}
+
+		for (Map.Entry<Way, Way> e : modifiedWays.entrySet()) {
+			cmds.add(new ChangeCommand(e.getKey(), e.getValue()));
+		}
+
+		//cmds.addFirst(new ChangeCommand(way, trySplitWayByAnyNodes(newWay)));
+
+		List<Command> cmd = cmds;
+		return cmd;
+	}
+
+	/**
+	 * Merges two nodes
+	 * @param n1 First node
+	 * @param n2 Second node
+	 * @param way Way containing first node
+	 * @return List of Commands.
+	 */
+	private static List<Command> mergeNodes(Node n1, Node n2) {
+		List<Command> cmds = new LinkedList<>();
+		cmds.add(new MoveCommand(n2,
+				(n1.getEastNorth().getX() - n2.getEastNorth().getX())/2,
+				(n1.getEastNorth().getY() - n2.getEastNorth().getY())/2
+				));
+
+		Way newWay = new Way(s_oWay);
+
+		int j = s_oWay.getNodes().indexOf(n1);
+		newWay.addNode(j, n2);
+		if (j == 0) {
+			// first + last point
+			newWay.addNode(newWay.getNodesCount(), n2);
+		}
+
+		newWay.removeNode(n1);
+		//       cmds.add(new ChangeCommand(m_way, newWay));
+
+		if (newWay.firstNode() != newWay.lastNode()) {
+			newWay.addNode(newWay.firstNode());
+		}
+		s_oWay = new Way(newWay);
+
+		//cmds.add(new DeleteCommand(n1));
+		return cmds;
+	}
+
+	/**
+	 * Try connect node "node" to way of other building.
+	 *
+	 * Zkusi zjistit, zda node neni tak blizko nejake usecky existujici budovy,
+	 * ze by mel byt zacnenen do teto usecky. Pokud ano, provede to.
+	 *
+	 * @param node Node to connect.
+	 * @return List of Commands.
+	 */
+	private static void tryConnectNodeToAnyWay(Node node, Map<Way, Way> m)
+			throws IllegalStateException, IndexOutOfBoundsException {
+
+		//List<Command> cmds = new LinkedList<Command>();
+
+		LatLon ll = node.getCoor();
+		//BBox bbox = new BBox(
+		//        ll.getX() - MIN_DISTANCE_TW,
+		//        ll.getY() - MIN_DISTANCE_TW,
+		//        ll.getX() + MIN_DISTANCE_TW,
+		//        ll.getY() + MIN_DISTANCE_TW);
+
+		// node nebyl slouceny s jinym
+		// hledani pripadne blizke usecky, kam bod pridat
+		//List<Way> ways = Main.main.getCurrentDataSet().searchWays(bbox);
+		double minDist = Double.MAX_VALUE;
+		Way nearestWay = null;
+		int nearestNodeIndex = 0;
+		for (Way ww : s_oWays) {
+			System.out.println("Way: " + ww);
+			if (!ww.isUsable() || ww.containsNode(node) || !isSameTag(ww)) {
+				continue;
+			}
+
+			if (m.get(ww) != null) {
+				ww = m.get(ww);
+			}
+
+			for (Pair<Node, Node> np : ww.getNodePairs(false)) {
+				//double dist1 = TracerGeometry.distanceFromSegment(ll, np.a.getCoor(), np.b.getCoor());
+				double dist = distanceFromSegment2(ll, np.a.getCoor(), np.b.getCoor());
+				//System.out.println(" distance: " + dist1 + "  " + dist);
+
+				if (dist < minDist) {
+					minDist = dist;
+					nearestWay = ww;
+					nearestNodeIndex = ww.getNodes().indexOf(np.a);
+				}
+			}
+		}
+		System.out.println("Nearest way: " + nearestWay + " distance: " + minDist);
+		if (minDist < s_dMinDistanceN2oW) {
+			Way newNWay = new Way(nearestWay);
+
+			newNWay.addNode(nearestNodeIndex + 1, node);
+			System.out.println("New way:" + newNWay);
+			System.out.println("+add WayOld.Node distance: " + minDist);
+			m.put(nearestWay, newNWay);
+			s_oWays.remove(newNWay);
+			s_oWays.add(nearestWay);
+		}
+	}
+
+	private static double distanceFromSegment2(LatLon c, LatLon a, LatLon b) {
+		double x;
+		double y;
+
+		StraightLine oStraightLine1 = new StraightLine(
+				new Point2D.Double(a.getX(), a.getY()),
+				new Point2D.Double(b.getX(), b.getY()));
+		StraightLine oStraightLine2 = new StraightLine(
+				new Point2D.Double(c.getX(), c.getY()),
+				new Point2D.Double(c.getX() + (a.getY()-b.getY()), c.getY() - (a.getX()-b.getX())));
+		Point2D.Double oPoint = oStraightLine1.GetIntersectionPoint(oStraightLine2);
+
+		if ((oPoint.x > a.getX() && oPoint.x > b.getX()) || (oPoint.x < a.getX() && oPoint.x < b.getX()) ||
+				(oPoint.y > a.getY() && oPoint.y > b.getY()) || (oPoint.y < a.getY() && oPoint.y < b.getY())) {
+			return 100000;
+		}
+
+		x = c.getX()-oPoint.getX();
+		y = c.getY()-oPoint.getY();
+
+		return Math.sqrt((x*x)+(y*y));
+	}
+
+	/**
+	 * Try split way by any existing building nodes.
+	 *
+	 * Zkusi zjistit zda nejake usecka z way by nemela prochazet nejakym existujicim bodem,
+	 * ktery je ji velmi blizko. Pokud ano, tak puvodni usecku rozdeli na dve tak, aby
+	 * prochazela takovym bodem.
+	 *
+	 * @param way Way to split.
+	 * @return Modified way
+	 */
+	private static Way trySplitWayByAnyNodes(Way way)
+			throws IndexOutOfBoundsException, IllegalStateException {
+
+		// projdi kazdou novou usecku a zjisti, zda by nemela vest pres existujici body
+		int i = 0;
+		while (i < way.getNodesCount()) {
+			// usecka n1, n2
+			LatLon n1 = way.getNodes().get(i).getCoor();
+			LatLon n2 = way.getNodes().get((i + 1) % way.getNodesCount()).getCoor();
+			System.out.println(way.getNodes().get(i) + "-----" + way.getNodes().get((i + 1) % way.getNodesCount()));
+			double minDistanceSq = Double.MAX_VALUE;
+			//            double maxAngle = MAX_ANGLE;
+			//List<Node> nodes = Main.main.getCurrentDataSet().searchNodes(new BBox(
+			//    Math.min(n1.getX(), n2.getX()) - minDistanceSq,
+			//    Math.min(n1.getY(), n2.getY()) - minDistanceSq,
+			//    Math.max(n1.getX(), n2.getX()) + minDistanceSq,
+			//    Math.max(n1.getY(), n2.getY()) + minDistanceSq
+			//));
+
+			Node nearestNode = null;
+			for (Node nod : s_oNodes) {
+				if (!nod.isUsable() || way.containsNode(nod) || !isInSameTag(nod)) {
+					continue;
+				}
+				LatLon nn = nod.getCoor();
+				//double dist = TracerGeometry.distanceFromSegment(nn, n1, n2);
+				double dist = distanceFromSegment2(nn, n1, n2);
+				//                double angle = TracerGeometry.angleOfLines(n1, nn, nn, n2);
+				//System.out.println("Angle: " + angle + " distance: " + dist + " Node: " + nod);
+				if (!n1.equalsEpsilon(nn, ILatLon.MAX_SERVER_PRECISION)
+				 && !n2.equalsEpsilon(nn, ILatLon.MAX_SERVER_PRECISION) && dist < minDistanceSq) { // && Math.abs(angle) < maxAngle) {
+					minDistanceSq = dist;
+					//                    maxAngle = angle;
+					nearestNode = nod;
+				}
+			}
+			System.out.println("Nearest_: " + nearestNode + " distance: " + minDistanceSq);
+			if (nearestNode == null || minDistanceSq >= s_dMinDistanceN2tW) {
+				// tato usecka se nerozdeli
+				i++;
+				System.out.println("");
+				continue;
+			} else {
+				// rozdeleni usecky
+				way.addNode(i + 1, nearestNode);
+				i++;
+				System.out.println("+add Way.Node distance: " + minDistanceSq);
+				System.out.println("");
+				//i++;
+				continue; // i nezvetsuji, treba bude treba rozdelit usecku znovu
+			}
+		}
+		return way;
+	}
+
+	private static boolean isInSameTag(Node n) {
+		for (OsmPrimitive op : n.getReferrers()) {
+			if (op instanceof Way) {
+				if (isSameTag(op)) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Determines if the specified primitive denotes a building.
+	 * @param p The primitive to be tested
+	 * @return True if building key is set and different from no,entrance
+	 */
+	protected static boolean isSameTag(OsmPrimitive p) {
+		String v = p.get(s_oParam.getTag());
+		if (s_bCtrl || s_oParam.getTag().equals("")) {
+			return v == null || v.equals("no");
+		}
+		if (s_oParam.getTag().equals("building")) {
+			return v != null && !v.equals("no") && !v.equals("entrance");
+		}
+		return v != null && !v.equals("no");
+	}
 
 }