X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosDistance.java;h=8d359feb9a0cacbbd4a270a19600b5551b717cf8;hp=a5e7331c8dfcbc7aa8b4a0c367684217e632b621;hb=212a1b66ae04317b7b42ba57573b910fde09ca6c;hpb=66a1e07efcac9324d33a1eca0dfb58a2724b667a

diff --git a/altoslib/AltosDistance.java b/altoslib/AltosDistance.java
index a5e7331c..8d359feb 100644
--- a/altoslib/AltosDistance.java
+++ b/altoslib/AltosDistance.java
@@ -15,35 +15,43 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.AltosLib;
+package org.altusmetrum.altoslib_2;
 
 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";
 	}
 
-	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;
 	}
 
-	int say_fraction() {
-		return 1;
+	public int say_fraction(boolean imperial_units) {
+		if (imperial_units)
+			return 1;
+		return 0;
 	}
 }
\ No newline at end of file