Merge remote-tracking branch 'origin/master'

[fw/altos] / altoslib / AltosSpeed.java

diff --git a/altoslib/AltosSpeed.java b/altoslib/AltosSpeed.java
index af63ed17ebbefb79cbaf81f6c3ca51c2da98dabb..9b9f7240e781e4b0e8f3568c3b44b7b51158e722 100644 (file)
--- a/altoslib/AltosSpeed.java
+++ b/altoslib/AltosSpeed.java
@@ -15,29 +15,29 @@
  * 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);
+                       return AltosConvert.meters_to_mph(v);
                return v;
        }
 
        public String show_units() {
                if (AltosConvert.imperial_units)
-                       return "ft/s";
+                       return "mph";
                return "m/s";
        }
 
        public String say_units() {
                if (AltosConvert.imperial_units)
-                       return "feet per second";
+                       return "miles per hour";
                return "meters per second";
        }
 
-       int show_fraction(int width) {
+       public int show_fraction(int width) {
                return width / 9;
        }
 }
\ No newline at end of file