projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Provide timeout value to ao_radio_recv
[fw/altos]
/
altosui
/
AltosKML.java
diff --git
a/altosui/AltosKML.java
b/altosui/AltosKML.java
index d586033fffb8835c7aceb8391bab67981ab546c5..84f9dc7a1997d0cf05b0928ac76b83b9e5220016 100644
(file)
--- a/
altosui/AltosKML.java
+++ b/
altosui/AltosKML.java
@@
-17,10
+17,8
@@
package altosui;
package altosui;
-import java.lang.*;
import java.io.*;
import java.io.*;
-import java.text.*;
-import java.util.*;
+import org.altusmetrum.altoslib_1.*;
public class AltosKML implements AltosWriter {
public class AltosKML implements AltosWriter {
@@
-73,7
+71,7
@@
public class AltosKML implements AltosWriter {
" <coordinates>\n";
static final String kml_coord_fmt =
" <coordinates>\n";
static final String kml_coord_fmt =
- " %
12.7f, %12.7f, %12
.7f <!-- alt %12.7f time %12.7f sats %d -->\n";
+ " %
.7f,%.7f,%
.7f <!-- alt %12.7f time %12.7f sats %d -->\n";
static final String kml_placemark_end =
" </coordinates>\n" +
static final String kml_placemark_end =
" </coordinates>\n" +
@@
-111,7
+109,7
@@
public class AltosKML implements AltosWriter {
AltosGPS gps = record.gps;
out.printf(kml_coord_fmt,
gps.lon, gps.lat,
AltosGPS gps = record.gps;
out.printf(kml_coord_fmt,
gps.lon, gps.lat,
- record.
filtered_
altitude(), (double) gps.alt,
+ record.altitude(), (double) gps.alt,
record.time, gps.nsat);
}
record.time, gps.nsat);
}
@@
-132,6
+130,13
@@
public class AltosKML implements AltosWriter {
if (gps == null)
return;
if (gps == null)
return;
+
+ if ((record.seen & (AltosRecord.seen_flight)) == 0)
+ return;
+ if ((record.seen & (AltosRecord.seen_gps_lat)) == 0)
+ return;
+ if ((record.seen & (AltosRecord.seen_gps_lon)) == 0)
+ return;
if (!started) {
start(record);
started = true;
if (!started) {
start(record);
started = true;