X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosGPSSat.java;h=6c045a31289f8188ec857da1a1378ae360d2e542;hp=8cdeed0e073e51e38cdbe7a9e32f77f207c29c30;hb=fab890328d4e1151932621a317226bc291b853da;hpb=f7e2f7f430e612c682bf55478860054ce94b995f

diff --git a/altoslib/AltosGPSSat.java b/altoslib/AltosGPSSat.java
index 8cdeed0e..6c045a31 100644
--- a/altoslib/AltosGPSSat.java
+++ b/altoslib/AltosGPSSat.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
@@ -15,14 +16,14 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_11;
+package org.altusmetrum.altoslib_13;
 
 import java.io.*;
 import java.text.*;
 import java.util.*;
 import java.util.concurrent.*;
 
-public class AltosGPSSat implements AltosJsonable {
+public class AltosGPSSat {
 	public int	svid;
 	public int	c_n0;
 
@@ -33,28 +34,5 @@ public class AltosGPSSat implements AltosJsonable {
 
 	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;
-	}
 }