summaryrefslogtreecommitdiff
path: root/altoslib/AltosGreatCircle.java
diff options
context:
space:
mode:
authorBdale Garbee <bdale@gag.com>2016-06-17 10:00:10 -0600
committerBdale Garbee <bdale@gag.com>2016-06-17 10:00:10 -0600
commit31cf047113ec72a78f4b500223a2c6be23bc86fd (patch)
tree4f171ddf642fb06bd1b520cd98a242efe5f8320f /altoslib/AltosGreatCircle.java
parent2f0c977c747824d0798550ac64eceb1d66c50efd (diff)
parentafe74c067a31ce420d0d4cdac2069c1d258a5114 (diff)
Merge branch 'master' into branch-1.6
Diffstat (limited to 'altoslib/AltosGreatCircle.java')
-rw-r--r--altoslib/AltosGreatCircle.java9
1 files changed, 6 insertions, 3 deletions
diff --git a/altoslib/AltosGreatCircle.java b/altoslib/AltosGreatCircle.java
index de3904bf..a2f12807 100644
--- a/altoslib/AltosGreatCircle.java
+++ b/altoslib/AltosGreatCircle.java
@@ -15,12 +15,12 @@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altoslib_10;
+package org.altusmetrum.altoslib_11;
import java.lang.Math;
import java.io.*;
-public class AltosGreatCircle implements Cloneable, Serializable {
+public class AltosGreatCircle implements Cloneable {
public double distance;
public double bearing;
public double range;
@@ -71,7 +71,10 @@ public class AltosGreatCircle implements Cloneable, Serializable {
course = 2 * Math.PI-course;
}
distance = d * earth_radius;
- bearing = course * 180/Math.PI;
+ if (Double.isNaN(course) || Double.isInfinite(course))
+ bearing = 0;
+ else
+ bearing = course * 180/Math.PI;
double height_diff = end_alt - start_alt;
range = Math.sqrt(distance * distance + height_diff * height_diff);