diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2018-08-24 15:22:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-24 15:22:57 +0200 |
| commit | 502bc55cf4f8dd4b9f3cc1a06d7f52c9ba1e9ff5 (patch) | |
| tree | ff0f3007a2b2d394ce45dc8c7b57e20fff63da31 /nad | |
| parent | e1e7c15ef358ac516f06198c2832e7ab52e8dc20 (diff) | |
| parent | f05de97c210ece96da6f230465e483e0cfff2c7d (diff) | |
| download | PROJ-502bc55cf4f8dd4b9f3cc1a06d7f52c9ba1e9ff5.tar.gz PROJ-502bc55cf4f8dd4b9f3cc1a06d7f52c9ba1e9ff5.zip | |
Merge pull request #1093 from rouault/geoc_flag_fix
Assorted fixes related to +geoc flag handing
Diffstat (limited to 'nad')
| -rwxr-xr-x | nad/testvarious | 37 | ||||
| -rw-r--r-- | nad/tv_out.dist | 12 |
2 files changed, 35 insertions, 14 deletions
diff --git a/nad/testvarious b/nad/testvarious index 30d1402f..c0a8ff29 100755 --- a/nad/testvarious +++ b/nad/testvarious @@ -139,20 +139,29 @@ $EXE +proj=geocent +datum=WGS84 \ 0.00 -0.00 6356752.31 EOF # -#echo "#############################################################" >> ${OUT} -#echo Test conversion between geocentric latlong and geodetic latlong >> ${OUT} -# -# The +geoc flag does not currently work with pj_transform() so this is -# disabled. -# -#$EXE +proj=latlong +datum=WGS84 +geoc \ -# +to +proj=latlong +datum=WGS84 \ -# -E >>${OUT} <<EOF -#0d00'00.000"W 0d00'00.000"N 0.0 -#79d00'00.000"W 45d00'00.000"N 0.0 -#12d00'00.000"W 45d00'00.000"N 0.0 -#0d00'00.000"W 90d00'00.000"N 0.0 -#EOF +echo "#############################################################" >> ${OUT} +echo Test conversion from geocentric latlong to geodetic latlong >> ${OUT} +# +$EXE +proj=latlong +datum=WGS84 +geoc \ + +to +proj=latlong +datum=WGS84 \ + -E >>${OUT} <<EOF +0d00'00.000"W 0d00'00.000"N 0.0 +79d00'00.000"W 45d00'00.000"N 0.0 +12d00'00.000"W 45d00'00.000"N 0.0 +0d00'00.000"W 90d00'00.000"N 0.0 +EOF +# +echo "#############################################################" >> ${OUT} +echo Test conversion from geodetic latlong to geocentric latlong >> ${OUT} +# +$EXE +proj=latlong +datum=WGS84 \ + +to +proj=latlong +datum=WGS84 +geoc \ + -E >>${OUT} <<EOF +0d00'00.000"W 0d00'00.000"N 0.0 +79d00'00.000"W 44d48'27.276"N 0.000 +12d00'00.000"W 44d48'27.276"N 0.0 +0d00'00.000"W 90d00'00.000"N 0.0 +EOF # echo "##############################################################" >> ${OUT} echo "Test stere projection (re: win32 ticket 12)" >> ${OUT} diff --git a/nad/tv_out.dist b/nad/tv_out.dist index 743eeabe..f04e2c35 100644 --- a/nad/tv_out.dist +++ b/nad/tv_out.dist @@ -42,6 +42,18 @@ Test geocentric x/y/z consumption. 6378147.00 -0.00 0.00 0dE 0dN 10.000 861996.98 -4434590.01 4487348.41 79dW 45dN 0.001 0.00 -0.00 6356752.31 0dE 90dN -0.004 +############################################################# +Test conversion from geocentric latlong to geodetic latlong +0d00'00.000"W 0d00'00.000"N 0.0 0dE 0dN 0.000 +79d00'00.000"W 45d00'00.000"N 0.0 79dW 44d48'27.276"N 0.000 +12d00'00.000"W 45d00'00.000"N 0.0 12dW 44d48'27.276"N 0.000 +0d00'00.000"W 90d00'00.000"N 0.0 0dE 90dN 0.000 +############################################################# +Test conversion from geodetic latlong to geocentric latlong +0d00'00.000"W 0d00'00.000"N 0.0 0dE 0dN 0.000 +79d00'00.000"W 44d48'27.276"N 0.000 79dW 45dN 0.000 +12d00'00.000"W 44d48'27.276"N 0.0 12dW 45dN 0.000 +0d00'00.000"W 90d00'00.000"N 0.0 0dE 90dN 0.000 ############################################################## Test stere projection (re: win32 ticket 12) 105 40 5577808.93 1494569.40 0.00 |