projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'branch-1.6' into debian
[fw/altos]
/
altoslib
/
AltosMapLine.java
diff --git
a/altoslib/AltosMapLine.java
b/altoslib/AltosMapLine.java
index 23a6f889dca74cef4e5e572fc9753a4b7a7a0c97..187aa6d9e01f124ff7eea364e14a40e69fdf6115 100644
(file)
--- a/
altoslib/AltosMapLine.java
+++ b/
altoslib/AltosMapLine.java
@@
-15,7
+15,7
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
* 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.io.*;
import java.lang.Math;
@@
-50,7
+50,7
@@
public abstract class AltosMapLine {
if (AltosConvert.imperial_units) {
distance = AltosConvert.meters_to_feet(distance);
if (AltosConvert.imperial_units) {
distance = AltosConvert.meters_to_feet(distance);
- if (distance < 1000
0
) {
+ if (distance < 1000) {
format = "%4.0fft";
} else {
distance /= 5280;
format = "%4.0fft";
} else {
distance /= 5280;
@@
-64,7
+64,7
@@
public abstract class AltosMapLine {
format = "%5.0fmi";
}
} else {
format = "%5.0fmi";
}
} else {
- if (distance < 1000
0
) {
+ if (distance < 1000) {
format = "%4.0fm";
} else {
distance /= 1000;
format = "%4.0fm";
} else {
distance /= 1000;