X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosGreatCircle.java;h=2c84bf4a27534c607f0c517215e41f354fc0000d;hp=921356a59f0cc36ae9bfda643b8f300ea423a096;hb=2a6016cfabc8cd56f5219871e3b3df316a639289;hpb=8d1d8d2a3c129cdbd55427bcda0f26715b02f1ee

diff --git a/altoslib/AltosGreatCircle.java b/altoslib/AltosGreatCircle.java
index 921356a5..2c84bf4a 100644
--- a/altoslib/AltosGreatCircle.java
+++ b/altoslib/AltosGreatCircle.java
@@ -15,13 +15,15 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_1;
+package org.altusmetrum.altoslib_2;
 
 import java.lang.Math;
 
-public class AltosGreatCircle {
+public class AltosGreatCircle implements Cloneable {
 	public double	distance;
 	public double	bearing;
+	public double	range;
+	public double	elevation;
 
 	double sqr(double a) { return a * a; }
 
@@ -54,9 +56,8 @@ public class AltosGreatCircle {
 		return bearing_string[length][(int)((bearing / 90 * 8 + 1) / 2)%16];
 	}
 
-	public AltosGreatCircle (double start_lat, double start_lon,
-				 double end_lat, double end_lon)
-	{
+	public AltosGreatCircle (double start_lat, double start_lon, double start_alt,
+				 double end_lat, double end_lon, double end_alt) {
 		double lat1 = rad * start_lat;
 		double lon1 = rad * -start_lon;
 		double lat2 = rad * end_lat;
@@ -88,14 +89,35 @@ public class AltosGreatCircle {
 		}
 		distance = d * earth_radius;
 		bearing = course * 180/Math.PI;
+
+		double height_diff = end_alt - start_alt;
+		range = Math.sqrt(distance * distance + height_diff * height_diff);
+		elevation = Math.atan2(height_diff, distance) * 180 / Math.PI;
+	}
+
+	public AltosGreatCircle clone() {
+		AltosGreatCircle n = new AltosGreatCircle();
+
+		n.distance = distance;
+		n.bearing = bearing;
+		n.range = range;
+		n.elevation = elevation;
+		return n;
+	}
+
+	public AltosGreatCircle (double start_lat, double start_lon,
+				 double end_lat, double end_lon) {
+		this(start_lat, start_lon, 0, end_lat, end_lon, 0);
 	}
 
 	public AltosGreatCircle(AltosGPS start, AltosGPS end) {
-		this(start.lat, start.lon, end.lat, end.lon);
+		this(start.lat, start.lon, start.alt, end.lat, end.lon, end.alt);
 	}
 
 	public AltosGreatCircle() {
 		distance = 0;
 		bearing = 0;
+		range = 0;
+		elevation = 0;
 	}
 }