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

diff --git a/altoslib/AltosGreatCircle.java b/altoslib/AltosGreatCircle.java
index 9ec808a5..f2c1783d 100644
--- 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, AltosHashable {
+public class AltosGreatCircle implements Cloneable, AltosJsonable {
 	public double	distance;
 	public double	bearing;
 	public double	range;
@@ -104,30 +104,30 @@ public class AltosGreatCircle implements Cloneable, AltosHashable {
 		elevation = 0;
 	}
 
-	public AltosHashSet hashSet() {
-		AltosHashSet h = new AltosHashSet();
+	public AltosJson json() {
+		AltosJson j = new AltosJson();
 
-		h.putDouble("distance", distance);
-		h.putDouble("bearing", bearing);
-		h.putDouble("range", range);
-		h.putDouble("elevation", elevation);
+		j.put("distance", distance);
+		j.put("bearing", bearing);
+		j.put("range", range);
+		j.put("elevation", elevation);
 
-		return h;
+		return j;
 	}
 
-	public AltosGreatCircle(AltosHashSet h) {
+	public AltosGreatCircle(AltosJson j) {
 		this();
 
-		distance = h.getDouble("distance", distance);
-		bearing = h.getDouble("bearing", bearing);
-		range = h.getDouble("range", range);
-		elevation = h.getDouble("elevation", elevation);
+		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 fromHashSet(AltosHashSet h, AltosGreatCircle def) {
-		if (h == null)
+	public static AltosGreatCircle fromJson(AltosJson j, AltosGreatCircle def) {
+		if (j == null)
 			return def;
 
-		return new AltosGreatCircle(h);
+		return new AltosGreatCircle(j);
 	}
 }