Add clrk80ign ellipsoid and use it in carthage datum definition (OSGe…

…o#245) git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@2553 4e78687f-474d-0410-85f9-8d5e500ac6b2
GangShao · Sep 17, 2014 · bea351a · bea351a
1 parent 6569e26
commit bea351a
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2014-19-08 Even Rouault <[email protected]>
+
+	* src/pj_datums.c, src/pj_ellps.c: Add clrk80ign ellipsoid and use it
+	in carthage datum def (#245)
+
 2014-09-16  Frank Warmerdam  <[email protected]>
 
 	* Generate 4.9.0 RC2. 

diff --git 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
@@ -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
diff --git a/src/pj_datums.c b/src/pj_datums.c
@@ -49,7 +49,7 @@ C_NAMESPACE_VAR struct PJ_DATUMS pj_datums[] = {
                                                      "clrk66", 
 				"North_American_Datum_1927",
 "potsdam",  "towgs84=598.1,73.7,418.2,0.202,0.045,-2.455,6.7",  "bessel",  "Potsdam Rauenberg 1950 DHDN",
-"carthage",  "towgs84=-263.0,6.0,431.0",  "clrk80",  "Carthage 1934 Tunisia",
+"carthage",  "towgs84=-263.0,6.0,431.0",  "clrk80ign",  "Carthage 1934 Tunisia",
 "hermannskogel", "towgs84=577.326,90.129,463.919,5.137,1.474,5.297,2.4232",  "bessel",  "Hermannskogel",
 "ire65",  "towgs84=482.530,-130.596,564.557,-1.042,-0.214,-0.631,8.15",  "mod_airy",  "Ireland 1965",
 "nzgd49",    "towgs84=59.47,-5.04,187.44,0.47,-0.1,1.024,-4.5993", "intl", "New Zealand Geodetic Datum 1949",

diff --git a/src/pj_ellps.c b/src/pj_ellps.c
@@ -19,6 +19,7 @@ pj_ellps[] = {
 "bess_nam",	"a=6377483.865", "rf=299.1528128", "Bessel 1841 (Namibia)",
 "clrk66",	"a=6378206.4", "b=6356583.8", "Clarke 1866",
 "clrk80",	"a=6378249.145", "rf=293.4663", "Clarke 1880 mod.",
+"clrk80ign","a=6378249.2", "rf=293.4660212936269", "Clarke 1880 (IGN).",
 "CPM",  	"a=6375738.7", "rf=334.29", "Comm. des Poids et Mesures 1799",
 "delmbr",	"a=6376428.",  "rf=311.5", "Delambre 1810 (Belgium)",
 "engelis",	"a=6378136.05", "rf=298.2566", "Engelis 1985",