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

diff --git a/altoslib/AltosGreatCircle.java b/altoslib/AltosGreatCircle.java
index 4f934517..f2c1783d 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, AltosJsonable {
 	public double	distance;
 	public double	bearing;
 	public double	range;
@@ -103,4 +103,31 @@ public class AltosGreatCircle implements Cloneable, Serializable {
 		range = 0;
 		elevation = 0;
 	}
+
+	public AltosJson json() {
+		AltosJson j = new AltosJson();
+
+		j.put("distance", distance);
+		j.put("bearing", bearing);
+		j.put("range", range);
+		j.put("elevation", elevation);
+
+		return j;
+	}
+
+	public AltosGreatCircle(AltosJson j) {
+		this();
+
+		distance = j.get_double("distance", distance);
+		bearing = j.get_double("bearing", bearing);
+		range = j.get_double("range", range);
+		elevation = j.get_double("elevation", elevation);
+	}
+
+	public static AltosGreatCircle fromJson(AltosJson j, AltosGreatCircle def) {
+		if (j == null)
+			return def;
+
+		return new AltosGreatCircle(j);
+	}
 }