Merge branch 'master' into branch-1.6

1 files changed, 56 insertions, 2 deletions

diff --git a/altoslib/AltosDistance.java b/altoslib/AltosDistance.java
index b68a4525..1ade5abb 100644
--- a/altoslib/AltosDistance.java
+++ b/altoslib/AltosDistance.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;
 
 public class AltosDistance extends AltosUnits {
 
@@ -54,4 +54,58 @@ public class AltosDistance extends AltosUnits {
 			return 1;
 		return 0;
 	}
-}
\ No newline at end of file
+
+	public AltosDistance() {
+		range_metric = new AltosUnitsRange[2];
+
+		range_metric[0] = new AltosUnitsRange(0, "m", "meters") {
+				double value(double v) {
+					return v;
+				}
+				int show_fraction(int width) {
+					return width / 9;
+				}
+				int say_fraction() {
+					return 0;
+				}
+			};
+		range_metric[1] = new AltosUnitsRange(2000, "km", "kilometers") {
+				double value(double v) {
+					return v / 1000;
+				}
+				int show_fraction(int width) {
+					return width / 5;
+				}
+				int say_fraction() {
+					return 1;
+				}
+			};
+
+		range_imperial = new AltosUnitsRange[2];
+
+		range_imperial[0] = new AltosUnitsRange(0, "ft", "feet") {
+				double value(double v) {
+					return AltosConvert.meters_to_feet(v);
+				}
+				int show_fraction(int width) {
+					return width / 9;
+				}
+				int say_fraction() {
+					return 0;
+				}
+			};
+
+		range_imperial[1] = new AltosUnitsRange(AltosConvert.feet_to_meters(1000),
+							"mi", "miles") {
+				double value(double v) {
+					return AltosConvert.meters_to_miles(v);
+				}
+				int show_fraction(int width) {
+					return width / 5;
+				}
+				int say_fraction() {
+					return 1;
+				}
+			};
+	}
+}