Switch from GPLv2 to GPLv2+

[fw/altos] / altoslib / AltosDistance.java

diff --git a/altoslib/AltosDistance.java b/altoslib/AltosDistance.java
index a05fb7e2e5380ca6b37a2d877ef1bfadec1d8bf4..0239c5cec2670c5b0476aa2e6e28f57f863c06e5 100644 (file)
--- 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,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_8;
+package org.altusmetrum.altoslib_11;
 
 public class AltosDistance extends AltosUnits {
 
@@ -54,4 +55,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;
+                               }
+                       };
+       }
+}