Ticket #22104: 22104.patch

src/org/openstreetmap/josm/data/coor/ILatLon.java

@@ -15 +15 @@
  * @since 12161
  */
 public interface ILatLon {
+    /**
+     * Minimum difference in location to not be represented as the same position.
+     * The API returns 7 decimals.
+     */
+    double MAX_SERVER_PRECISION = 1e-7;
 
     /**
      * Returns the longitude, i.e., the east-west position in degrees.
@@ -51 +56 @@
             return projecting.latlon2eastNorth(this);
         }
     }
+
+    /**
+     * Determines if the other point has almost the same lat/lon values.
+     * @param other other lat/lon
+     * @return <code>true</code> if the other point has almost the same lat/lon
+     * values, only differing by no more than 1 / {@link #MAX_SERVER_PRECISION MAX_SERVER_PRECISION}.
+     * @since xxx (extracted from {@link LatLon})
+     */
+    default boolean equalsEpsilon(ILatLon other) {
+        return equalsEpsilon(other, MAX_SERVER_PRECISION);
+    }
+
+    /**
+     * Determines if the other point has almost the same lat/lon values.
+     * @param other other lat/lon
+     * @param precision The precision to use
+     * @return <code>true</code> if the other point has almost the same lat/lon
+     * values, only differing by no more than 1 / {@link #MAX_SERVER_PRECISION MAX_SERVER_PRECISION}.
+     * @since xxx (extracted from {@link LatLon})
+     */
+    default boolean equalsEpsilon(ILatLon other, double precision) {
+        double p = precision / 2;
+        return Math.abs(lat()-other.lat()) <= p && Math.abs(lon()-other.lon()) <= p;
+    }
 }

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

@@ -45 +45 @@
      * Minimum difference in location to not be represented as the same position.
      * The API returns 7 decimals.
      */
-    public static final double MAX_SERVER_PRECISION = 1e-7;
+    public static final double MAX_SERVER_PRECISION = ILatLon.MAX_SERVER_PRECISION;
     /**
      * The inverse of the server precision
      * @see #MAX_SERVER_PRECISION
@@ -185 +185 @@
      * @param other other lat/lon
      * @return <code>true</code> if the other point has almost the same lat/lon
      * values, only differing by no more than 1 / {@link #MAX_SERVER_PRECISION MAX_SERVER_PRECISION}.
+     * @deprecated since xxx (use {@link ILatLon#equalsEpsilon(ILatLon)} instead)
      */
+    @Deprecated
     public boolean equalsEpsilon(LatLon other) {
-        double p = MAX_SERVER_PRECISION / 2;
-        return Math.abs(lat()-other.lat()) <= p && Math.abs(lon()-other.lon()) <= p;
+        return ILatLon.super.equalsEpsilon(other);
     }
 
     /**

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

@@ -292 +292 @@
     }
 
     private boolean hasEqualCoordinates(Node other) {
-        final LatLon c1 = getCoor();
-        final LatLon c2 = other.getCoor();
-        return (c1 == null && c2 == null) || (c1 != null && c2 != null && c1.equalsEpsilon(c2));
+        if (this.isLatLonKnown() && other.isLatLonKnown()) {
+            return this.equalsEpsilon(other);
+        }
+        return false;
     }
 
     @Override

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

@@ -16 +16 @@
     @Override
     public int compare(Node n1, Node n2) {
 
-        if (n1.getCoor().equalsEpsilon(n2.getCoor()))
+        if (n1.equalsEpsilon(n2))
             return 0;
 
         int dLat = Double.compare(n1.lat(), n2.lat());

test/unit/org/openstreetmap/josm/gui/datatransfer/OsmTransferHandlerTest.java

@@ -41 +41 @@
         OsmDataLayer target = new OsmDataLayer(ds2, "target", null);
 
         transferHandler.pasteOn(target, null);
-        assertTrue(n1.getCoor().equalsEpsilon(ds2.getNodes().iterator().next().getCoor()));
+        assertTrue(n1.equalsEpsilon(ds2.getNodes().iterator().next()));
 
         ds2.clear();
         assertTrue(ds2.getNodes().isEmpty());
 
         LatLon pos = new LatLon(55, -5);
         transferHandler.pasteOn(target, ProjectionRegistry.getProjection().latlon2eastNorth(pos));
-        assertTrue(pos.equalsEpsilon(ds2.getNodes().iterator().next().getCoor()));
+        assertTrue(pos.equalsEpsilon(ds2.getNodes().iterator().next()));
     }
 
     /**

test/unit/org/openstreetmap/josm/io/GeoJSONReaderTest.java

@@ -166 +166 @@
     private static boolean areEqualNodes(final OsmPrimitive p1, final OsmPrimitive p2) {
         return (p1 instanceof Node)
             && (p2 instanceof Node)
-            && ((Node) p1).getCoor().equalsEpsilon(((Node) p2).getCoor());
+            && ((Node) p1).equalsEpsilon(((Node) p2));
     }
 
     private static boolean areEqualWays(final OsmPrimitive p1, final OsmPrimitive p2) {