Changeset 18494 in josm for trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

Timestamp:

2022-06-15T19:27:05+02:00 (2 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/NavigatableComponent.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

@@ -399 +399 @@
         int w = getWidth()/2;
         int h = getHeight()/2;
-        LatLon ll1 = getLatLon(w-50, h);
-        LatLon ll2 = getLatLon(w+50, h);
+        ILatLon ll1 = getLatLon(w-50, h);
+        ILatLon ll2 = getLatLon(w+50, h);
         double gcd = ll1.greatCircleDistance(ll2);
         if (alwaysPositive && gcd <= 0)
@@ -649 +649 @@
         LatLon ll2 = getLatLon(width / 2 + 50, height / 2);
         if (ll1.isValid() && ll2.isValid() && b.contains(ll1) && b.contains(ll2)) {
-            double dm = ll1.greatCircleDistance(ll2);
+            double dm = ll1.greatCircleDistance((ILatLon) ll2);
             double den = 100 * getScale();
             double scaleMin = 0.01 * den / dm / 100;