Changeset 2612 in josm for trunk/src/org

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

Files:

• data/coor/LatLon.java (modified) (3 diffs)
• data/osm/Node.java (modified) (2 diffs)
• data/projection/Projection.java (modified) (1 diff)
• gui/conflict/pair/properties/PropertiesMergeModel.java (modified) (1 diff)
• gui/conflict/pair/properties/PropertiesMerger.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/coor/LatLon.java

@@ -2 +2 @@
 package org.openstreetmap.josm.data.coor;
 
+import static java.lang.Math.PI;
+import static java.lang.Math.asin;
+import static java.lang.Math.cos;
+import static java.lang.Math.sin;
+import static java.lang.Math.sqrt;
+import static java.lang.Math.toRadians;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.text.DecimalFormat;
 import java.text.NumberFormat;
-
-import static java.lang.Math.*;
 
 import org.openstreetmap.josm.Main;
@@ -100 +104 @@
      */
     public boolean equalsEpsilon(LatLon other) {
-        final double p = 1/Projection.MAX_SERVER_PRECISION;
+        final double p = Projection.MAX_SERVER_PRECISION;
         return Math.abs(lat()-other.lat()) <= p && Math.abs(lon()-other.lon()) <= p;
     }
@@ -132 +136 @@
         double sinHalfLon = sin(toRadians(other.lon() - this.lon()) / 2);
         double d = 2 * R * asin(
-                            sqrt(sinHalfLat*sinHalfLat + 
-                            cos(toRadians(this.lat()))*cos(toRadians(other.lat()))*sinHalfLon*sinHalfLon));
-        // For points opposite to each other on the sphere, 
+                sqrt(sinHalfLat*sinHalfLat +
+                        cos(toRadians(this.lat()))*cos(toRadians(other.lat()))*sinHalfLon*sinHalfLon));
+        // For points opposite to each other on the sphere,
         // rounding errors could make the argument of asin greater than 1
         // (This should almost never happen.)

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

@@ -136 +136 @@
         NodeData data = new NodeData();
         saveCommonAttributes(data);
-        data.setCoor(getCoor());
+        if (!isIncomplete()) {
+            data.setCoor(getCoor());
+        }
         return data;
     }
@@ -155 +157 @@
             return true;
         else if (coor != null && n.coor != null)
-            return coor.equals(n.coor);
+            return coor.equalsEpsilon(n.coor);
         else
             return false;

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

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

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);