From bea351ac5c3e3c1facb4aa668b79fb0ca287f451 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@mines-paris.org>
Date: Wed, 17 Sep 2014 09:07:29 +0000
Subject: Add clrk80ign ellipsoid and use it in carthage datum definition
 (#245)

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

(limited to 'nad')

diff --git a/nad/testvarious b/nad/testvarious
index fded86ea..4c427cd3 100755
--- a/nad/testvarious
+++ b/nad/testvarious
@@ -681,6 +681,22 @@ $EXE -f '%.12f' \
  -E >>${OUT} <<EOF
 987122.4183302754536 -14429896.5395309105515
 EOF
+echo "##############################################################" >> ${OUT}
+echo "Test bug 245 (use +datum=carthage)" >> ${OUT}
+#
+$EXE -f '%.12f' \
+     +proj=longlat +datum=WGS84 +nodefs +to +proj=utm +zone=32 +datum=carthage +nodefs \
+ -E >>${OUT} <<EOF
+10 34
+EOF
+echo "##############################################################" >> ${OUT}
+echo "Test bug 245 (use expension of +datum=carthage)" >> ${OUT}
+#
+$EXE -f '%.12f' \
+     +proj=longlat +datum=WGS84 +nodefs +to +proj=utm +zone=32 +a=6378249.2 +b=6356515 +towgs84=-263.0,6.0,431.0 +nodefs \
+ -E >>${OUT} <<EOF
+10 34
+EOF
 ##############################################################################
 # Done!
 # do 'diff' with distribution results
diff --git a/nad/tv_out.dist b/nad/tv_out.dist
index 31230bdc..a9d5120c 100644
--- a/nad/tv_out.dist
+++ b/nad/tv_out.dist
@@ -324,3 +324,9 @@ Test bug 244
 ##############################################################
 Test bug 244 (2)
 987122.4183302754536 -14429896.5395309105515	-140.100000000000	-87.000000000000 0.000000000000
+##############################################################
+Test bug 245 (use +datum=carthage)
+10 34	592302.981946153101	3762148.734061029274 -30.311017032713
+##############################################################
+Test bug 245 (use expension of +datum=carthage)
+10 34	592302.981946153101	3762148.734061030205 -30.311017032713
-- 
cgit v1.2.3