Changeset 18464 in josm for trunk/test/unit

Timestamp:

2022-06-06T16:04:20+02:00 (3 years 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/test/unit/org/openstreetmap/josm

Files:

• gui/datatransfer/OsmTransferHandlerTest.java (modified) (2 diffs)
• io/GeoJSONReaderTest.java (modified) (1 diff)

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