aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Warmerdam <warmerdam@pobox.com>2013-10-21 02:39:28 +0000
committerFrank Warmerdam <warmerdam@pobox.com>2013-10-21 02:39:28 +0000
commit9d16ee4a12ab0b9cb73f84aa0f9da23d5d474cf3 (patch)
tree48f9acb4f2d9444835d66623e8a735b59d86645c
parent8fb066c1172583527c2331c086f006dc621435ef (diff)
downloadPROJ-9d16ee4a12ab0b9cb73f84aa0f9da23d5d474cf3.tar.gz
PROJ-9d16ee4a12ab0b9cb73f84aa0f9da23d5d474cf3.zip
partially apply realpix improvements (#219)
git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@2397 4e78687f-474d-0410-85f9-8d5e500ac6b2
-rwxr-xr-xnad/testvarious56
-rw-r--r--nad/tv_out.dist40
2 files changed, 96 insertions, 0 deletions
diff --git a/nad/testvarious b/nad/testvarious
index 7954f57c..36257347 100755
--- a/nad/testvarious
+++ b/nad/testvarious
@@ -262,6 +262,20 @@ $EXE +proj=latlong +a=1 +lon_0=0 \
0 41.81031
-90 0
EOF
+$EXE +proj=latlong +R=5 \
+ +to +proj=healpix +R=5 -f '%.'5'f' \
+ -E >>${OUT} <<EOF
+0 0
+0 41.810314895778596
+0 -41.810314895778596
+90.0 0
+-90.0 0
+-180 0
+-180 90.0
+-180 -90.0
+0 60.0
+0 -60.0
+EOF
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\
@@ -269,6 +283,20 @@ $EXE +proj=latlong +a=1 +lon_0=0 \
0 0.7853981633974483
-1.5707963267948966 0
EOF
+$EXE +proj=latlong +a=5 \
+ +to +proj=healpix +a=5 -f '%.'5'f' -I\
+ -E >>${OUT} <<EOF
+0.0 0.0
+0.0 3.9269908169872414
+0.0 -3.9269908169872414
+7.853981633974483 0.0
+-7.853981633974483 0.0
+-15.707963267948966 0.0
+-11.780972450961723 7.853981633974483
+-11.780972450961723 -7.853981633974483
+1.437378399445537 5.364369216432778
+1.437378399445537 -5.364369216432778
+EOF
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' \
@@ -276,6 +304,20 @@ $EXE +proj=latlong +a=1 +lon_0=0 +ellps=WGS84 \
0 41.937853904844985
-90 0
EOF
+$EXE +proj=latlong +a=5 +e=0.8 +r_a=4.3220011711888882\
+ +to +proj=healpix +a=5 +e=0.8 +r_a=4.3220011711888882 -f '%.'5'f' \
+ -E >>${OUT} <<EOF
+0 0
+0 41.810314895778596
+0 -41.810314895778596
+90.0 0
+-90.0 0
+-180 0
+-180 90.0
+-180 -90.0
+0 60.0
+0 -60.0
+EOF
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\
@@ -283,6 +325,20 @@ $EXE +proj=latlong +a=1 +lon_0=0 +ellps=WGS84 \
0 0.7853981633974483
-1.5707963267948966 0
EOF
+$EXE +proj=latlong +a=5 +e=0.8 +r_a=4.3220011711888882\
+ +to +proj=healpix +a=5 +e=0.8 +r_a=4.3220011711888882 -f '%.'5'f' -I\
+ -E >>${OUT} <<EOF
+0.0 0.0
+0.0 2.0547874222147415
+0.0 -2.0547874222147415
+6.788983564106746 0.0
+-6.788983564106746 0.0
+-13.577967128213492 0.0
+-10.183475346160119 6.788983564106746
+-10.183475346160119 -6.788983564106746
+0.0 3.351278550178025
+0.0 -3.351278550178025
+EOF
echo "##############################################################" >> ${OUT}
echo "Test forward projection on sphere" >> ${OUT}
$EXE +proj=latlong +a=1 +lon_0=0 \
diff --git a/nad/tv_out.dist b/nad/tv_out.dist
index 7ae77a3e..48c5b252 100644
--- a/nad/tv_out.dist
+++ b/nad/tv_out.dist
@@ -95,15 +95,55 @@ Test robinson projection (#113)
Test healpix forward projection on sphere
0 41.81031 0.00000 0.78540 0.00000
-90 0 -1.57080 0.00000 0.00000
+0 0 0.00000 0.00000 0.00000
+0 41.810314895778596 0.00000 3.92699 0.00000
+0 -41.810314895778596 0.00000 -3.92699 0.00000
+90.0 0 7.85398 0.00000 0.00000
+-90.0 0 -7.85398 0.00000 0.00000
+-180 0 -15.70796 0.00000 0.00000
+-180 90.0 -19.63495 7.85398 0.00000
+-180 -90.0 -19.63495 -7.85398 0.00000
+0 60.0 1.43738 5.36437 0.00000
+0 -60.0 1.43738 -5.36437 0.00000
Test healpix inverse projection on sphere
0 0.7853981633974483 0.00000 41.81031 0.00000
-1.5707963267948966 0 -90.00000 0.00000 0.00000
+0.0 0.0 0.00000 0.00000 0.00000
+0.0 3.9269908169872414 0.00000 41.81031 0.00000
+0.0 -3.9269908169872414 0.00000 -41.81031 0.00000
+7.853981633974483 0.0 90.00000 0.00000 0.00000
+-7.853981633974483 0.0 -90.00000 0.00000 0.00000
+-15.707963267948966 0.0 -180.00000 0.00000 0.00000
+-11.780972450961723 7.853981633974483 -180.00000 90.00000 0.00000
+-11.780972450961723 -7.853981633974483 -180.00000 -90.00000 0.00000
+1.437378399445537 5.364369216432778 0.00000 60.00000 0.00000
+1.437378399445537 -5.364369216432778 0.00000 -60.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
+0 0 0.00000 0.00000 0.00000
+0 41.810314895778596 0.00000 2.05479 0.00000
+0 -41.810314895778596 0.00000 -2.05479 0.00000
+90.0 0 6.78898 0.00000 0.00000
+-90.0 0 -6.78898 0.00000 0.00000
+-180 0 -13.57797 0.00000 0.00000
+-180 90.0 -16.97246 6.78898 0.00000
+-180 -90.0 -16.97246 -6.78898 0.00000
+0 60.0 0.00000 3.35128 0.00000
+0 -60.0 0.00000 -3.35128 0.00000
Test healpix inverse projection on ellipsoid
0 0.7853981633974483 * * 0.00000
-1.5707963267948966 0 -90.10072 0.00000 0.00000
+0.0 0.0 0.00000 0.00000 0.00000
+0.0 2.0547874222147415 0.00000 39.58811 0.00000
+0.0 -2.0547874222147415 0.00000 -39.58811 0.00000
+6.788983564106746 0.0 90.00000 0.00000 0.00000
+-6.788983564106746 0.0 -90.00000 0.00000 0.00000
+-13.577967128213492 0.0 -180.00000 0.00000 0.00000
+-10.183475346160119 6.788983564106746 -180.00000 90.00000 0.00000
+-10.183475346160119 -6.788983564106746 -180.00000 -90.00000 0.00000
+0.0 3.351278550178025 0.00000 59.23640 0.00000
+0.0 -3.351278550178025 0.00000 -59.23640 0.00000
##############################################################
Test forward projection on sphere
0 41.81031 0.00000 0.78540 0.00000