Changeset 18494 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/RenderingCLI.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/gui/mappaint/RenderingCLI.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/RenderingCLI.java

@@ -27 +27 @@
 import org.openstreetmap.josm.data.ProjectionBounds;
 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.coor.conversion.LatLonParser;
@@ -491 +492 @@
                     EastNorth projAnchorShifted = projAnchor.add(shiftMeter / proj.getMetersPerUnit(),
                             shiftMeter / proj.getMetersPerUnit());
-                    LatLon anchorShifted = proj.eastNorth2latlon(projAnchorShifted);
+                    ILatLon anchorShifted = proj.eastNorth2latlon(projAnchorShifted);
                     return projAnchor.distance(projAnchorShifted) / argAnchor.greatCircleDistance(anchorShifted);
                 };
@@ -559 +560 @@
             if (argScale != null) {
                 double enPerMeter = pb.getMin().distance(pb.getMax())
-                        / bounds.getMin().greatCircleDistance(bounds.getMax());
+                        / bounds.getMin().greatCircleDistance((ILatLon) bounds.getMax());
                 scale = argScale * enPerMeter / PIXEL_PER_METER;
             } else if (argWidthPx != null) {