Merge pull request #2719 from campbeb/fix2714

Fix #2714 - Support imperial units in compass speech

1 files changed, 28 insertions, 9 deletions

diff --git a/main/src/cgeo/geocaching/speech/TextFactory.java b/main/src/cgeo/geocaching/speech/TextFactory.java
index 6b25147..0e13564 100644
--- a/main/src/cgeo/geocaching/speech/TextFactory.java
+++ b/main/src/cgeo/geocaching/speech/TextFactory.java
@@ -1,8 +1,10 @@
 package cgeo.geocaching.speech;
 
 import cgeo.geocaching.R;
+import cgeo.geocaching.Settings;
 import cgeo.geocaching.cgeoapplication;
 import cgeo.geocaching.geopoint.Geopoint;
+import cgeo.geocaching.geopoint.IConversion;
 import cgeo.geocaching.utils.AngleUtils;
 
 import java.util.Locale;
@@ -21,18 +23,35 @@ public class TextFactory {
 
     private static String getDistance(Geopoint position, Geopoint target) {
         float kilometers = position.distanceTo(target);
-        if (kilometers >= 5.0) {
-            return getString(R.string.tts_kilometers, String.valueOf(Math.round(kilometers)));
+
+        if (Settings.isUseMetricUnits()) {
+            if (kilometers >= 5.0) {
+                return getString(R.string.tts_kilometers, String.valueOf(Math.round(kilometers)));
+            }
+            if (kilometers >= 1.0) {
+                String digits = String.format(Locale.getDefault(), "%.1f", kilometers);
+                return getString(R.string.tts_kilometers, digits);
+            }
+            int meters = (int) (kilometers * 1000.0);
+            if (meters > 50) {
+                return getString(R.string.tts_meters, String.valueOf(Math.round(meters / 10.0) * 10));
+            }
+            return getString(R.string.tts_meters, String.valueOf(meters));
+        }
+
+        float miles = kilometers / IConversion.MILES_TO_KILOMETER;
+        if (miles >= 3.0) {
+            return getString(R.string.tts_miles, String.valueOf(Math.round(miles)));
         }
-        if (kilometers >= 1.0) {
-            String digits = String.format(Locale.getDefault(), "%.1f", kilometers);
-            return getString(R.string.tts_kilometers, digits);
+        if (miles >= 0.2) { // approx 1000 ft
+            String digits = String.format(Locale.getDefault(), "%.1f", miles);
+            return getString(R.string.tts_miles, digits);
         }
-        int meters = (int) (kilometers * 1000.0);
-        if (meters > 50) {
-            return getString(R.string.tts_meters, String.valueOf(Math.round(meters / 10.0) * 10));
+        int feet = (int) (kilometers * 1000.0 * IConversion.METERS_TO_FEET);
+        if (feet > 300) {
+            return getString(R.string.tts_feet, String.valueOf(Math.round(feet / 10.0) * 10));
         }
-        return getString(R.string.tts_meters, String.valueOf(meters));
+        return getString(R.string.tts_feet, String.valueOf(feet));
     }
 
     private static String getString(int resourceId, Object... formatArgs) {