altosdroid: Fix offline map messages to match new meanings

[fw/altos] / altoslib / AltosMapLine.java

diff --git a/altoslib/AltosMapLine.java b/altoslib/AltosMapLine.java
index 23a6f889dca74cef4e5e572fc9753a4b7a7a0c97..b971711e6d3f0aa0654855a4a6a7fcf7e3e7e016 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,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_13;
 
 import java.io.*;
 import java.lang.Math;
@@ -43,39 +44,9 @@ public abstract class AltosMapLine {
        }
 
        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);
        }
 }