aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Warmerdam <warmerdam@pobox.com>2013-10-20 17:56:21 +0000
committerFrank Warmerdam <warmerdam@pobox.com>2013-10-20 17:56:21 +0000
commitfb9b0c6b5de5eb937c74d3eab2ed376403cf1db9 (patch)
tree7b8ce3d1fad7281a679634d8b2a01bee2ea7b83f
parentcaccc265546d3f707112ed74e0a1e5543a97152e (diff)
downloadPROJ-fb9b0c6b5de5eb937c74d3eab2ed376403cf1db9.tar.gz
PROJ-fb9b0c6b5de5eb937c74d3eab2ed376403cf1db9.zip
update healpix results, add ob_tran inverse testig
git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@2387 4e78687f-474d-0410-85f9-8d5e500ac6b2
-rwxr-xr-xnad/testvarious22
-rw-r--r--nad/tv_out.dist30
2 files changed, 36 insertions, 16 deletions
diff --git a/nad/testvarious b/nad/testvarious
index 63ac8423..7954f57c 100755
--- a/nad/testvarious
+++ b/nad/testvarious
@@ -255,28 +255,28 @@ $EXE +proj=robin +datum=WGS84 \
1741397.30 4276351.58 0.00
EOF
echo "##############################################################" >> ${OUT}
-echo "Test forward projection on sphere" >> ${OUT}
+echo "Test healpix forward projection on sphere" >> ${OUT}
$EXE +proj=latlong +a=1 +lon_0=0 \
+to +proj=healpix +a=1 +lon_0=0 -f '%.'5'f' \
-E >>${OUT} <<EOF
0 41.81031
-90 0
EOF
-echo "Test inverse projection on sphere" >> ${OUT}
+echo "Test healpix inverse projection on sphere" >> ${OUT}
$EXE +proj=latlong +a=1 +lon_0=0 \
+to +proj=healpix +a=1 +lon_0=0 -f '%.'5'f' -I\
-E >>${OUT} <<EOF
0 0.7853981633974483
-1.5707963267948966 0
EOF
-echo "Test forward projection on ellipsoid" >> ${OUT}
+echo "Test healpix forward projection on ellipsoid" >> ${OUT}
$EXE +proj=latlong +a=1 +lon_0=0 +ellps=WGS84 \
+to +proj=healpix +a=1 +lon_0=0 +ellps=WGS84 -f '%.'5'f' \
-E >>${OUT} <<EOF
0 41.937853904844985
-90 0
EOF
-echo "Test inverse projection on ellipsoid" >> ${OUT}
+echo "Test healpix inverse projection on ellipsoid" >> ${OUT}
$EXE +proj=latlong +a=1 +lon_0=0 +ellps=WGS84 \
+to +proj=healpix +a=1 +lon_0=0 +ellps=WGS84 -f '%.'5'f' -I\
-E >>${OUT} <<EOF
@@ -449,6 +449,20 @@ $EXE +proj=calcofi +ellps=clrk66 \
80 60
90 120
EOF
+echo "##############################################################" >> ${OUT}
+echo "Check inverse error handling with ob_tran (#225)" >> ${OUT}
+$EXE +proj=ob_tran \
+ +o_proj=moll +o_lon_p=LON_POLE +o_lat_p=LAT_POLE +lon_0=180 +ellps=WGS84 \
+ -E >>${OUT} <<EOF
+300000 400000
+20000000 30000000
+EOF
+echo "Test inverse handling" >> ${OUT}
+$EXE -I +proj=ob_tran \
+ +o_proj=moll +o_lon_p=LON_POLE +o_lat_p=LAT_POLE +lon_0=180 +ellps=WGS84 \
+ -E >>${OUT} <<EOF
+10 20
+EOF
##############################################################################
# Done!
# do 'diff' with distribution results
diff --git a/nad/tv_out.dist b/nad/tv_out.dist
index 7d5a7f28..7ae77a3e 100644
--- a/nad/tv_out.dist
+++ b/nad/tv_out.dist
@@ -92,18 +92,18 @@ Test robinson projection (#113)
-2963455.42 4805073.65 0.00 35dW 45dN 0.000
1741397.30 4276351.58 0.00 20d0'0.002"E 40d0'0.066"N 0.000
##############################################################
-Test forward projection on sphere
+Test healpix forward projection on sphere
0 41.81031 0.00000 0.78540 0.00000
-90 0 -1.57080 0.00000 0.00000
-Test inverse projection on sphere
+Test healpix inverse projection on sphere
0 0.7853981633974483 0.00000 41.81031 0.00000
-1.5707963267948966 0 -90.00000 0.00000 0.00000
-Test forward projection on ellipsoid
-0 41.937853904844985 0.00000 0.78540 0.00000
--90 0 -1.57080 0.00000 0.00000
-Test inverse projection on ellipsoid
-0 0.7853981633974483 0.00000 41.93785 0.00000
--1.5707963267948966 0 -90.00000 0.00000 0.00000
+Test healpix forward projection on ellipsoid
+0 41.937853904844985 0.00000 0.78452 0.00000
+-90 0 -1.56904 0.00000 0.00000
+Test healpix inverse projection on ellipsoid
+0 0.7853981633974483 * * 0.00000
+-1.5707963267948966 0 -90.10072 0.00000 0.00000
##############################################################
Test forward projection on sphere
0 41.81031 0.00000 0.78540 0.00000
@@ -112,11 +112,11 @@ Test inverse projection on sphere
0 0.7853981633974483 0.00000 41.81031 0.00000
-1.5707963267948966 0 -90.00000 0.00000 0.00000
Test forward projection on ellipsoid
-0 41.937853904844985 0.00000 0.78540 0.00000
--90 0 -1.57080 0.00000 0.00000
+0 41.937853904844985 0.00000 0.78452 0.00000
+-90 0 -1.56904 0.00000 0.00000
Test inverse projection on ellipsoid
-0 0.7853981633974483 0.00000 41.93785 0.00000
--1.5707963267948966 0 -90.00000 0.00000 0.00000
+0 0.7853981633974483 * * 0.00000
+-1.5707963267948966 0 -90.10072 0.00000 0.00000
##############################################################
Test geos projection
Test geos on a sphere
@@ -202,3 +202,9 @@ Test inverse calcofi projection
60 20 120d40'42.273"W 38d56'50.766"N 0.000
80 60 121d9'W 34d9'N 0.000
90 120 123d59'56.066"W 30d25'4.617"N 0.000
+##############################################################
+Check inverse error handling with ob_tran (#225)
+300000 400000 42d45'22.377"W 85d35'28.083"N 0.000
+20000000 30000000 * * 0.000
+Test inverse handling
+10 20 -1384841.19 7581707.88 0.00