Changeset 18464 in josm for trunk

Timestamp:

2022-06-06T16:04:20+02:00 (23 months ago)

Author:

taylor.smock

Message:

Extract equalsEpsilon from LatLon into ILatLon

This significantly reduces allocations from DataSetMerger#merge.
In testing, it went from ~400 MiB allocations to ~19 MiB allocations.

The allocations largely came from checking if two nodes had equal coordinates.
The code used LatLon#getCoor followed by equalsEpsilon, when all the
required information was already present in Node, but LatLon had the method.

As an additional enhancement, equalsEpsilon was somewhat generified, in that
there is an additional method where we can specify a different precision.

This fixes #22104, see #7159.

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/coor/ILatLon.java (modified) (2 diffs)
• src/org/openstreetmap/josm/data/coor/LatLon.java (modified) (2 diffs)
• src/org/openstreetmap/josm/data/osm/Node.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/osm/NodePositionComparator.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/gui/datatransfer/OsmTransferHandlerTest.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/io/GeoJSONReaderTest.java (modified) (1 diff)

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

@@ -16 +16 @@
  */
 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;
 
     /**
@@ -52 +57 @@
         }
     }
+
+    /**
+     * 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 18464 (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 / precision.
+     * @since 18464 (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;
+    }
 }

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

@@ -46 +46 @@
      * 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
@@ -186 +186 @@
      * @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 18464 (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);
     }
 

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

@@ -293 +293 @@
 
     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;
     }
 

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

@@ -17 +17 @@
     public int compare(Node n1, Node n2) {
 
-        if (n1.getCoor().equalsEpsilon(n2.getCoor()))
+        if (n1.equalsEpsilon(n2))
             return 0;
 

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

@@ -49 +49 @@
 
         transferHandler.pasteOn(target, null);
-        assertTrue(n1.getCoor().equalsEpsilon(ds2.getNodes().iterator().next().getCoor()));
+        assertTrue(n1.equalsEpsilon(ds2.getNodes().iterator().next()));
 
         ds2.clear();
@@ -56 +56 @@
         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()));
     }
 

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

@@ -167 +167 @@
         return (p1 instanceof Node)
             && (p2 instanceof Node)
-            && ((Node) p1).getCoor().equalsEpsilon(((Node) p2).getCoor());
+            && ((Node) p1).equalsEpsilon(((Node) p2));
     }