Switch from GPLv2 to GPLv2+

[fw/altos] / altoslib / AltosMapLine.java

diff --git a/altoslib/AltosMapLine.java b/altoslib/AltosMapLine.java
index e727e3389d2c35ff4c33a4d283310451fda164a3..c475f52d1cbd561c963c38930d6d67a685578ba4 100644 (file)
--- a/altoslib/AltosMapLine.java
+++ b/altoslib/AltosMapLine.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,20 +16,18 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_11;
 
 import java.io.*;
 import java.lang.Math;
 import java.util.*;
 import java.util.concurrent.*;
 
-public abstract class AltosMapLine implements AltosFontListener {
+public abstract class AltosMapLine {
        public AltosLatLon      start, end;
 
        static public int stroke_width = 6;
 
-       public abstract void font_size_changed(int font_size);
-
        public abstract void paint(AltosMapTransform t);
 
        private AltosLatLon lat_lon(AltosPointInt pt, AltosMapTransform t) {
@@ -52,7 +51,7 @@ public abstract class AltosMapLine implements AltosFontListener {
 
                if (AltosConvert.imperial_units) {
                        distance = AltosConvert.meters_to_feet(distance);
-                       if (distance < 10000) {
+                       if (distance < 1000) {
                                format = "%4.0fft";
                        } else {
                                distance /= 5280;
@@ -66,7 +65,7 @@ public abstract class AltosMapLine implements AltosFontListener {
                                        format = "%5.0fmi";
                        }
                } else {
-                       if (distance < 10000) {
+                       if (distance < 1000) {
                                format = "%4.0fm";
                        } else {
                                distance /= 1000;