diff options
| author | Frank Warmerdam <warmerdam@pobox.com> | 2012-02-01 23:03:34 +0000 |
|---|---|---|
| committer | Frank Warmerdam <warmerdam@pobox.com> | 2012-02-01 23:03:34 +0000 |
| commit | faffa62c5414cf9d97e3d7d889ffa60657135129 (patch) | |
| tree | a9e8416d60d9ad73af1ca36bd70d2d5784302d47 /nad | |
| parent | dde549f375520ca0a752cb4699ebc1791746d286 (diff) | |
| download | PROJ-faffa62c5414cf9d97e3d7d889ffa60657135129.tar.gz PROJ-faffa62c5414cf9d97e3d7d889ffa60657135129.zip | |
ensure pj_apply_gridshift() supports points up to epsilon outside mesh (#141)
git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@2152 4e78687f-474d-0410-85f9-8d5e500ac6b2
Diffstat (limited to 'nad')
| -rw-r--r-- | nad/td_out.dist | 11 | ||||
| -rwxr-xr-x | nad/testdatumfile | 25 |
2 files changed, 36 insertions, 0 deletions
diff --git a/nad/td_out.dist b/nad/td_out.dist index 540d523e..060d14d2 100644 --- a/nad/td_out.dist +++ b/nad/td_out.dist @@ -12,3 +12,14 @@ Test MD used where available 79d58'00.000"W 36d58'00.000"N 0.0 79d57'59.128"W 36d58'0.501"N 0.000 79d58'00.000"W 37d02'00.000"N 0.0 79d57'59.126"W 37d2'0.501"N 0.000 79d58'00.000"W 36d58'00.000"N 0.0 79d57'59.128"W 36d58'0.501"N 0.000 +############################################################## +Test that we use grid shift files even if we are right on the +edge or even a wee bit outside (#141). +-5.5 52.0 -5.501106465528 51.999890470284 0.000000000000 +-5.5000000000001 52.0000000000001 -5.501106465529 51.999890470284 0.000000000000 +-5.4999 51.9999 -5.501006458305 51.999790470257 0.000000000000 +-5.5001 52.0 -5.500100000000 52.000000000000 0.000000000000 +-5.5 52.0 -5.498893534472 52.000109529716 0.000000000000 +-5.5000000000001 52.0000000000001 -5.498893534472 52.000109529717 0.000000000000 +-5.4999 51.9999 -5.498793541695 52.000009529743 0.000000000000 +-5.5001 52.0 -5.500100000000 52.000000000000 0.000000000000 diff --git a/nad/testdatumfile b/nad/testdatumfile index 0285e4cf..e03d1d8b 100755 --- a/nad/testdatumfile +++ b/nad/testdatumfile @@ -68,6 +68,31 @@ $EXE +proj=latlong +ellps=clrk66 +nadgrids=conus \ 79d58'00.000"W 36d58'00.000"N 0.0 EOF # +echo "##############################################################" >> ${OUT} +echo "Test that we use grid shift files even if we are right on the" >> ${OUT} +echo "edge or even a wee bit outside (#141)." >> ${OUT} +# +# Our test points are (1) right on mesh corner, (2) outside but within +# epsilon (3) inside a bit (4) outside by more than epsilon +# +$EXE +proj=latlong +ellps=WGS84 +nadgrids=ntf_r93.gsb \ + +to +proj=latlong +datum=WGS84 \ + -E -f "%.12f" >>${OUT} <<EOF +-5.5 52.0 +-5.5000000000001 52.0000000000001 +-5.4999 51.9999 +-5.5001 52.0 +EOF +# +$EXE +proj=latlong +datum=WGS84 \ + +to +proj=latlong +ellps=WGS84 +nadgrids=ntf_r93.gsb \ + -E -f "%.12f" >>${OUT} <<EOF +-5.5 52.0 +-5.5000000000001 52.0000000000001 +-5.4999 51.9999 +-5.5001 52.0 +EOF +# ############################################################################## # Done! # do 'diff' with distribution results |