altosui, telegps, altosdroid: say ground distance, not total range

Ground distance is more useful in predicting recovery than total range.

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java
index 308c50e7d182eb7f3622f1a0082c1ebebb957fcf..e041a00a51166f5d2fb2d500417c2b17d3579634 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java
@@ -243,12 +243,12 @@ public class AltosVoice {
                if (last_flight_tell == TELL_FLIGHT_HEIGHT) {
                        last_flight_tell = TELL_FLIGHT_TRACK;
                        if (from_receiver != null) {
-                               speak("bearing %s %d, elevation %d, range %s.",
+                               speak("bearing %s %d, elevation %d, distance %s.",
                                      from_receiver.bearing_words(
                                              AltosGreatCircle.BEARING_VOICE),
                                      (int) (from_receiver.bearing + 0.5),
                                      (int) (from_receiver.elevation + 0.5),
-                                     AltosConvert.distance.say(from_receiver.range));
+                                     AltosConvert.distance.say(from_receiver.distance));
                                return true;
                        }
                }
@@ -273,7 +273,7 @@ public class AltosVoice {
                if (direction == null)
                        direction = String.format("Bearing %d", (int) (from_receiver.bearing + 0.5));
 
-               speak("%s, range %s.", direction,
+               speak("%s, distance %s.", direction,
                      AltosConvert.distance.say_units(from_receiver.distance));
 
                return true;

diff --git a/altosuilib/AltosDisplayThread.java b/altosuilib/AltosDisplayThread.java
index 1edac8a9bf38242fba8dc26b5c6d2cd1cda6c6ed..a5a1f1b3b43dc01187a0c1860e244987487aa7fc 100644 (file)
--- a/altosuilib/AltosDisplayThread.java
+++ b/altosuilib/AltosDisplayThread.java
@@ -95,13 +95,13 @@ public class AltosDisplayThread extends Thread {
                            state.from_pad != null &&
                            state.range >= 0)
                        {
-                               voice.speak("Height %s, bearing %s %d, elevation %d, range %s.\n",
+                               voice.speak("Height %s, bearing %s %d, elevation %d, distance %s.\n",
                                            AltosConvert.height.say(state.height()),
                                            state.from_pad.bearing_words(
                                                    AltosGreatCircle.BEARING_VOICE),
                                            (int) (state.from_pad.bearing + 0.5),
                                            (int) (state.elevation + 0.5),
-                                           AltosConvert.distance.say(state.range));
+                                           AltosConvert.distance.say(state.distance));
                        } else if (state.state() > AltosLib.ao_flight_pad && state.height() != AltosLib.MISSING) {
                                voice.speak(AltosConvert.height.say_units(state.height()));
                        } else {
@@ -123,7 +123,7 @@ public class AltosDisplayThread extends Thread {
                                else
                                        voice.speak("rocket may have crashed");
                                if (state.from_pad != null)
-                                       voice.speak("Bearing %d degrees, range %s.",
+                                       voice.speak("Bearing %d degrees, distance %s.",
                                                    (int) (state.from_pad.bearing + 0.5),
                                                    AltosConvert.distance.say_units(state.from_pad.distance));
                                ++reported_landing;