Add nautical miles (with feet for altitude).

Fixes #1280.

src/androidTest/java/de/dennisguse/opentracks/data/models/DistanceFormatterTest.java

@@ -12,6 +12,7 @@ import org.junit.runner.RunWith;
 
 import de.dennisguse.opentracks.settings.UnitSystem;
 
+//TODO Parametrized tests
 @RunWith(AndroidJUnit4.class)
 public class DistanceFormatterTest {
 
@@ -42,4 +43,17 @@ public class DistanceFormatterTest {
         // A small number in imperial
         assertEquals("328.08 ft", formatter.formatDistance(Distance.of(100)));
     }
+
+    @Test
+    public void testFormatDistance_nautical() {
+        DistanceFormatter formatter = DistanceFormatter.Builder()
+                .setDecimalCount(2)
+                .setUnit(UnitSystem.NAUTICAL_IMPERIAL)
+                .build(context);
+
+        // A large number in nautical
+        assertEquals("2.70 NM", formatter.formatDistance(Distance.of(5000)));
+        // A small number in nautical
+        assertEquals("0.05 NM", formatter.formatDistance(Distance.of(100)));
+    }
 }

src/androidTest/java/de/dennisguse/opentracks/data/models/SpeedFormatterTest.java

@@ -12,6 +12,7 @@ import org.junit.runner.RunWith;
 
 import de.dennisguse.opentracks.settings.UnitSystem;
 
+//TODO Use make parametrized tests?
 @RunWith(AndroidJUnit4.class)
 public class SpeedFormatterTest {
 
@@ -39,12 +40,22 @@ public class SpeedFormatterTest {
                 .setReportSpeedOrPace(false)
                 .build(context);
 
-//        assertEquals("TODO", formatter.getSpeedParts(Speed.of(3.34)).first);
-//        assertEquals("TODO", formatter.getSpeedParts(Speed.of(3.33)).first);
-
+        assertEquals("8:02", formatter.getSpeedParts(Speed.of(3.34)).first);
         assertEquals("min/mi", formatter.getSpeedParts(Speed.zero()).second);
     }
 
+    @Test
+    public void testGetSpeedParts_pace_nautical() {
+        SpeedFormatter formatter = SpeedFormatter.Builder()
+                .setDecimalCount(2)
+                .setUnit(UnitSystem.NAUTICAL_IMPERIAL)
+                .setReportSpeedOrPace(false)
+                .build(context);
+
+        assertEquals("9:14", formatter.getSpeedParts(Speed.of(3.34)).first);
+        assertEquals("min/NM", formatter.getSpeedParts(Speed.zero()).second);
+    }
+
     @Test
     public void testGetSpeedParts_speed_metric() {
         SpeedFormatter formatter = SpeedFormatter.Builder()
@@ -69,6 +80,18 @@ public class SpeedFormatterTest {
         assertEquals("mph", formatter.getSpeedParts(Speed.zero()).second);
     }
 
+    @Test
+    public void testGetSpeedParts_speed_nautical() {
+        SpeedFormatter formatter = SpeedFormatter.Builder()
+                .setDecimalCount(2)
+                .setUnit(UnitSystem.NAUTICAL_IMPERIAL)
+                .setReportSpeedOrPace(true)
+                .build(context);
+
+        assertEquals("6.5", formatter.getSpeedParts(Speed.of(3.34)).first);
+        assertEquals("knots", formatter.getSpeedParts(Speed.zero()).second);
+    }
+
     @Test
     public void testFormatSpeed() {
         SpeedFormatter formatter = SpeedFormatter.Builder()