aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Knudsen <busstoptaktik@users.noreply.github.com>2018-02-01 16:52:10 +0100
committerKristian Evers <kristianevers@gmail.com>2018-02-01 16:52:10 +0100
commitdd9cd3f821295f4095d3a261bfd9be26065e60b7 (patch)
tree3043e38c5d1a6a87463422c92386b2b45d49d2f0
parentb48f7ba228c06ab53d624779e4023d83bd6c352b (diff)
downloadPROJ-dd9cd3f821295f4095d3a261bfd9be26065e60b7.tar.gz
PROJ-dd9cd3f821295f4095d3a261bfd9be26065e60b7.zip
expand proj_geoc_lat to proj_geocentric_latitude (#751)
-rw-r--r--src/PJ_geoc.c4
-rw-r--r--src/pj_factors.c2
-rw-r--r--src/pj_fwd.c4
-rw-r--r--src/pj_inv.c4
-rw-r--r--src/proj.def2
-rw-r--r--src/proj.h2
-rw-r--r--src/proj_4D_api.c2
7 files changed, 10 insertions, 10 deletions
diff --git a/src/PJ_geoc.c b/src/PJ_geoc.c
index 20064f65..038da600 100644
--- a/src/PJ_geoc.c
+++ b/src/PJ_geoc.c
@@ -35,12 +35,12 @@ PROJ_HEAD(geoc, "Geocentric Latitude");
/* Geographical to geocentric */
static PJ_COORD forward(PJ_COORD coo, PJ *P) {
- return proj_geoc_lat (P, PJ_FWD, coo);
+ return proj_geocentric_latitude (P, PJ_FWD, coo);
}
/* Geocentric to geographical */
static PJ_COORD inverse(PJ_COORD coo, PJ *P) {
- return proj_geoc_lat (P, PJ_INV, coo);
+ return proj_geocentric_latitude (P, PJ_INV, coo);
}
diff --git a/src/pj_factors.c b/src/pj_factors.c
index 6ba993b9..17b39c10 100644
--- a/src/pj_factors.c
+++ b/src/pj_factors.c
@@ -47,7 +47,7 @@ int pj_factors(LP lp, const PJ *P, double h, struct FACTORS *fac) {
/* If input latitudes are geocentric, convert to geographic */
if (P->geoc)
- lp = proj_geoc_lat (P, PJ_INV, coo).lp;
+ lp = proj_geocentric_latitude (P, PJ_INV, coo).lp;
/* If latitude + one step overshoots the pole, move it slightly inside, */
/* so the numerical derivative still exists */
diff --git a/src/pj_fwd.c b/src/pj_fwd.c
index 0509858a..66b86aab 100644
--- a/src/pj_fwd.c
+++ b/src/pj_fwd.c
@@ -63,7 +63,7 @@ static PJ_COORD pj_fwd_prepare (PJ *P, PJ_COORD coo) {
/* If input latitude is geocentrical, convert to geographical */
if (P->geoc)
- coo = proj_geoc_lat (P, PJ_INV, coo);
+ coo = proj_geocentric_latitude (P, PJ_INV, coo);
/* Ensure longitude is in the -pi:pi range */
if (0==P->over)
@@ -150,7 +150,7 @@ static PJ_COORD pj_fwd_finalize (PJ *P, PJ_COORD coo) {
/* If input latitude was geocentrical, convert back to geocentrical */
if (P->geoc)
- coo = proj_geoc_lat (P, PJ_FWD, coo);
+ coo = proj_geocentric_latitude (P, PJ_FWD, coo);
/* Distance from central meridian, taking system zero meridian into account */
diff --git a/src/pj_inv.c b/src/pj_inv.c
index 45e43820..5e44eb34 100644
--- a/src/pj_inv.c
+++ b/src/pj_inv.c
@@ -67,7 +67,7 @@ static PJ_COORD pj_inv_prepare (PJ *P, PJ_COORD coo) {
/* If input latitude is geocentrical, convert to geographical */
if (P->geoc)
- coo = proj_geoc_lat (P, PJ_INV, coo);
+ coo = proj_geocentric_latitude (P, PJ_INV, coo);
/* Distance from central meridian, taking system zero meridian into account */
coo.lp.lam = (coo.lp.lam + P->from_greenwich) - P->lam0;
@@ -160,7 +160,7 @@ static PJ_COORD pj_inv_finalize (PJ *P, PJ_COORD coo) {
/* If input latitude was geocentrical, convert back to geocentrical */
if (P->geoc)
- coo = proj_geoc_lat (P, PJ_FWD, coo);
+ coo = proj_geocentric_latitude (P, PJ_FWD, coo);
}
return coo;
diff --git a/src/proj.def b/src/proj.def
index 17300395..f2936edb 100644
--- a/src/proj.def
+++ b/src/proj.def
@@ -139,7 +139,7 @@ EXPORTS
proj_torad @128
proj_todeg @129
- proj_geoc_lat @130
+ proj_geocentric_latitude @130
proj_rtodms @131
proj_dmstor @132
diff --git a/src/proj.h b/src/proj.h
index 0921eb51..c3165cfe 100644
--- a/src/proj.h
+++ b/src/proj.h
@@ -375,7 +375,7 @@ double proj_torad (double angle_in_degrees);
double proj_todeg (double angle_in_radians);
/* Geographical to geocentric latitude - another of the "simple, but useful" */
-PJ_COORD proj_geoc_lat (const PJ *P, PJ_DIRECTION direction, PJ_COORD coo);
+PJ_COORD proj_geocentric_latitude (const PJ *P, PJ_DIRECTION direction, PJ_COORD coo);
double proj_dmstor(const char *is, char **rs);
char* proj_rtodms(char *s, double r, int pos, int neg);
diff --git a/src/proj_4D_api.c b/src/proj_4D_api.c
index c91b0786..af4bae45 100644
--- a/src/proj_4D_api.c
+++ b/src/proj_4D_api.c
@@ -342,7 +342,7 @@ size_t proj_trans_generic (
/*************************************************************************************/
-PJ_COORD proj_geoc_lat (const PJ *P, PJ_DIRECTION direction, PJ_COORD coo) {
+PJ_COORD proj_geocentric_latitude (const PJ *P, PJ_DIRECTION direction, PJ_COORD coo) {
/**************************************************************************************
Convert geographical latitude to geocentric (or the other way round if
direction = PJ_INV)