diff options
| author | Frank Warmerdam <warmerdam@pobox.com> | 2012-12-07 21:52:03 +0000 |
|---|---|---|
| committer | Frank Warmerdam <warmerdam@pobox.com> | 2012-12-07 21:52:03 +0000 |
| commit | f1f1f9f2aea725663499f449961027df2b38e296 (patch) | |
| tree | c79e7af878791bd20b845f8340caeea3cc57ea66 /src/geod_set.c | |
| parent | 927b539faa5686624d2681ffeadad827e583365c (diff) | |
| download | PROJ-f1f1f9f2aea725663499f449961027df2b38e296.tar.gz PROJ-f1f1f9f2aea725663499f449961027df2b38e296.zip | |
replacement of geodesic engine with one from Charles Karney (#197)
git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@2297 4e78687f-474d-0410-85f9-8d5e500ac6b2
Diffstat (limited to 'src/geod_set.c')
| -rw-r--r-- | src/geod_set.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/geod_set.c b/src/geod_set.c index 141091a9..eaadce52 100644 --- a/src/geod_set.c +++ b/src/geod_set.c @@ -3,7 +3,7 @@ #include <string.h> #include "projects.h" -#include "geodesic.h" +#include "geod_interface.h" #include "emess.h" void geod_set(int argc, char **argv) { @@ -32,16 +32,8 @@ geod_set(int argc, char **argv) { fr_meter = 1. / (to_meter = atof(unit_list[i].to_meter)); } else to_meter = fr_meter = 1.; - if ((ellipse = es) != 0.) { - onef = sqrt(1. - es); - geod_f = 1 - onef; - f2 = geod_f/2; - f4 = geod_f/4; - f64 = geod_f*geod_f/64; - } else { - onef = 1.; - geod_f = f2 = f4 = f64 = 0.; - } + geod_f = es/(1 + sqrt(1 - es)); + geod_ini(); /* check if line or arc mode */ if (pj_param(NULL,start, "tlat_1").i) { double del_S; |