X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosKML.java;h=140f3f0766b9bdb792a733c02d48dbf68f3fc869;hb=04d7d0f829ba953ffeca8ad9887a4b6b2b5d5087;hp=d586033fffb8835c7aceb8391bab67981ab546c5;hpb=51c7741040d95c5deece939dae5e4136cc04afc4;p=fw%2Faltos

diff --git a/altosui/AltosKML.java b/altosui/AltosKML.java
index d586033f..140f3f07 100644
--- a/altosui/AltosKML.java
+++ b/altosui/AltosKML.java
@@ -17,10 +17,8 @@
 
 package altosui;
 
-import java.lang.*;
 import java.io.*;
-import java.text.*;
-import java.util.*;
+import org.altusmetrum.altoslib_1.*;
 
 public class AltosKML implements AltosWriter {
 
@@ -28,6 +26,7 @@ public class AltosKML implements AltosWriter {
 	PrintStream		out;
 	int			state = -1;
 	AltosRecord		prev = null;
+	double			gps_start_altitude;
 
 	static final String[] kml_state_colors = {
 		"FF000000",
@@ -73,7 +72,7 @@ public class AltosKML implements AltosWriter {
 		"      <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" +
@@ -109,9 +108,15 @@ public class AltosKML implements AltosWriter {
 
 	void coord(AltosRecord record) {
 		AltosGPS	gps = record.gps;
+		double		altitude;
+
+		if (record.height() != AltosRecord.MISSING)
+			altitude = record.height() + gps_start_altitude;
+		else
+			altitude = gps.alt;
 		out.printf(kml_coord_fmt,
 			   gps.lon, gps.lat,
-			   record.filtered_altitude(), (double) gps.alt,
+			   altitude, (double) gps.alt,
 			   record.time, gps.nsat);
 	}
 
@@ -132,14 +137,17 @@ public class AltosKML implements AltosWriter {
 
 		if (gps == null)
 			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;
+			gps_start_altitude = gps.alt;
 		}
-		if (prev != null &&
-		    prev.gps.second == record.gps.second &&
-		    prev.gps.minute == record.gps.minute &&
-		    prev.gps.hour == record.gps.hour)
+		if (prev != null && prev.gps_sequence == record.gps_sequence)
 			return;
 		if (record.state != state) {
 			state = record.state;