Merge branch 'new-packet-format' of ssh://git.gag.com/scm/git/fw/altos into new-package-format

1 files changed, 13 insertions, 2 deletions

diff --git a/ao-tools/altosui/AltosGreatCircle.java b/ao-tools/altosui/AltosGreatCircle.java
index 878da03e..07c02c16 100644
--- a/ao-tools/altosui/AltosGreatCircle.java
+++ b/ao-tools/altosui/AltosGreatCircle.java
@@ -17,6 +17,8 @@
 
 package altosui;
 
+import altosui.AltosGPS;
+
 import java.lang.Math;
 
 public class AltosGreatCircle {
@@ -28,8 +30,8 @@ public class AltosGreatCircle {
 	static final double rad = Math.PI / 180;
 	static final double earth_radius = 6371.2 * 1000;	/* in meters */
 
-	AltosGreatCircle (double start_lat, double start_lon,
-			  double end_lat, double end_lon)
+	public AltosGreatCircle (double start_lat, double start_lon,
+				 double end_lat, double end_lon)
 	{
 		double lat1 = rad * start_lat;
 		double lon1 = rad * -start_lon;
@@ -63,4 +65,13 @@ public class AltosGreatCircle {
 		distance = d * earth_radius;
 		bearing = course * 180/Math.PI;
 	}
+
+	public AltosGreatCircle(AltosGPS start, AltosGPS end) {
+		this(start.lat, start.lon, end.lat, end.lon);
+	}
+
+	public AltosGreatCircle() {
+		distance = 0;
+		bearing = 0;
+	}
 }