Merge branch 'issue-2624' into upstream

1 files changed, 11 insertions, 0 deletions

diff --git a/tests/src/cgeo/geocaching/geopoint/GeoPointFormatterTest.java b/tests/src/cgeo/geocaching/geopoint/GeoPointFormatterTest.java
index c0cea01..a1be25d 100644
--- a/tests/src/cgeo/geocaching/geopoint/GeoPointFormatterTest.java
+++ b/tests/src/cgeo/geocaching/geopoint/GeoPointFormatterTest.java
@@ -6,6 +6,17 @@ import android.test.AndroidTestCase;
 
 public class GeoPointFormatterTest extends AndroidTestCase {
 
+    public static void testConfluence() {
+        // From issue #2624: coordinate is wrong near to a confluence point
+        final Geopoint point = new Geopoint(49.9999999999999, 5.0);
+        final String format = GeopointFormatter.format(GeopointFormatter.Format.LAT_LON_DECDEGREE_COMMA, point);
+        assertEquals("50.000000,5.000000", format);
+        final String formatMinute = GeopointFormatter.format(GeopointFormatter.Format.LAT_LON_DECMINUTE_RAW, point);
+        assertEquals("N 50° 00.000 E 005° 00.000", formatMinute);
+        final String formatSecond = GeopointFormatter.format(GeopointFormatter.Format.LAT_LON_DECSECOND, point).replaceAll(",", ".");
+        assertEquals(formatSecond, "N 50° 00' 00.000\"" + Formatter.SEPARATOR + "E 005° 00' 00.000\"", formatSecond);
+    }
+
     public static void testFormat() {
         // taken from GC30R6G
         final Geopoint point = new Geopoint("N 51° 21.104 E 010° 15.369");