aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Warmerdam <warmerdam@pobox.com>2014-09-17 06:16:31 +0000
committerFrank Warmerdam <warmerdam@pobox.com>2014-09-17 06:16:31 +0000
commitf0f919db8d222eb4b45e295adbe0fc9337bf6ed0 (patch)
tree5d071afc3fe67acaafa7ebfbac1b24e2ff5a1fe8
parent36f9b4b4f7e0d8d02a16f54c49349baedd1958fd (diff)
downloadPROJ-f0f919db8d222eb4b45e295adbe0fc9337bf6ed0.tar.gz
PROJ-f0f919db8d222eb4b45e295adbe0fc9337bf6ed0.zip
update with less wide results for ntv2, and results from ntv2_100325.zip NTv2 file
git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@2547 4e78687f-474d-0410-85f9-8d5e500ac6b2
-rw-r--r--nad/ntv2_out.dist12
-rwxr-xr-xnad/testntv24
2 files changed, 8 insertions, 8 deletions
diff --git a/nad/ntv2_out.dist b/nad/ntv2_out.dist
index 61dff4f0..5ce26e6e 100644
--- a/nad/ntv2_out.dist
+++ b/nad/ntv2_out.dist
@@ -1,11 +1,11 @@
##############################################################
Point in the ONwinsor subgrid.
-82d00'00.000"W 42d00'00.000"N 0.0 81d59'59.61037"W 42d0'0.1602"N 0.000
-82d00'01.000"W 42d00'00.000"N 0.0 82d0'0.610403"W 42d0'0.160204"N 0.000
-82d00'02.000"W 42d00'00.000"N 0.0 82d0'1.610436"W 42d0'0.160209"N 0.000
-84d00'00.000"W 42d00'00.000"N 0.0 83d59'59.85928"W 42d0'0.18003"N 0.000
+82d00'00.000"W 42d00'00.000"N 0.0 81d59'59.6104"W 42d0'0.1602"N 0.000
+82d00'01.000"W 42d00'00.000"N 0.0 82d0'0.6104"W 42d0'0.1602"N 0.000
+82d00'02.000"W 42d00'00.000"N 0.0 82d0'1.6104"W 42d0'0.1602"N 0.000
+84d00'00.000"W 42d00'00.000"N 0.0 83d59'59.8593"W 42d0'0.18"N 0.000
##############################################################
Try with NTv2 and NTv1 together ... falls back to NTv1
-99d00'00.000"W 65d00'00.000"N 0.0 99d0'1.58847"W 65d0'1.34815"N 0.000
-111d00'00.000"W 46d00'00.000"N 0.0 111d0'3.15487"W 45d59'59.75279"N 0.000
+99d00'00.000"W 65d00'00.000"N 0.0 99d0'1.5885"W 65d0'1.3482"N 0.000
+111d00'00.000"W 46d00'00.000"N 0.0 111d0'3.1549"W 45d59'59.7528"N 0.000
111d00'00.000"W 47d30'00.000"N 0.0 111d0'2.7989"W 47d29'59.9896"N 0.000
diff --git a/nad/testntv2 b/nad/testntv2
index 4a4cfb28..5a9e1a73 100755
--- a/nad/testntv2
+++ b/nad/testntv2
@@ -35,7 +35,7 @@ echo "##############################################################" >> ${OUT}
echo Point in the ONwinsor subgrid. >> ${OUT}
#
$EXE +proj=latlong +ellps=clrk66 +nadgrids=ntv2_0.gsb \
- +to +proj=latlong +datum=NAD83 -E -w6 >>${OUT} <<EOF
+ +to +proj=latlong +datum=NAD83 -E -w4 >>${OUT} <<EOF
82d00'00.000"W 42d00'00.000"N 0.0
82d00'01.000"W 42d00'00.000"N 0.0
82d00'02.000"W 42d00'00.000"N 0.0
@@ -46,7 +46,7 @@ echo "##############################################################" >> ${OUT}
echo Try with NTv2 and NTv1 together ... falls back to NTv1 >> ${OUT}
#
$EXE +proj=latlong +ellps=clrk66 +nadgrids=ntv2_0.gsb,ntv1_can.dat,conus \
- +to +proj=latlong +datum=NAD83 -E -w6 >>${OUT} <<EOF
+ +to +proj=latlong +datum=NAD83 -E -w4 >>${OUT} <<EOF
99d00'00.000"W 65d00'00.000"N 0.0
111d00'00.000"W 46d00'00.000"N 0.0
111d00'00.000"W 47d30'00.000"N 0.0