altoslib: use miles for distances > 1000ft.

This makes both the map line and the other distance displays use miles
for distances greater than 1000 feet.

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

diff --git a/altoslib/AltosDistance.java b/altoslib/AltosDistance.java
index d6788fb5bd0e874087b50b9513d001d54926bf99..1ade5abbe354b3356ceddd6b3f5667d04d24acbd 100644 (file)
--- a/altoslib/AltosDistance.java
+++ b/altoslib/AltosDistance.java
@@ -95,7 +95,7 @@ public class AltosDistance extends AltosUnits {
                                }
                        };
 
-               range_imperial[1] = new AltosUnitsRange(AltosConvert.feet_to_meters(5280),
+               range_imperial[1] = new AltosUnitsRange(AltosConvert.feet_to_meters(1000),
                                                        "mi", "miles") {
                                double value(double v) {
                                        return AltosConvert.meters_to_miles(v);

diff --git a/altoslib/AltosMapLine.java b/altoslib/AltosMapLine.java
index ed2c08440cb81b091688ca05af9ffd16c409c450..187aa6d9e01f124ff7eea364e14a40e69fdf6115 100644 (file)
--- a/altoslib/AltosMapLine.java
+++ b/altoslib/AltosMapLine.java
@@ -50,7 +50,7 @@ public abstract class AltosMapLine {
 
                if (AltosConvert.imperial_units) {
                        distance = AltosConvert.meters_to_feet(distance);
-                       if (distance < 10000) {
+                       if (distance < 1000) {
                                format = "%4.0fft";
                        } else {
                                distance /= 5280;
@@ -64,7 +64,7 @@ public abstract class AltosMapLine {
                                        format = "%5.0fmi";
                        }
                } else {
-                       if (distance < 10000) {
+                       if (distance < 1000) {
                                format = "%4.0fm";
                        } else {
                                distance /= 1000;