2 files changed, 11 insertions, 11 deletions
diff --git a/main/src/cgeo/geocaching/geopoint/Geopoint.java b/main/src/cgeo/geocaching/geopoint/Geopoint.java
index 1655343..bb34114 100644
--- a/main/src/cgeo/geocaching/geopoint/Geopoint.java
+++ b/main/src/cgeo/geocaching/geopoint/Geopoint.java
@@ -556,15 +556,14 @@ public final class Geopoint implements ICoordinates, Parcelable {
      * Gets distance in meters (workaround for 4.2.1 JIT bug).
      */
     public static double getDistance(double lat1, double lon1, double lat2, double lon2) {
-        double earthRadius = 6372.8; // for haversine use R = 6372.8 km instead of 6371 km
+        // for haversine use R = 6372.8 km instead of 6371 km
+        double earthRadius = 6372.8;
         double dLat = toRadians(lat2 - lat1);
         double dLon = toRadians(lon2 - lon1);
         double a = Math.sin(dLat / 2) * Math.sin(dLat / 2) +
                 Math.cos(toRadians(lat1)) * Math.cos(toRadians(lat2)) *
                 Math.sin(dLon / 2) * Math.sin(dLon / 2);
-        //double c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1-a));
-        //return R * c * 1000;
-        // simplify haversine:
+        // simplify haversine
         return (2 * earthRadius * 1000 * Math.asin(Math.sqrt(a)));
     }
 
@@ -582,8 +581,8 @@ public final class Geopoint implements ICoordinates, Parcelable {
     }
 
     /**
-     * Check whether a lo bngitudeuilt from user supplied data is valid. We accept both E180/W180.
-     *
+     * Check whether a longitude from user supplied data is valid. We accept both E180/W180.
+     * 
      * @return <tt>true</tt> if the longitude looks valid, <tt>false</tt> otherwise
      */
     public static boolean isValidLongitude(final double longitude) {
diff --git a/main/src/cgeo/geocaching/geopoint/Units.java b/main/src/cgeo/geocaching/geopoint/Units.java
index b99e00e..d00e075 100644
--- a/main/src/cgeo/geocaching/geopoint/Units.java
+++ b/main/src/cgeo/geocaching/geopoint/Units.java
@@ -4,6 +4,8 @@ import cgeo.geocaching.settings.Settings;
 
 import org.apache.commons.lang3.tuple.ImmutablePair;
 
+import java.util.Locale;
+
 public class Units {
 
     public static ImmutablePair<Double, String> scaleDistance(final double distanceKilometers) {
@@ -51,11 +53,10 @@ public class Units {
         return getDistanceFromKilometers(meters / 1000f);
     }
 
-    public static String getSpeed(float kilometersPerHour) {
-        final String speed = getDistanceFromKilometers(kilometersPerHour);
-        if (speed.endsWith("mi")) {
-            return speed.substring(0, speed.length() - 2) + "mph";
+    public static String getSpeed(final float kilometersPerHour) {
+        if (Settings.isUseImperialUnits()) {
+            return String.format(Locale.US, "%.0f mph", kilometersPerHour / IConversion.MILES_TO_KILOMETER);
         }
-        return speed + (!Settings.isUseImperialUnits() ? "/h" : "ph");
+        return String.format(Locale.US, "%.0f km/h", kilometersPerHour);
     }
 }