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

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.

File:

• applications/editors/josm/plugins/terracer/src/org/openstreetmap/josm/plugins/terracer/TerracerAction.java (modified) (2 diffs)

applications/editors/josm/plugins/terracer/src/org/openstreetmap/josm/plugins/terracer/TerracerAction.java

@@ -758 +758 @@
      */
     private double calculateSideness(Node a, Node b, Node c, Node d) {
-        final double ndx = b.getCoor().getX() - a.getCoor().getX();
-        final double pdx = d.getCoor().getX() - c.getCoor().getX();
-        final double ndy = b.getCoor().getY() - a.getCoor().getY();
-        final double pdy = d.getCoor().getY() - c.getCoor().getY();
+        final double ndx = b.lon() - a.lon();
+        final double pdx = d.lon() - c.lon();
+        final double ndy = b.lat() - a.lat();
+        final double pdy = d.lat() - c.lat();
 
         return (ndx * pdx + ndy * pdy)
@@ -780 +780 @@
     private Node interpolateNode(Node a, Node b, double f) {
         Node n = new Node(a.getEastNorth().interpolate(b.getEastNorth(), f));
-        LatLon latLon = n.getCoor();
-                if (latLon.equalsEpsilon(a.getCoor(), ILatLon.MAX_SERVER_PRECISION))
+                if (n.equalsEpsilon(a, ILatLon.MAX_SERVER_PRECISION))
             return a;
-        if (latLon.equalsEpsilon(b.getCoor(), ILatLon.MAX_SERVER_PRECISION))
+        if (n.equalsEpsilon(b, ILatLon.MAX_SERVER_PRECISION))
             return b;
         return n;