altoslib: Add a 'seconds' method to AltosGPS

[fw/altos] / altoslib / AltosGPS.java

diff --git a/altoslib/AltosGPS.java b/altoslib/AltosGPS.java
index 371fd7bf1418f638f9d0494c393df46e30e1692e..0b30ed456593f75587ca57b2ff6a7954810f82db 100644 (file)
--- a/altoslib/AltosGPS.java
+++ b/altoslib/AltosGPS.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -20,8 +21,9 @@ package org.altusmetrum.altoslib_11;
 import java.text.*;
 import java.util.concurrent.*;
 import java.io.*;
+import java.time.*;
 
-public class AltosGPS implements Cloneable, AltosHashable {
+public class AltosGPS implements Cloneable {
 
        public final static int MISSING = AltosLib.MISSING;
 
@@ -72,6 +74,24 @@ public class AltosGPS implements Cloneable, AltosHashable {
                hour = minute = second = AltosLib.MISSING;
        }
 
+       /* Return time since epoc in seconds */
+       public long seconds() {
+               if (year == AltosLib.MISSING)
+                       return AltosLib.MISSING;
+               if (month == AltosLib.MISSING)
+                       return AltosLib.MISSING;
+               if (day == AltosLib.MISSING)
+                       return AltosLib.MISSING;
+               if (hour == AltosLib.MISSING)
+                       return AltosLib.MISSING;
+               if (minute == AltosLib.MISSING)
+                       return AltosLib.MISSING;
+               if (second == AltosLib.MISSING)
+                       return AltosLib.MISSING;
+               OffsetDateTime  odt = OffsetDateTime.of(year, month, day, hour, minute, second, 0, ZoneOffset.UTC);
+               return odt.toEpochSecond();
+       }
+
        public AltosGPS(AltosTelemetryMap map) throws ParseException {
                String  state = map.get_string(AltosTelemetryLegacy.AO_TELEM_GPS_STATE,
                                               AltosTelemetryLegacy.AO_TELEM_GPS_STATE_ERROR);
@@ -388,65 +408,4 @@ public class AltosGPS implements Cloneable, AltosHashable {
                                break;
                }
        }
-
-       public AltosHashSet hashSet() {
-               AltosHashSet    h = new AltosHashSet();
-
-               h.putInt("nsat", nsat);
-               h.putBoolean("locked", locked);
-               h.putBoolean("connected", connected);
-               h.putDouble("lat", lat);
-               h.putDouble("lon", lon);
-               h.putDouble("alt", alt);
-               h.putInt("year", year);
-               h.putInt("month", month);
-               h.putInt("day", day);
-               h.putInt("hour", hour);
-               h.putInt("minute", minute);
-               h.putInt("second", second);
-
-               h.putDouble("ground_speed", ground_speed);
-               h.putInt("course", course);
-               h.putDouble("climb_rate", climb_rate);
-               h.putDouble("pdop", pdop);
-               h.putDouble("hdop", hdop);
-               h.putDouble("vdop", vdop);
-               h.putDouble("h_error", h_error);
-               h.putDouble("v_error", v_error);
-               h.putString("cc_gps_sat", AltosGPSSat.toString(cc_gps_sat));
-               return h;
-       }
-
-       public AltosGPS(AltosHashSet h) {
-               init();
-               nsat = h.getInt("nsat", nsat);
-               locked = h.getBoolean("locked", locked);
-               connected = h.getBoolean("connected", connected);
-               lat = h.getDouble("lat", lat);
-               lon = h.getDouble("lon", lon);
-               alt = h.getDouble("alt", alt);
-               year = h.getInt("year", year);
-               month = h.getInt("month", month);
-               day = h.getInt("day", day);
-               hour = h.getInt("hour", hour);
-               minute = h.getInt("minute", minute);
-               second = h.getInt("second", second);
-
-               ground_speed = h.getDouble("ground_speed", ground_speed);
-               course = h.getInt("course", course);
-               climb_rate = h.getDouble("climb_rate", climb_rate);
-               pdop = h.getDouble("pdop", pdop);
-               hdop = h.getDouble("hdop", hdop);
-               vdop = h.getDouble("vdop", vdop);
-               h_error = h.getDouble("h_error", h_error);
-               v_error = h.getDouble("v_error", v_error);
-               cc_gps_sat = AltosGPSSat.array(h.getString("cc_gps_sat", null));
-       }
-
-       public static AltosGPS fromHashSet(AltosHashSet h, AltosGPS def) {
-               if (h == null)
-                       return def;
-
-               return new AltosGPS(h);
-       }
 }