aboutsummaryrefslogtreecommitdiff
path: root/test/cli
diff options
context:
space:
mode:
authorKristian Evers <kristianevers@gmail.com>2019-08-27 00:10:15 +0200
committerKristian Evers <kristianevers@gmail.com>2019-08-27 00:10:15 +0200
commitf059b90ab4c52a67344886a76deecaeb53299ebd (patch)
tree72711ba7247051c71f48af8db382ddef0ce60e50 /test/cli
parent5a504f5491c83f2e185ee3e5a72140257c1c79de (diff)
parentbdaf9a883ec640c1db66217788cbfbc4a0a4a254 (diff)
downloadPROJ-f059b90ab4c52a67344886a76deecaeb53299ebd.tar.gz
PROJ-f059b90ab4c52a67344886a76deecaeb53299ebd.zip
Merge remote-tracking branch 'osgeo/master'6.2.0
Diffstat (limited to 'test/cli')
-rwxr-xr-xtest/cli/testvarious12
-rw-r--r--test/cli/tv_out.dist6
2 files changed, 18 insertions, 0 deletions
diff --git a/test/cli/testvarious b/test/cli/testvarious
index 836158ca..6c00ba13 100755
--- a/test/cli/testvarious
+++ b/test/cli/testvarious
@@ -985,6 +985,18 @@ $EXE -f %.7f -I +proj=longlat +ellps=GRS80 +to +proj=ob_tran +o_proj=longlat +lo
-122 46
EOF
+echo "##############################################################" >> ${OUT}
+echo "Check +init=epsg:4326 +over +to +init=epsg:3857 +over" >> ${OUT}
+$EXE -f %.7f +init=epsg:4326 +over +to +init=epsg:3857 +over -E >>${OUT} <<EOF
+-181 49
+EOF
+
+echo "##############################################################" >> ${OUT}
+echo "Check +proj=longlat +over +datum=WGS84 +to proj=merc +a=6378137 +b=6378137 +lat_ts=0 +lon_0=0 +x_0=0 +y_0=0 +k=1 +units=m +nadgrids=@null +over" >> ${OUT}
+$EXE -f %.7f +proj=longlat +over +datum=WGS84 +to proj=merc +a=6378137 +b=6378137 +lat_ts=0 +lon_0=0 +x_0=0 +y_0=0 +k=1 +units=m +nadgrids=@null +over -E >>${OUT} <<EOF
+-181 49
+EOF
+
# Done!
# do 'diff' with distribution results
diff --git a/test/cli/tv_out.dist b/test/cli/tv_out.dist
index 13987332..8720a124 100644
--- a/test/cli/tv_out.dist
+++ b/test/cli/tv_out.dist
@@ -473,3 +473,9 @@ 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
+##############################################################
+Check +init=epsg:4326 +over +to +init=epsg:3857 +over
+-181 49 -20148827.8335825 6274861.3940066 0.0000000
+##############################################################
+Check +proj=longlat +over +datum=WGS84 +to proj=merc +a=6378137 +b=6378137 +lat_ts=0 +lon_0=0 +x_0=0 +y_0=0 +k=1 +units=m +nadgrids=@null +over
+-181 49 -20148827.8335825 6274861.3940066 0.0000000