Index: applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/WayPointHelper.java
===================================================================
--- applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/WayPointHelper.java	(revision 35949)
+++ applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/WayPointHelper.java	(revision 35978)
@@ -59,11 +59,11 @@
     
     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);
     }