diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2019-06-23 09:59:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-23 09:59:18 +0200 |
| commit | b5ac170f7a0ac68127392644249bc2390db5eb76 (patch) | |
| tree | 64464696efbb64beda9f9122121609f810c94cdb | |
| parent | fcc696819c84f5794004a7db0bd40f8e2e784632 (diff) | |
| parent | 5771ac6d4f0ce28c6f9602af2a43ab900edda32c (diff) | |
| download | PROJ-b5ac170f7a0ac68127392644249bc2390db5eb76.tar.gz PROJ-b5ac170f7a0ac68127392644249bc2390db5eb76.zip | |
+proj=ob_tran +o_proj=longlat: set right unit to PJ_IO_UNITS_WHATEVER so as to be able to chain with unitconvert (fixes #1525) (#1526)
+proj=ob_tran +o_proj=longlat: set right unit to PJ_IO_UNITS_WHATEVER so as to be able to chain with unitconvert (fixes #1525)
| -rw-r--r-- | src/projections/ob_tran.cpp | 2 | ||||
| -rwxr-xr-x | test/cli/testvarious | 10 | ||||
| -rw-r--r-- | test/cli/tv_out.dist | 5 |
3 files changed, 16 insertions, 1 deletions
diff --git a/src/projections/ob_tran.cpp b/src/projections/ob_tran.cpp index f9eaa6f0..4ae8dbe7 100644 --- a/src/projections/ob_tran.cpp +++ b/src/projections/ob_tran.cpp @@ -242,7 +242,7 @@ PJ *PROJECTION(ob_tran) { /* Support some rather speculative test cases, where the rotated projection */ /* is actually latlong. We do not want scaling in that case... */ if (Q->link->right==PJ_IO_UNITS_RADIANS) - P->right = PJ_IO_UNITS_PROJECTED; + P->right = PJ_IO_UNITS_WHATEVER; return P; diff --git a/test/cli/testvarious b/test/cli/testvarious index 2e2d854c..836158ca 100755 --- a/test/cli/testvarious +++ b/test/cli/testvarious @@ -975,6 +975,16 @@ $EXE -f %.7f ITRF2000 ITRF1993 -E >> ${OUT} <<EOF 59.4967 -117.61748 329.396 1988 EOF +echo "##############################################################" >> ${OUT} +echo "Check ob_tran with o_proj=longlat (#1525)" >> ${OUT} +$EXE -f %.7f +proj=longlat +ellps=GRS80 +to +proj=ob_tran +o_proj=longlat +lon_0=10 +o_lat_p=90 +ellps=GRS80 -E >>${OUT} <<EOF +-122 46 +EOF +echo "Test inverse handling" >> ${OUT} +$EXE -f %.7f -I +proj=longlat +ellps=GRS80 +to +proj=ob_tran +o_proj=longlat +lon_0=10 +o_lat_p=90 +ellps=GRS80 -E >>${OUT} <<EOF +-122 46 +EOF + # Done! # do 'diff' with distribution results diff --git a/test/cli/tv_out.dist b/test/cli/tv_out.dist index dcda5275..13987332 100644 --- a/test/cli/tv_out.dist +++ b/test/cli/tv_out.dist @@ -468,3 +468,8 @@ Test EPSG:4896 to EPSG:7930 Test ITRF2000 to ITRF1993 59.4967 -117.61748 329.396 59.4967002 -117.6174799 329.3845529 59.4967 -117.61748 329.396 59.4967002 -117.6174799 329.3845529 1988 +############################################################## +Check ob_tran with o_proj=longlat (#1525) +-122 46 -132.0000000 46.0000000 0.0000000 +Test inverse handling +-122 46 -112.0000000 46.0000000 0.0000000 |