projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: Use persistent list of bluetooth devices for device dialogs
[fw/altos]
/
altosui
/
AltosSiteMap.java
diff --git
a/altosui/AltosSiteMap.java
b/altosui/AltosSiteMap.java
index d4a4cbf43dbaa66b7c0c69ca6da2be09bef08e5c..7575c10e62d3b95cfa23ca2c7d938485573d79af 100644
(file)
--- a/
altosui/AltosSiteMap.java
+++ b/
altosui/AltosSiteMap.java
@@
-164,8
+164,6
@@
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, int h) {
- AltosPreferences.init(null);
-
AltosSiteMap asm = new AltosSiteMap(true);
asm.centre = asm.getBaseLocation(lat, lng);
AltosSiteMap asm = new AltosSiteMap(true);
asm.centre = asm.getBaseLocation(lat, lng);
@@
-211,10
+209,10
@@
public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay {
private File MapFile(double lat, double lng) {
char chlat = lat < 0 ? 'S' : 'N';
private File MapFile(double lat, double lng) {
char chlat = lat < 0 ? 'S' : 'N';
- char chlng = lng < 0 ? '
E' : 'W
';
+ char chlng = lng < 0 ? '
W' : 'E
';
if (lat < 0) lat = -lat;
if (lng < 0) lng = -lng;
if (lat < 0) lat = -lat;
if (lng < 0) lng = -lng;
- return new File(AltosPreferences.
log
dir(),
+ return new File(AltosPreferences.
map
dir(),
String.format("map-%c%.6f,%c%.6f-%d.png",
chlat, lat, chlng, lng, zoom));
}
String.format("map-%c%.6f,%c%.6f-%d.png",
chlat, lat, chlng, lng, zoom));
}
@@
-228,8
+226,6
@@
public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay {
int last_state = -1;
public void show(final AltosState state, final int crc_errors) {
// if insufficient gps data, nothing to update
int last_state = -1;
public void show(final AltosState state, final int crc_errors) {
// if insufficient gps data, nothing to update
- if (state.gps == null)
- return;
if (!state.gps.locked && state.gps.nsat < 4)
return;
if (!state.gps.locked && state.gps.nsat < 4)
return;