From 142dc13264b1ef7a647944f4f05e7bbb0358ebdd Mon Sep 17 00:00:00 2001
From: Frank Warmerdam <warmerdam@pobox.com>
Date: Tue, 9 Jul 2013 03:41:41 +0000
Subject: add calcofi projection (#135)

git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@2376 4e78687f-474d-0410-85f9-8d5e500ac6b2
---
 nad/testvarious | 17 +++++++++++++++++
 nad/tv_out.dist |  9 +++++++++
 2 files changed, 26 insertions(+)

(limited to 'nad')

diff --git a/nad/testvarious b/nad/testvarious
index c1e7f0a2..63ac8423 100755
--- a/nad/testvarious
+++ b/nad/testvarious
@@ -432,6 +432,23 @@ $EXE -f '%.14f' \
  -E >>${OUT} <<EOF
 -6086629.0 4488761.0
 EOF
+echo "##############################################################" >> ${OUT}
+echo "Test forward calcofi projection" >> ${OUT}
+$EXE +proj=latlong +ellps=clrk66 \
+ +to +proj=calcofi +ellps=clrk66 \
+ -E >>${OUT} <<EOF
+120d40'42.273"W	38d56'50.766"N
+121d9'W	34d9'N
+123d59'56.066"W	30d25'4.617"N
+EOF
+echo "Test inverse calcofi projection" >> ${OUT}
+$EXE +proj=calcofi +ellps=clrk66 \
+ +to +proj=longlat +ellps=clrk66 \
+ -E >>${OUT} <<EOF
+60 20
+80 60 
+90 120
+EOF
 ##############################################################################
 # Done! 
 # do 'diff' with distribution results
diff --git a/nad/tv_out.dist b/nad/tv_out.dist
index 8027fca5..7d5a7f28 100644
--- a/nad/tv_out.dist
+++ b/nad/tv_out.dist
@@ -193,3 +193,12 @@ Test pconic (#148)
 ##############################################################
 Test laea
 -6086629.0 4488761.0	156.05863798859943	37.76545829867844 0.00000000000000
+##############################################################
+Test forward calcofi projection
+120d40'42.273"W	38d56'50.766"N	60.00	20.00 0.00
+121d9'W	34d9'N	80.00	60.00 0.00
+123d59'56.066"W	30d25'4.617"N	90.00	120.00 0.00
+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
-- 
cgit v1.2.3