diff options
| author | Johannes Hofmann <Johannes.Hofmann@gmx.de> | 2008-05-28 19:22:39 +0200 |
|---|---|---|
| committer | Johannes Hofmann <Johannes.Hofmann@gmx.de> | 2008-05-28 19:22:39 +0200 |
| commit | 83699b53de7288b1ffb5a4c901730bee32524f4d (patch) | |
| tree | d6e929015630324b9e85d674af335c704d0cb1f2 /src/Panorama.cxx | |
| parent | 47dbcc5c434c293da10039eb56a8393926b3137a (diff) | |
| parent | 2dfdc09969b8c32887cb45b6f7ff286227ddfd27 (diff) | |
merge projection fixes
Diffstat (limited to 'src/Panorama.cxx')
| -rw-r--r-- | src/Panorama.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/Panorama.cxx b/src/Panorama.cxx index 06754ae..5f59103 100644 --- a/src/Panorama.cxx +++ b/src/Panorama.cxx @@ -413,8 +413,11 @@ Panorama::update_coordinates() { double Panorama::distance(double phi, double lam) { - return acos(sin(view_phi) * sin(phi) + - cos(view_phi) * cos(phi) * cos(view_lam - lam)); + double d_lam = view_lam - lam; + + return atan2(sqrt(pow(cos(phi) * sin(d_lam), 2.0) + + pow(cos(view_phi) * sin(phi) - sin(view_phi) * cos(phi) * cos(d_lam), 2.0)), + sin(view_phi) * sin(phi) + cos(view_phi) * cos(phi) * cos(d_lam)); } double @@ -438,7 +441,6 @@ Panorama::refraction(const Hill *m) { return c * get_real_distance(m) / (2000.0 * (1.0 + a)); } - double Panorama::nick(const Hill *m) { double b, c, theta = refraction(m); |