aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Karney <charles@karney.com>2015-10-05 17:41:51 -0400
committerCharles Karney <charles@karney.com>2015-10-05 17:41:51 -0400
commit8f0427b4e1fd66a9d7fca90389ce4be209a4f42f (patch)
treef5f229641796592b2b9bb0d9c21ef1880cef265b
parentbe4798bc5eff6d564ed20d329996384d8afcb2d5 (diff)
parent34dc1f016fe31ed9b3cc134621960e7dd3650af0 (diff)
downloadPROJ-8f0427b4e1fd66a9d7fca90389ce4be209a4f42f.tar.gz
PROJ-8f0427b4e1fd66a9d7fca90389ce4be209a4f42f.zip
Merge pull request #314 from cffk/dmstor-fix
testvarious: shave one digit off the requested output for test bug 244
-rwxr-xr-xnad/testvarious4
-rw-r--r--nad/tv_out.dist4
2 files changed, 4 insertions, 4 deletions
diff --git a/nad/testvarious b/nad/testvarious
index 988b6d7b..c213456e 100755
--- a/nad/testvarious
+++ b/nad/testvarious
@@ -656,7 +656,7 @@ EOF
echo "##############################################################" >> ${OUT}
echo "Test bug 244 " >> ${OUT}
#
-$EXE -f '%.9f' \
+$EXE -f '%.8f' \
+init=epsg:4326 \
+to +proj=aeqd +lon_0=130.0 +lat_0=40.0 +a=6378137 +b=6378137 +units=m +no_defs \
-E >>${OUT} <<EOF
@@ -665,7 +665,7 @@ EOF
echo "##############################################################" >> ${OUT}
echo "Test bug 244 (2)" >> ${OUT}
#
-$EXE -f '%.12f' \
+$EXE -f '%.11f' \
+proj=aeqd +lon_0=130.0 +lat_0=40.0 +a=6378137 +b=6378137 +units=m +no_defs \
+to +init=epsg:4326 \
-E >>${OUT} <<EOF
diff --git a/nad/tv_out.dist b/nad/tv_out.dist
index 8cdd7074..76d5b1e2 100644
--- a/nad/tv_out.dist
+++ b/nad/tv_out.dist
@@ -307,10 +307,10 @@ Test bug 229 (2)
13 -10 13.0000000000000 -10.0000000000000 0.0000000000000
##############################################################
Test bug 244
--140.100000 -87.000000 987122.418330284 -14429896.539530909 0.000000000
+-140.100000 -87.000000 987122.41833028 -14429896.53953091 0.00000000
##############################################################
Test bug 244 (2)
-987122.418330284 -14429896.539530909 -140.100000000000 -87.000000000000 0.000000000000
+987122.418330284 -14429896.539530909 -140.10000000000 -87.00000000000 0.00000000000
##############################################################
Test bug 245 (use +datum=carthage)
10 34 592302.9819462 3762148.7340610 -30.3110170