altoslib: Store saved state in version-independent format

[fw/altos] / altoslib / AltosGreatCircle.java

diff --git a/altoslib/AltosGreatCircle.java b/altoslib/AltosGreatCircle.java
index 03e056784219e2f29c80138b2c5b9d37a7ed6eda..9ec808a5ca74e0c3b9e93d6a4a489d224d550448 100644 (file)
--- a/altoslib/AltosGreatCircle.java
+++ b/altoslib/AltosGreatCircle.java
@@ -20,7 +20,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);
+       }
 }