Changeset 35976 in osm for applications/editors/josm/plugins/namemanager/src

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/namemanager/src/org/openstreetmap/josm/plugins/namemanager/utils/NameManagerUtils.java (modified) (4 diffs)

applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/utils/NameManagerUtils.java

@@ -60 +60 @@
                 }
                 pairs: for (Pair<Node, Node> pair : way.getNodePairs(false)) {
-                    double x1Pair = pair.a.getCoor().getX();
-                    double y1Pair = pair.a.getCoor().getY();
-                    double x2Pair = pair.b.getCoor().getX();
-                    double y2Pair = pair.b.getCoor().getY();
+                    double x1Pair = pair.a.lon();
+                    double y1Pair = pair.a.lat();
+                    double x2Pair = pair.b.lon();
+                    double y2Pair = pair.b.lat();
                     double aPair = 0.0;
                     double bPair = 0.0;
@@ -77 +77 @@
                     int crossCount = 0;
                     areaLine: for (Pair<Node, Node> areaLine : areaBorderLines) {
-                        double x1Line = areaLine.a.getCoor().getX();
-                        double y1Line = areaLine.a.getCoor().getY();
-                        double x2Line = areaLine.b.getCoor().getX();
-                        double y2Line = areaLine.b.getCoor().getY();
+                        double x1Line = areaLine.a.lon();
+                        double y1Line = areaLine.a.lat();
+                        double x2Line = areaLine.b.lon();
+                        double y2Line = areaLine.b.lat();
                         boolean areaLinePerpendicular = false;
                         double aLine = 0.0;
@@ -178 +178 @@
                         }
                         if (raySource != null) {
-                            double rsX = raySource.getCoor().getX();
-                            double rsY = raySource.getCoor().getY();
+                            double rsX = raySource.lon();
+                            double rsY = raySource.lat();
                             if (areaLinePerpendicular) {
                                 if (x1Line == x2Line) {
@@ -218 +218 @@
         List<Node> nodes = way.getNodes();
         for (Node node : nodes) {
-            if (node.getCoor().getX() < x) {
-                x = node.getCoor().getX();
-            }
-            if (node.getCoor().getY() > y) {
-                y = node.getCoor().getY();
+            if (node.lon() < x) {
+                x = node.lon();
+            }
+            if (node.lat() > y) {
+                y = node.lat();
             }
         }