Changeset 18494 in josm for trunk/src/org/openstreetmap/josm/io/session/SessionReader.java

Timestamp:

2022-06-15T19:27:05+02:00 (4 years ago)

Author:

taylor.smock

Message:

Fix #22115: Extract methods from LatLon into ILatLon where they are generally applicable

This also removes calls to Node#getCoor where possible, which reduces
the number of memory allocations in SearchCompiler#match, and overall
allocations due to Node#getCoor

File:

• trunk/src/org/openstreetmap/josm/io/session/SessionReader.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/io/session/SessionReader.java

@@ -37 +37 @@
 import org.openstreetmap.josm.data.ViewportData;
 import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.coor.ILatLon;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.projection.Projection;
@@ -144 +145 @@
             // not too small to avoid rounding errors.
             double dist = 0.01 * proj.getDefaultZoomInPPD();
-            LatLon ll1 = proj.eastNorth2latlon(new EastNorth(centerEN.east() - dist, centerEN.north()));
-            LatLon ll2 = proj.eastNorth2latlon(new EastNorth(centerEN.east() + dist, centerEN.north()));
+            ILatLon ll1 = proj.eastNorth2latlon(new EastNorth(centerEN.east() - dist, centerEN.north()));
+            ILatLon ll2 = proj.eastNorth2latlon(new EastNorth(centerEN.east() + dist, centerEN.north()));
             double meterPerEasting = ll1.greatCircleDistance(ll2) / dist / 2;
             double scale = meterPerPixel / meterPerEasting; // unit: easting per pixel