diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2018-06-22 10:52:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-22 10:52:22 +0200 |
| commit | 5c192b091fd5bf35742a34052fb53fcb3c276fd7 (patch) | |
| tree | 529784a9df53828c30f0295c42bd25c868940964 /src | |
| parent | 722f22dc585b37766153a4da37b9a829ab5b8ff7 (diff) | |
| parent | 275cbbaca08864867e6e3c7bf199a38204d3fffe (diff) | |
| download | PROJ-5c192b091fd5bf35742a34052fb53fcb3c276fd7.tar.gz PROJ-5c192b091fd5bf35742a34052fb53fcb3c276fd7.zip | |
Merge pull request #1055 from rouault/geocent_cart_to_meter
Make +proj=geocent and +proj=cart take into account +to_meter (relates to #1053)
Diffstat (limited to 'src')
| -rw-r--r-- | src/pj_fwd.c | 3 | ||||
| -rw-r--r-- | src/pj_inv.c | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/pj_fwd.c b/src/pj_fwd.c index b5f1b36e..2ed4c469 100644 --- a/src/pj_fwd.c +++ b/src/pj_fwd.c @@ -114,6 +114,9 @@ static PJ_COORD fwd_finalize (PJ *P, PJ_COORD coo) { if (P->is_geocent) { coo = proj_trans (P->cart, PJ_FWD, coo); } + coo.xyz.x *= P->fr_meter; + coo.xyz.y *= P->fr_meter; + coo.xyz.z *= P->fr_meter; break; diff --git a/src/pj_inv.c b/src/pj_inv.c index ca149674..d1a02bca 100644 --- a/src/pj_inv.c +++ b/src/pj_inv.c @@ -100,8 +100,12 @@ static PJ_COORD inv_prepare (PJ *P, PJ_COORD coo) { /* de-scale and de-offset */ case PJ_IO_UNITS_CARTESIAN: - if (P->is_geocent) + coo.xyz.x *= P->to_meter; + coo.xyz.y *= P->to_meter; + coo.xyz.z *= P->to_meter; + if (P->is_geocent) { coo = proj_trans (P->cart, PJ_INV, coo); + } return coo; |