Switch from GPLv2 to GPLv2+

[fw/altos] / altoslib / AltosGreatCircle.java

diff --git a/altoslib/AltosGreatCircle.java b/altoslib/AltosGreatCircle.java
index 4782c34d34d858ed6fd361594ae69befb1853120..6e5bd362372f4c633b423594b94cb37e296bb420 100644 (file)
--- a/altoslib/AltosGreatCircle.java
+++ b/altoslib/AltosGreatCircle.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,9 +16,10 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_4;
+package org.altusmetrum.altoslib_11;
 
 import java.lang.Math;
+import java.io.*;
 
 public class AltosGreatCircle implements Cloneable {
        public double   distance;
@@ -27,8 +29,8 @@ public class AltosGreatCircle implements Cloneable {
 
        double sqr(double a) { return a * a; }
 
-       static final double rad = Math.PI / 180;
-       static final double earth_radius = 6371.2 * 1000;       /* in meters */
+       public static final double rad = Math.PI / 180;
+       public static final double earth_radius = 6371.2 * 1000;        /* in meters */
 
        public static final int BEARING_LONG = AltosConvert.BEARING_LONG;
        public static final int BEARING_SHORT = AltosConvert.BEARING_SHORT;
@@ -70,7 +72,10 @@ public class AltosGreatCircle implements Cloneable {
                                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);