X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosGreatCircle.java;h=9ec808a5ca74e0c3b9e93d6a4a489d224d550448;hb=2a4d741872449b5332f28e018fa3acc53ed7d891;hp=4f9345179ab3ae77adfd42427532768cefdd3754;hpb=643c2fb03833d658320f476ef731bbb06fe3cc31;p=fw%2Faltos

diff --git a/altoslib/AltosGreatCircle.java b/altoslib/AltosGreatCircle.java
index 4f934517..9ec808a5 100644
--- a/altoslib/AltosGreatCircle.java
+++ b/altoslib/AltosGreatCircle.java
@@ -15,12 +15,12 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_11;
 
 import java.lang.Math;
 import java.io.*;
 
-public class AltosGreatCircle implements Cloneable, Serializable {
+public class AltosGreatCircle implements Cloneable, AltosHashable {
 	public double	distance;
 	public double	bearing;
 	public double	range;
@@ -103,4 +103,31 @@ public class AltosGreatCircle implements Cloneable, Serializable {
 		range = 0;
 		elevation = 0;
 	}
+
+	public AltosHashSet hashSet() {
+		AltosHashSet h = new AltosHashSet();
+
+		h.putDouble("distance", distance);
+		h.putDouble("bearing", bearing);
+		h.putDouble("range", range);
+		h.putDouble("elevation", elevation);
+
+		return h;
+	}
+
+	public AltosGreatCircle(AltosHashSet h) {
+		this();
+
+		distance = h.getDouble("distance", distance);
+		bearing = h.getDouble("bearing", bearing);
+		range = h.getDouble("range", range);
+		elevation = h.getDouble("elevation", elevation);
+	}
+
+	public static AltosGreatCircle fromHashSet(AltosHashSet h, AltosGreatCircle def) {
+		if (h == null)
+			return def;
+
+		return new AltosGreatCircle(h);
+	}
 }