altoslib: Improve AltosState save/restore debugging

[fw/altos] / altoslib / AltosGPSSat.java

diff --git a/altoslib/AltosGPSSat.java b/altoslib/AltosGPSSat.java
index 76fa3a560015c304038f19de1b7fb31ec555569f..8cdeed0e073e51e38cdbe7a9e32f77f207c29c30 100644 (file)
--- a/altoslib/AltosGPSSat.java
+++ b/altoslib/AltosGPSSat.java
@@ -15,9 +15,14 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_11;
 
-public class AltosGPSSat {
+import java.io.*;
+import java.text.*;
+import java.util.*;
+import java.util.concurrent.*;
+
+public class AltosGPSSat implements AltosJsonable {
        public int      svid;
        public int      c_n0;
 
@@ -28,5 +33,28 @@ public class AltosGPSSat {
 
        public AltosGPSSat() {
        }
+
+       public AltosJson json() {
+               AltosJson j = new AltosJson();
+               j.put("svid", svid);
+               j.put("c_n0", c_n0);
+               return j;
+       }
+
+       private AltosGPSSat(AltosJson j) {
+               svid = j.get_int("svid", 0);
+               c_n0 = j.get_int("c_n0", 0);
+       }
+
+       static public AltosGPSSat[] json_array(AltosJson j) {
+               if (j == null)
+                       return null;
+
+               int size = j.size();
+               AltosGPSSat[] sats = new AltosGPSSat[size];
+               for (int i = 0; i < size; i++)
+                       sats[i] = new AltosGPSSat(j.get(i));
+               return sats;
+       }
 }