Changeset 2612 in josm for trunk/src/org/openstreetmap/josm/gui/conflict

Timestamp:

2009-12-11T22:52:54+01:00 (14 years ago)

Author:

mjulius

Message:

Fixes #4083 - exception when copying relation with incomplete node
Fixes #4141 - relax conflict detection for coordinates; API only returns 7 decimals

Location:

trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties

Files:

• PropertiesMergeModel.java (modified) (1 diff)
• PropertiesMerger.java (modified) (1 diff)

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

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

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

@@ -31 +31 @@
  */
 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);