diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2018-11-24 11:19:45 +0100 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2018-11-29 00:35:25 +0100 |
| commit | 7e05bd0ff52fe3ba78dfd75f9ebebe3dfe715bca (patch) | |
| tree | 81ac2fb48b5434104c2c5061dbc2a1e2b35edc13 /src/pj_transform.c | |
| parent | c57e293fbf2b79a24519c70d558e1268515a9ee6 (diff) | |
| download | PROJ-7e05bd0ff52fe3ba78dfd75f9ebebe3dfe715bca.tar.gz PROJ-7e05bd0ff52fe3ba78dfd75f9ebebe3dfe715bca.zip | |
Add unit test for pj_tranform() now that cs2cs no longer use it
Diffstat (limited to 'src/pj_transform.c')
| -rw-r--r-- | src/pj_transform.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/pj_transform.c b/src/pj_transform.c index f6210822..6982676e 100644 --- a/src/pj_transform.c +++ b/src/pj_transform.c @@ -195,7 +195,7 @@ static int geographic_to_projected (PJ *P, long n, int dist, double *x, double * if (P->is_geocent) return 0; - if(P->fwd3d != NULL) + if(P->fwd3d != NULL && !(z == NULL && P->is_latlong)) { /* Three dimensions must be defined */ if ( z == NULL) @@ -292,6 +292,8 @@ static int projected_to_geographic (PJ *P, long n, int dist, double *x, double * /* Nothing to do? */ if (P->is_latlong && !P->geoc && P->vto_meter == 1.0) return 0; + if (P->is_geocent) + return 0; /* Check first if projection is invertible. */ if( (P->inv3d == NULL) && (P->inv == NULL)) @@ -303,7 +305,7 @@ static int projected_to_geographic (PJ *P, long n, int dist, double *x, double * } /* If invertible - First try inv3d if defined */ - if (P->inv3d != NULL) + if (P->inv3d != NULL && !(z == NULL && P->is_latlong)) { /* Three dimensions must be defined */ if ( z == NULL) |