From 97adfff4cfb67c17a96f3ff46606b4e439422b01 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Thu, 12 May 2016 12:14:03 -0700 Subject: Bump java library versions Prepare for 1.6.4 release Signed-off-by: Keith Packard --- altoslib/AltosMapLine.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'altoslib/AltosMapLine.java') diff --git a/altoslib/AltosMapLine.java b/altoslib/AltosMapLine.java index bd590136..ed2c0844 100644 --- a/altoslib/AltosMapLine.java +++ b/altoslib/AltosMapLine.java @@ -15,7 +15,7 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -package org.altusmetrum.altoslib_10; +package org.altusmetrum.altoslib_11; import java.io.*; import java.lang.Math; -- cgit v1.2.3 From 7b5521966119fcc290591bf1b397506ef44cedea Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Tue, 24 May 2016 23:40:03 -0700 Subject: 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 --- altoslib/AltosDistance.java | 2 +- altoslib/AltosMapLine.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'altoslib/AltosMapLine.java') 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; -- cgit v1.2.3