Changeset 35978 in osm for applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap

Timestamp:

2022-06-15T20:10:48+02:00 (3 years ago)

Author:

taylor.smock

Message:

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

This uses the extracted methods where possible, and removes unnecessary
Node#getCoor calls.

Location:

applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation

Files:

• ElevationHelper.java (modified) (1 diff)
• grid/EleVertex.java (modified) (4 diffs)

applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/ElevationHelper.java

@@ -109 +109 @@
 
         // get distance in meters and divide it by 100 in advance
-        double distInMeter = w1.greatCircleDistance(w2) / 100.0;
+        double distInMeter = w1.greatCircleDistance((ILatLon) w2) / 100.0;
 
         // get elevation (difference)

applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/grid/EleVertex.java

@@ -6 +6 @@
 import java.util.List;
 
+import org.openstreetmap.josm.data.coor.ILatLon;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.plugins.elevation.ElevationHelper;
@@ -41 +42 @@
 
         // compute the (approx.!) area of the vertex using heron's formula
-        double a = p1.greatCircleDistance(p2);
-        double b = p2.greatCircleDistance(p3);
-        double c = p1.greatCircleDistance(p3);
+        double a = p1.greatCircleDistance((ILatLon) p2);
+        double b = p2.greatCircleDistance((ILatLon) p3);
+        double c = p1.greatCircleDistance((ILatLon) p3);
 
         double s = (a + b + c) / 2D;
@@ -55 +56 @@
         int k = 0;
         for (int i = 0; i < points.length; i++) {
-            EleCoordinate c1 = points[i];
+            ILatLon c1 = points[i];
 
             for (int j = i + 1; j < points.length; j++) {
-                EleCoordinate c2 = points[j];
+                ILatLon c2 = points[j];
                 edges[k++] = new TriangleEdge(i, j, c1.greatCircleDistance(c2));
             }
@@ -119 +120 @@
 
         double z = (c1.getEle() + c2.getEle()) / 2.0;
-        if (c1.greatCircleDistance(c2) > MIN_DIST) {
+        if (c1.greatCircleDistance((ILatLon) c2) > MIN_DIST) {
             double hgtZ = ElevationHelper.getSrtmElevation(new LatLon(y, x));