altoslib: Remove AltosHashSet code

[fw/altos] / altoslib / AltosGreatCircle.java

diff --git a/altoslib/AltosGreatCircle.java b/altoslib/AltosGreatCircle.java
index 8fd380a100ada00c645698460426dbd56223adc4..f2c1783ddda69ac9509b7c2574fc78a48e7f5350 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.*;
 
 import java.lang.Math;
 import java.io.*;
 

-public class AltosGreatCircle implements Cloneable, AltosHashable, AltosJsonable {
+public class AltosGreatCircle implements Cloneable, AltosJsonable {

        public double   distance;
        public double   bearing;
        public double   range;
        public double   distance;
        public double   bearing;
        public double   range;


@@ -104,17 +104,6 @@ public class AltosGreatCircle implements Cloneable, AltosHashable, AltosJsonable
                elevation = 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 AltosJson json() {
                AltosJson j = new AltosJson();
 
        public AltosJson json() {
                AltosJson j = new AltosJson();
 


@@ -126,22 +115,6 @@ public class AltosGreatCircle implements Cloneable, AltosHashable, AltosJsonable
                return j;
        }
 
                return j;
        }
 

-       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);
-       }
-

        public AltosGreatCircle(AltosJson j) {
                this();
 
        public AltosGreatCircle(AltosJson j) {
                this();