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

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/ColumbusCSV

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/columbusCSV/WayPointHelper.java (modified) (1 diff)

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

@@ -4 +4 @@
     <property name="commit.message" value="Commit message"/>
     <!-- Enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="17715"/>
+    <property name="plugin.main.version" value="18494"/>
     
     <!-- Plugin meta data -->

applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/WayPointHelper.java

@@ -59 +59 @@
     
     public static double getLonDist(WayPoint w1, WayPoint w2) {
-        LatLon ll = new LatLon(w1.getCoor().lat(), w2.getCoor().lon());
-        return w1.getCoor().greatCircleDistance(ll);
+        LatLon ll = new LatLon(w1.lat(), w2.lon());
+        return w1.greatCircleDistance(ll);
     }
     
     public static double getLatDist(WayPoint w1, WayPoint w2) {
-        LatLon ll = new LatLon(w2.getCoor().lat(), w1.getCoor().lon());
-        return w1.getCoor().greatCircleDistance(ll);
+        LatLon ll = new LatLon(w2.lat(), w1.lon());
+        return w1.greatCircleDistance(ll);
     }