aboutsummaryrefslogtreecommitdiff
path: root/src/geod_interface.c
diff options
context:
space:
mode:
authorFrank Warmerdam <warmerdam@pobox.com>2013-05-10 03:19:09 +0000
committerFrank Warmerdam <warmerdam@pobox.com>2013-05-10 03:19:09 +0000
commita7bbac84cc8f3b2681d33ecf671a1ce81cee1072 (patch)
treeadc69679d604a44591347ee860206593378c9e3b /src/geod_interface.c
parent1a41cfd9f5b4874bed644bf7b2f76c573171564f (diff)
downloadPROJ-a7bbac84cc8f3b2681d33ecf671a1ce81cee1072.tar.gz
PROJ-a7bbac84cc8f3b2681d33ecf671a1ce81cee1072.zip
Major upgrade to geodesic support from Charles Karney (#197).
Syncs geodesic routines with GeographicLib. Adds geodesic.3 man page. geod_* api exposed publically. geodesic.h is installed. git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@2333 4e78687f-474d-0410-85f9-8d5e500ac6b2
Diffstat (limited to 'src/geod_interface.c')
-rw-r--r--src/geod_interface.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/geod_interface.c b/src/geod_interface.c
index c144a35d..dc757282 100644
--- a/src/geod_interface.c
+++ b/src/geod_interface.c
@@ -2,20 +2,20 @@
#include "geod_interface.h"
void geod_ini(void) {
- GeodesicInit(&GlobalGeodesic, geod_a, geod_f);
+ geod_init(&GlobalGeodesic, geod_a, geod_f);
}
void geod_pre(void) {
double
degree = PI/180,
lat1 = phi1 / degree, lon1 = lam1 /degree, azi1 = al12 / degree;
- GeodesicLineInit(&GlobalGeodesicLine, &GlobalGeodesic,
+ geod_lineinit(&GlobalGeodesicLine, &GlobalGeodesic,
lat1, lon1, azi1, 0U);
}
void geod_for(void) {
double degree = PI/180, s12 = geod_S, lat2, lon2, azi2;
- Position(&GlobalGeodesicLine, s12, &lat2, &lon2, &azi2);
+ geod_position(&GlobalGeodesicLine, s12, &lat2, &lon2, &azi2);
azi2 += azi2 >= 0 ? -180 : 180; /* Compute back azimuth */
phi2 = lat2 * degree;
lam2 = lon2 * degree;
@@ -28,7 +28,7 @@ void geod_inv(void) {
lat1 = phi1 / degree, lon1 = lam1 / degree,
lat2 = phi2 / degree, lon2 = lam2 / degree,
azi1, azi2, s12;
- Inverse(&GlobalGeodesic, lat1, lon1, lat2, lon2, &s12, &azi1, &azi2);
+ geod_inverse(&GlobalGeodesic, lat1, lon1, lat2, lon2, &s12, &azi1, &azi2);
azi2 += azi2 >= 0 ? -180 : 180; /* Compute back azimuth */
al12 = azi1 * degree; al21 = azi2 * degree; geod_S = s12;
}