Changeset 35976 in osm for applications/editors/josm/plugins/measurement

Timestamp:

2022-06-14T20:11:21+02:00 (3 years ago)

Author:

taylor.smock

Message:

see #22104: Remove usages of Node#getCoor where possible

This also accounts for cases where Node has the methods used later,
so a new LatLon is unnecessary.

Location:

applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement

Files:

• MeasurementDialog.java (modified) (2 diffs)
• MeasurementLayer.java (modified) (3 diffs)

applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java

@@ -209 +209 @@
                         } else {
                             length += lastNode.getCoor().greatCircleDistance(n.getCoor());
-                            segAngle = MeasurementLayer.angleBetween(lastNode.getCoor(), n.getCoor());
+                            segAngle = MeasurementLayer.angleBetween(lastNode, n);
                             lastNode = n;
                         }
@@ -235 +235 @@
                         wayArea += (MeasurementLayer.calcX(n.getCoor()) * MeasurementLayer.calcY(lastN.getCoor()))
                                 - (MeasurementLayer.calcY(n.getCoor()) * MeasurementLayer.calcX(lastN.getCoor()));
-                        segAngle = MeasurementLayer.angleBetween(lastN.getCoor(), n.getCoor());
+                        segAngle = MeasurementLayer.angleBetween(lastN, n);
                     }
                     lastN = n;

applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java

@@ -2 +2 @@
 package org.openstreetmap.josm.plugins.measurement;
 /// @author Raphael Mack <ramack@raphael-mack.de>
+
 import static org.openstreetmap.josm.tools.I18n.tr;
 
@@ -28 +29 @@
 
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.coor.ILatLon;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.gpx.IGpxTrack;
@@ -171 +173 @@
     }
 
-    public static double angleBetween(LatLon p1, LatLon p2){
+    public static double angleBetween(ILatLon p1, ILatLon p2){
         double lat1, lon1, lat2, lon2;
         double dlon;