X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosSpeed.java;h=6618c539eed867c3beda5f993b35796c096e15a0;hp=af63ed17ebbefb79cbaf81f6c3ca51c2da98dabb;hb=212a1b66ae04317b7b42ba57573b910fde09ca6c;hpb=4563624638884b7b2f16cd4d396c00690e045999

diff --git a/altoslib/AltosSpeed.java b/altoslib/AltosSpeed.java
index af63ed17..6618c539 100644
--- a/altoslib/AltosSpeed.java
+++ b/altoslib/AltosSpeed.java
@@ -15,29 +15,35 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.AltosLib;
+package org.altusmetrum.altoslib_2;
 
 public class AltosSpeed extends AltosUnits {
 
-	public double value(double v) {
-		if (AltosConvert.imperial_units)
-			return AltosConvert.meters_to_feet(v);
+	public double value(double v, boolean imperial_units) {
+		if (imperial_units)
+			return AltosConvert.meters_to_mph(v);
 		return v;
 	}
 
-	public String show_units() {
-		if (AltosConvert.imperial_units)
-			return "ft/s";
+	public double inverse(double v, boolean imperial_units) {
+		if (imperial_units)
+			return AltosConvert.mph_to_meters(v);
+		return v;
+	}
+
+	public String show_units(boolean imperial_units) {
+		if (imperial_units)
+			return "mph";
 		return "m/s";
 	}
 
-	public String say_units() {
-		if (AltosConvert.imperial_units)
-			return "feet per second";
+	public String say_units(boolean imperial_units) {
+		if (imperial_units)
+			return "miles per hour";
 		return "meters per second";
 	}
 
-	int show_fraction(int width) {
+	public int show_fraction(int width, boolean imperial_units) {
 		return width / 9;
 	}
 }
\ No newline at end of file