altoslib: Set time in state for KML output correctly

[fw/altos] / altoslib / AltosKML.java

diff --git a/altoslib/AltosKML.java b/altoslib/AltosKML.java
index 2ab91d3e3871e4bb7e9e46fb56a4ec60b82734fc..587b845bb7ac68cef04bd1c7b024e2ef63a22486 100644 (file)
--- a/altoslib/AltosKML.java
+++ b/altoslib/AltosKML.java
@@ -16,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_11;
+package org.altusmetrum.altoslib_12;
 
 import java.io.*;
 import java.util.*;
@@ -121,7 +121,7 @@ public class AltosKML implements AltosWriter {
                String  state_color = state_color(state);
                out.printf(kml_style_start, state_name, state_color);
                out.printf("State: %s\n", state_name);
-               out.printf("Time: %6.2f s\n", stats.state_end[state] - stats.state_start[state]);
+               out.printf("Time: %6.2f s\n", stats.state_time[state]);
                out.printf("Average speed: %s\n", AltosConvert.speed.show(6, stats.state_speed[state]));
                out.printf("Average accel: %s\n", AltosConvert.accel.show(6, stats.state_accel[state]));
                out.printf("%s", kml_style_end);
@@ -189,9 +189,9 @@ public class AltosKML implements AltosWriter {
 
        public void write(AltosFlightSeries series) {
                stats = new AltosFlightStats(series);
-               start(series.cal_data);
+               start(series.cal_data());
                for (AltosGPSTimeValue gtv : series.gps_series)
-                       write(gtv, series.cal_data, state(series, gtv.time), height(series, gtv.time));
+                       write(gtv, series.cal_data(), state(series, gtv.time), height(series, gtv.time));
        }
 
        public AltosKML(File in_name) throws FileNotFoundException {