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

diff --git a/altoslib/AltosGPSSat.java b/altoslib/AltosGPSSat.java
index 319fe7f1..8cdeed0e 100644
--- a/altoslib/AltosGPSSat.java
+++ b/altoslib/AltosGPSSat.java
@@ -34,13 +34,6 @@ public class AltosGPSSat implements AltosJsonable {
 	public AltosGPSSat() {
 	}
 
-	public AltosHashSet hashSet() {
-		AltosHashSet h = new AltosHashSet();
-		h.putInt("svid", svid);
-		h.putInt("c_n0", c_n0);
-		return h;
-	}
-
 	public AltosJson json() {
 		AltosJson j = new AltosJson();
 		j.put("svid", svid);
@@ -48,22 +41,11 @@ public class AltosGPSSat implements AltosJsonable {
 		return j;
 	}
 
-	private AltosGPSSat(AltosHashSet h) {
-		svid = h.getInt("svid", 0);
-		c_n0 = h.getInt("c_n0", 0);
-	}
-
 	private AltosGPSSat(AltosJson j) {
 		svid = j.get_int("svid", 0);
 		c_n0 = j.get_int("c_n0", 0);
 	}
 
-	static public AltosGPSSat fromHashSet(AltosHashSet h, AltosGPSSat def) {
-		if (h == null)
-			return def;
-		return new AltosGPSSat(h);
-	}
-
 	static public AltosGPSSat[] json_array(AltosJson j) {
 		if (j == null)
 			return null;
@@ -74,43 +56,5 @@ public class AltosGPSSat implements AltosJsonable {
 			sats[i] = new AltosGPSSat(j.get(i));
 		return sats;
 	}
-
-	static public AltosGPSSat[] array(String string) {
-
-		if (string == null)
-			return null;
-
-		try {
-			StringReader 		reader = new StringReader(string);
-			ArrayList<AltosGPSSat>	array = new ArrayList<AltosGPSSat>();
-			String			element;
-
-			while ((element = AltosHashSet.get_token(reader)) != null) {
-				AltosGPSSat sat = AltosGPSSat.fromHashSet(AltosHashSet.fromString(element), null);
-				if (sat != null)
-					array.add(sat);
-			}
-			return array.toArray(new AltosGPSSat[0]);
-		} catch (IOException ie) {
-			return null;
-		}
-	}
-
-	public static String toString(AltosGPSSat[] sats) {
-		if (sats == null)
-			return null;
-
-		try {
-			StringWriter		writer = new StringWriter();
-
-			for (AltosGPSSat g : sats) {
-				String		element = g.hashSet().toString();
-				AltosHashSet.put_token(writer, element);
-			}
-			return writer.toString();
-		} catch (IOException ie) {
-			return null;
-		}
-	}
 }