X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosMapLine.java;h=cf09307eab74d67b26650464830c0864d98fde0f;hb=4c5acb57d7ac1abec7bb4cda9dc88c2a19767a2d;hp=e727e3389d2c35ff4c33a4d283310451fda164a3;hpb=cb23b992be8ba40c97d8988c134a814a13ccd58c;p=fw%2Faltos

diff --git a/altoslib/AltosMapLine.java b/altoslib/AltosMapLine.java
index e727e338..cf09307e 100644
--- 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) {
@@ -45,39 +44,9 @@ public abstract class AltosMapLine implements AltosFontListener {
 	}
 
 	public String line_dist() {
-		String	format;
 		AltosGreatCircle	g = new AltosGreatCircle(start.lat, start.lon,
 								 end.lat, end.lon);
-		double	distance = g.distance;
 
-		if (AltosConvert.imperial_units) {
-			distance = AltosConvert.meters_to_feet(distance);
-			if (distance < 10000) {
-				format = "%4.0fft";
-			} else {
-				distance /= 5280;
-				if (distance < 10)
-					format = "%5.3fmi";
-				else if (distance < 100)
-					format = "%5.2fmi";
-				else if (distance < 1000)
-					format = "%5.1fmi";
-				else
-					format = "%5.0fmi";
-			}
-		} else {
-			if (distance < 10000) {
-				format = "%4.0fm";
-			} else {
-				distance /= 1000;
-				if (distance < 100)
-					format = "%5.2fkm";
-				else if (distance < 1000)
-					format = "%5.1fkm";
-				else
-					format = "%5.0fkm";
-			}
-		}
-		return String.format(format, distance);
+		return AltosConvert.distance.show(7, g.distance);
 	}
 }