projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Get rid of manual JSON encoding stuff
[fw/altos]
/
altoslib
/
AltosGreatCircle.java
diff --git
a/altoslib/AltosGreatCircle.java
b/altoslib/AltosGreatCircle.java
index 22a8e0e53149de59db01ae11633df35730eac57b..a2f128074c89ebe29b446f7af027683762acf9b4 100644
(file)
--- a/
altoslib/AltosGreatCircle.java
+++ b/
altoslib/AltosGreatCircle.java
@@
-15,12
+15,12
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altoslib_
5
;
+package org.altusmetrum.altoslib_
11
;
import java.lang.Math;
import java.io.*;
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;
public double distance;
public double bearing;
public double range;
@@
-28,8
+28,8
@@
public class AltosGreatCircle implements Cloneable, Serializable {
double sqr(double a) { return a * a; }
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;
public static final int BEARING_LONG = AltosConvert.BEARING_LONG;
public static final int BEARING_SHORT = AltosConvert.BEARING_SHORT;
@@
-71,7
+71,10
@@
public class AltosGreatCircle implements Cloneable, Serializable {
course = 2 * Math.PI-course;
}
distance = d * earth_radius;
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);
double height_diff = end_alt - start_alt;
range = Math.sqrt(distance * distance + height_diff * height_diff);