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

Timestamp:

2022-06-14T20:11:21+02:00 (2 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/public_transport/src/org/openstreetmap/josm/plugins/public_transport/actions/RoutePatternAction.java (modified) (4 diffs)

applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/actions/RoutePatternAction.java

@@ -1868 +1868 @@
                     if ("backward".equals(itineraryData.getValueAt(i, 1))) {
                         for (int j = way.getNodesCount() - 2; j >= 0; --j) {
-                            SegmentMetric sm = new SegmentMetric(way.getNode(j + 1).getCoor().lat(),
-                                    way.getNode(j + 1).getCoor().lon(),
-                                    way.getNode(j).getCoor().lat(), way.getNode(j).getCoor().lon(),
+                            SegmentMetric sm = new SegmentMetric(way.getNode(j + 1).lat(),
+                                    way.getNode(j + 1).lon(),
+                                    way.getNode(j).lat(), way.getNode(j).lon(),
                                     distance);
                             segmentMetrics.add(sm);
@@ -1877 +1877 @@
                     } else {
                         for (int j = 0; j < way.getNodesCount() - 1; ++j) {
-                            SegmentMetric sm = new SegmentMetric(way.getNode(j).getCoor().lat(),
-                                    way.getNode(j).getCoor().lon(),
-                                    way.getNode(j + 1).getCoor().lat(),
-                                    way.getNode(j + 1).getCoor().lon(), distance);
+                            SegmentMetric sm = new SegmentMetric(way.getNode(j).lat(),
+                                    way.getNode(j).lon(),
+                                    way.getNode(j + 1).lat(),
+                                    way.getNode(j + 1).lon(), distance);
                             segmentMetrics.add(sm);
                             distance += sm.length;
@@ -1894 +1894 @@
     private StopReference detectMinDistance(Node node, Vector<SegmentMetric> segmentMetrics,
             boolean rhsPossible, boolean lhsPossible) {
-        if (node == null || node.getCoor() == null)
+        if (node == null || !node.isLatLonKnown())
             return null;
 
@@ -1900 +1900 @@
         double position = -1.0;
         double distance = 180.0;
-        double lat = node.getCoor().lat();
-        double lon = node.getCoor().lon();
+        double lat = node.lat();
+        double lon = node.lon();
 
         int curIndex = -2;