Changeset 35978 in osm for applications/editors/josm/plugins/simplifyarea/src

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.

File:

• applications/editors/josm/plugins/simplifyarea/src/org/openstreetmap/josm/plugins/simplifyarea/SimplifyAreaAction.java (modified) (4 diffs)

applications/editors/josm/plugins/simplifyarea/src/org/openstreetmap/josm/plugins/simplifyarea/SimplifyAreaAction.java

@@ -29 +29 @@
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.UndoRedoHandler;
+import org.openstreetmap.josm.data.coor.ILatLon;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.Node;
@@ -257 +258 @@
                     }
 
-                    final LatLon a = coordMap.get(n1);
-                    final LatLon b = coordMap.get(n2);
+                    final ILatLon a = coordMap.get(n1);
+                    final ILatLon b = coordMap.get(n2);
                     
                     if (a != null && b != null) {
@@ -419 +420 @@
     }
 
-    public static double computeConvectAngle(final LatLon coord1, final LatLon coord2, final LatLon coord3) {
+    public static double computeConvectAngle(final ILatLon coord1, final ILatLon coord2, final ILatLon coord3) {
         final double angle =  Math.abs(heading(coord2, coord3) - heading(coord1, coord2));
         return Math.toDegrees(angle < Math.PI ? angle : 2 * Math.PI - angle);
     }
 
-    public static double computeArea(final LatLon coord1, final LatLon coord2, final LatLon coord3) {
+    public static double computeArea(final ILatLon coord1, final ILatLon coord2, final ILatLon coord3) {
         final double a = coord1.greatCircleDistance(coord2);
         final double b = coord2.greatCircleDistance(coord3);
@@ -437 +438 @@
     public static double R = 6378135;
 
-    public static double crossTrackError(final LatLon l1, final LatLon l2, final LatLon l3) {
+    public static double crossTrackError(final ILatLon l1, final ILatLon l2, final ILatLon l3) {
         return R * Math.asin(sin(l1.greatCircleDistance(l2) / R) * sin(heading(l1, l2) - heading(l1, l3)));
     }
 
-    public static double heading(final LatLon a, final LatLon b) {
+    public static double heading(final ILatLon a, final ILatLon b) {
         double hd = Math.atan2(sin(toRadians(a.lon() - b.lon())) * cos(toRadians(b.lat())),
                 cos(toRadians(a.lat())) * sin(toRadians(b.lat())) -