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

diff --git a/altoslib/AltosGPS.java b/altoslib/AltosGPS.java
index d3710e4e..ba2eda1b 100644
--- a/altoslib/AltosGPS.java
+++ b/altoslib/AltosGPS.java
@@ -21,7 +21,7 @@ import java.text.*;
 import java.util.concurrent.*;
 import java.io.*;
 
-public class AltosGPS implements Cloneable, AltosHashable, AltosJsonable {
+public class AltosGPS implements Cloneable, AltosJsonable {
 
 	public final static int MISSING = AltosLib.MISSING;
 
@@ -389,34 +389,6 @@ public class AltosGPS implements Cloneable, AltosHashable, AltosJsonable {
 		}
 	}
 
-	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 AltosJson json() {
 		AltosJson	j = new AltosJson();
 
@@ -445,32 +417,6 @@ public class AltosGPS implements Cloneable, AltosHashable, AltosJsonable {
 		return j;
 	}
 
-	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 AltosGPS(AltosJson j) {
 		init();
 		nsat = j.get_int("nsat", nsat);
@@ -497,13 +443,6 @@ public class AltosGPS implements Cloneable, AltosHashable, AltosJsonable {
 		cc_gps_sat = AltosGPSSat.json_array(j.get("cc_gps_sat"));
 	}
 
-	public static AltosGPS fromHashSet(AltosHashSet h, AltosGPS def) {
-		if (h == null)
-			return def;
-
-		return new AltosGPS(h);
-	}
-
 	public static AltosGPS fromJson(AltosJson j, AltosGPS def) {
 		if (j == null)
 			return def;