From 818f6a9c153cd924d02ea9fc693a661ebc9b99ea Mon Sep 17 00:00:00 2001
From: Frank Warmerdam <warmerdam@pobox.com>
Date: Mon, 21 Feb 2011 16:24:03 +0000
Subject: added extended transverse mercator implementation (#97)

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

(limited to 'nad')

diff --git a/nad/testvarious b/nad/testvarious
index ce2ed2a5..69bd949d 100755
--- a/nad/testvarious
+++ b/nad/testvarious
@@ -176,6 +176,57 @@ $EXE +proj=latlong +a=6377298.556 +rf=300.8017 \
  -E >>${OUT} <<EOF
 116d2'11.12630 5d54'19.90183
 EOF
+echo "##############################################################" >> ${OUT}
+echo "Test extended transverse mercator (#97)" >> ${OUT}
+#
+$EXE +proj=etmerc +k=0.998 +lon_0=-20 +datum=WGS84 +x_0=10000 +y_0=20000 \
+ +to +proj=latlong +datum=WGS84 \
+ -E >>${OUT} <<EOF
+10000 20000
+500000 2000000  
+1000000 2000000  
+2000000 2000000  
+4000000 2000000  
+EOF
+#
+echo "##############################################################" >> ${OUT}
+echo "Test extended transverse mercator inverse (#97)" >> ${OUT}
+#
+$EXE +proj=latlong +datum=WGS84 \
+ +to +proj=etmerc +k=0.998 +lon_0=-20 +datum=WGS84 +x_0=10000 +y_0=20000 \
+ -E >>${OUT} <<EOF
+0dN 0.000
+15d22'16.108"W	17d52'53.478"N 0.000  
+10d40'55.532"W	17d42'48.526"N 0.000  
+1d32'21.33"W	17d3'47.233"N 0.000  
+15d4'42.357"E	14d48'56.372"N 0.000  
+EOF
+#
+echo "##############################################################" >> ${OUT}
+echo "Test transverse mercator (#97)" >> ${OUT}
+#
+$EXE +proj=tmerc +k=0.998 +lon_0=-20 +datum=WGS84 +x_0=10000 +y_0=20000 \
+ +to +proj=latlong +datum=WGS84 \
+ -E >>${OUT} <<EOF
+10000 20000
+500000 2000000  
+1000000 2000000  
+2000000 2000000  
+4000000 2000000  
+EOF
+#
+echo "##############################################################" >> ${OUT}
+echo "Test transverse mercator inverse (#97)" >> ${OUT}
+#
+$EXE +proj=latlong +datum=WGS84 \
+ +to +proj=tmerc +k=0.998 +lon_0=-20 +datum=WGS84 +x_0=10000 +y_0=20000 \
+ -E >>${OUT} <<EOF
+0dN 0.000
+15d22'16.108"W	17d52'53.478"N 0.000  
+10d40'55.532"W	17d42'48.526"N 0.000  
+1d32'21.33"W	17d3'47.233"N 0.000  
+15d4'42.357"E	14d48'56.372"N 0.000  
+EOF
 #
 ##############################################################################
 # Done! 
diff --git a/nad/tv_out.dist b/nad/tv_out.dist
index 828e7229..d7215a2b 100644
--- a/nad/tv_out.dist
+++ b/nad/tv_out.dist
@@ -52,3 +52,31 @@ Test sts projection (re: ticket 12)
 ##############################################################
 Test RSO Borneo projection (re: ticket 62)
 116d2'11.12630 5d54'19.90183	704570.40	653979.68 0.00
+##############################################################
+Test extended transverse mercator (#97)
+10000 20000	20dW	0dN 0.000
+500000 2000000	15d22'16.108"W	17d52'53.478"N 0.000  
+1000000 2000000	10d40'55.532"W	17d42'48.526"N 0.000  
+2000000 2000000	1d32'21.33"W	17d3'47.233"N 0.000  
+4000000 2000000	15d4'42.357"E	14d48'56.372"N 0.000  
+##############################################################
+Test extended transverse mercator inverse (#97)
+0dN 0.000	2278817.00	20000.00 0.00
+15d22'16.108"W	17d52'53.478"N 0.000	499999.99	2000000.01 0.00  
+10d40'55.532"W	17d42'48.526"N 0.000	999999.99	1999999.99 0.00  
+1d32'21.33"W	17d3'47.233"N 0.000	2000000.00	1999999.99 0.00  
+15d4'42.357"E	14d48'56.372"N 0.000	4000000.00	2000000.01 0.00  
+##############################################################
+Test transverse mercator (#97)
+10000 20000	20dW	0dN 0.000
+500000 2000000	15d22'16.108"W	17d52'53.478"N 0.000  
+1000000 2000000	10d40'55.532"W	17d42'48.526"N 0.000  
+2000000 2000000	1d32'21.399"W	17d3'47.244"N 0.000  
+4000000 2000000	15d4'6.539"E	14d49'7.331"N 0.000  
+##############################################################
+Test transverse mercator inverse (#97)
+0dN 0.000	2278812.96	20000.00 0.00
+15d22'16.108"W	17d52'53.478"N 0.000	499999.99	2000000.01 0.00  
+10d40'55.532"W	17d42'48.526"N 0.000	999999.99	1999999.99 0.00  
+1d32'21.33"W	17d3'47.233"N 0.000	2000000.03	1999999.62 0.00  
+15d4'42.357"E	14d48'56.372"N 0.000	3999967.33	1999855.31 0.00  
-- 
cgit v1.2.3