Ticket #4141: CoordinateConflictPrecision.patch

src/org/openstreetmap/josm/data/osm/Node.java

@@ -135 +135 @@
     @Override public NodeData save() {
         NodeData data = new NodeData();
         saveCommonAttributes(data);
-        data.setCoor(getCoor());
+        if (!isIncomplete()) {
+            data.setCoor(getCoor());
+        }
         return data;
     }
 
@@ -154 +156 @@
         if (coor == null && n.coor == null)
             return true;
         else if (coor != null && n.coor != null)
-            return coor.equals(n.coor);
+            return coor.equalsEpsilon(n.coor);
         else
             return false;
     }

src/org/openstreetmap/josm/data/projection/Projection.java

@@ -14 +14 @@
 public interface Projection {
     /**
      * Minimum difference in location to not be represented as the same position.
+     * The API returns 7 decimals.
      */
-    public static final double MAX_SERVER_PRECISION = 1e12;
+    public static final double MAX_SERVER_PRECISION = 5e-8;
 
     /**
      * List of all available projections.

src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java

@@ -325 +325 @@
         if (myCoords == null && theirCoords != null) return true;
         if (myCoords != null && theirCoords == null) return true;
         if (myCoords == null && theirCoords == null) return false;
-        return !myCoords.equals(theirCoords);
+        return !myCoords.equalsEpsilon(theirCoords);
     }
 
     /**

src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java

@@ -30 +30 @@
  *
  */
 public class PropertiesMerger extends JPanel implements Observer {
-    private static DecimalFormat COORD_FORMATTER = new DecimalFormat("###0.0000");
+    private static DecimalFormat COORD_FORMATTER = new DecimalFormat("###0.0000000");
 
     public final static Color BGCOLOR_NO_CONFLICT = new Color(234,234,234);
     public final static Color BGCOLOR_UNDECIDED = new Color(255,197,197);