X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosDistance.java;h=6560f9ed10a51ab2b554ff21505e29605028c71c;hp=25028ac79a2ae255717c901ef41f0460dbdca71c;hb=a8f4af38d7abbb1da922b5e4d84af218475f1752;hpb=2120d362cefceba69e75996b6391d9558978c01d

diff --git a/altoslib/AltosDistance.java b/altoslib/AltosDistance.java
index 25028ac7..6560f9ed 100644
--- a/altoslib/AltosDistance.java
+++ b/altoslib/AltosDistance.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,37 +16,97 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_1;
+package org.altusmetrum.altoslib_13;
 
 public class AltosDistance extends AltosUnits {
 
-	public double value(double v) {
-		if (AltosConvert.imperial_units)
+	public double value(double v, boolean imperial_units) {
+		if (imperial_units)
 			return AltosConvert.meters_to_miles(v);
 		return v;
 	}
 
-	public String show_units() {
-		if (AltosConvert.imperial_units)
+	public double inverse(double v, boolean imperial_units) {
+		if (imperial_units)
+			return AltosConvert.miles_to_meters(v);
+		return v;
+	}
+
+	public String show_units(boolean imperial_units) {
+		if (imperial_units)
 			return "miles";
 		return "m";
 	}
 
-	public String say_units() {
-		if (AltosConvert.imperial_units)
+	public String say_units(boolean imperial_units) {
+		if (imperial_units)
 			return "miles";
 		return "meters";
 	}
 
-	public int show_fraction(int width) {
-		if (AltosConvert.imperial_units)
+	public int show_fraction(int width, boolean imperial_units) {
+		if (imperial_units)
 			return width / 3;
 		return width / 9;
 	}
 
-	public int say_fraction() {
-		if (AltosConvert.imperial_units)
+	public int say_fraction(boolean imperial_units) {
+		if (imperial_units)
 			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(5280),
+							"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;
+				}
+			};
+	}
+}