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

Timestamp:

2022-06-15T20:10:48+02:00 (2 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.

Location:

applications/editors/josm/plugins/public_transport

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/public_transport/PublicTransportAStar.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/public_transport/commands/TrackSuggestStopsCommand.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/public_transport/models/GTFSStopTableModel.java (modified) (1 diff)

applications/editors/josm/plugins/public_transport/build.xml

@@ -5 +5 @@
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="15502"/>
+    <property name="plugin.main.version" value="18494"/>
 
     <property name="plugin.author" value="Roland M. Olbricht"/>

applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/PublicTransportAStar.java

@@ -70 +70 @@
             double totalDistance = 0;
             for (int i = min; i < max; ++i) {
-                totalDistance += way.getNode(i).getCoor().greatCircleDistance(way.getNode(i + 1).getCoor());
+                totalDistance += way.getNode(i).greatCircleDistance(way.getNode(i + 1));
             }
             return totalDistance;
@@ -138 +138 @@
     public double estimateDistance(AStarAlgorithm.Vertex vertex) {
         NodeVertex nodeVertex = (NodeVertex) vertex;
-        return ((NodeVertex) super.end).node.getCoor()
-                .greatCircleDistance(nodeVertex.node.getCoor());
+        return ((NodeVertex) super.end).node
+                .greatCircleDistance(nodeVertex.node);
     }
 }

applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/TrackSuggestStopsCommand.java

@@ -9 +9 @@
 
 import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.data.coor.ILatLon;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.gpx.IGpxTrackSegment;
@@ -121 +122 @@
             if (j < k) {
                 double dist = 0;
-                LatLon latLonI = wayPoints.elementAt(i).getCoor();
+                ILatLon latLonI = wayPoints.elementAt(i).getCoor();
                 for (int l = j; l < k; ++l) {
-                    double distL = latLonI.greatCircleDistance(wayPoints.elementAt(l).getCoor());
+                    double distL = latLonI.greatCircleDistance(wayPoints.elementAt(l));
                     if (distL > dist)
                         dist = distL;
@@ -148 +149 @@
 
             LatLon latLon = wayPoints.elementAt(i).getCoor();
-            if ((lastStopCoor != null) && (lastStopCoor.greatCircleDistance(latLon) < threshold))
+            if ((lastStopCoor != null) && (lastStopCoor.greatCircleDistance((ILatLon) latLon) < threshold))
                 continue;
 

applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/models/GTFSStopTableModel.java

@@ -180 +180 @@
         while (iter.hasNext()) {
             Node node = iter.next();
-            if (coor.greatCircleDistance(node.getCoor()) < 1000) {
+            if (coor.greatCircleDistance(node) < 1000) {
                 nearBusStop = true;
                 break;