projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosuilib: Remove some spurious debug printfs
[fw/altos]
/
altosui
/
AltosSiteMap.java
diff --git
a/altosui/AltosSiteMap.java
b/altosui/AltosSiteMap.java
index c092691926f72925b854b29993a6bd1c3400d31c..105afade192ed206b3fcde8f3c688231b4da3ba8 100644
(file)
--- a/
altosui/AltosSiteMap.java
+++ b/
altosui/AltosSiteMap.java
@@
-23,7
+23,7
@@
import java.io.*;
import java.lang.Math;
import java.awt.geom.Point2D;
import java.util.concurrent.*;
import java.lang.Math;
import java.awt.geom.Point2D;
import java.util.concurrent.*;
-import org.altusmetrum.altoslib_
1
.*;
+import org.altusmetrum.altoslib_
3
.*;
import org.altusmetrum.altosuilib_1.*;
public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay {
import org.altusmetrum.altosuilib_1.*;
public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay {
@@
-182,7
+182,9
@@
public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay {
}
}
}
}
- public static void prefetchMaps(double lat, double lng, int w, int h) {
+ public static void prefetchMaps(double lat, double lng) {
+ int w = AltosSiteMapPreload.width;
+ int h = AltosSiteMapPreload.height;
AltosSiteMap asm = new AltosSiteMap(true);
asm.centre = asm.getBaseLocation(lat, lng);
AltosSiteMap asm = new AltosSiteMap(true);
asm.centre = asm.getBaseLocation(lat, lng);
@@
-287,10
+289,10
@@
public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay {
return;
if (!initialised) {
return;
if (!initialised) {
- if (state.pad_lat != Altos
Record.MISSING && state.pad_lon != AltosRecord
.MISSING) {
+ if (state.pad_lat != Altos
Lib.MISSING && state.pad_lon != AltosLib
.MISSING) {
initMaps(state.pad_lat, state.pad_lon);
initialised = true;
initMaps(state.pad_lat, state.pad_lon);
initialised = true;
- } else if (gps.lat != Altos
Record.MISSING && gps.lon != AltosRecord
.MISSING) {
+ } else if (gps.lat != Altos
Lib.MISSING && gps.lon != AltosLib
.MISSING) {
initMaps(gps.lat, gps.lon);
initialised = true;
} else {
initMaps(gps.lat, gps.lon);
initialised = true;
} else {