From: Keith Packard <keithp@keithp.com>
Date: Wed, 25 May 2016 06:40:03 +0000 (-0700)
Subject: altoslib: use miles for distances > 1000ft.
X-Git-Tag: 1.6.4~1^2~32
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=7b5521966119fcc290591bf1b397506ef44cedea

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 d6788fb5..1ade5abb 100644
--- 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 ed2c0844..187aa6d9 100644
--- 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;