Changeset 12169 in josm for trunk

Timestamp:

2017-05-15T17:39:43+02:00 (7 years ago)

Author:

michael2402

Message:

Fix lat/lon swapped for GPX conversion, add asymetric test case

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/gpx/WayPoint.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/gpx/GpxDataTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/gpx/WayPoint.java

@@ -90 +90 @@
     @Override
     public double lon() {
+        return lon;
+    }
+
+    @Override
+    public double lat() {
         return lat;
-    }
-
-    @Override
-    public double lat() {
-        return lon;
     }
 

trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxDataTest.java

@@ -326 +326 @@
 
         WayPoint closeToMiddle = data.nearestPointOnTrack(new EastNorth(10, 0), 10);
-        assertEquals(points.get(1).lat(), closeToMiddle.lat(), 1e-4);
-        assertEquals(points.get(1).lon(), closeToMiddle.lon(), 1e-4);
+        assertEquals(points.get(1), closeToMiddle);
 
         WayPoint close = data.nearestPointOnTrack(new EastNorth(5, 5), 10);
+        assertEquals(10, close.getEastNorth().east(), .01);
+        assertEquals(5, close.getEastNorth().north(), .01);
+
+        close = data.nearestPointOnTrack(new EastNorth(15, 5), 10);
         assertEquals(10, close.getEastNorth().east(), .01);
         assertEquals(5, close.getEastNorth().north(), .01);