diff options
| author | Frank Warmerdam <warmerdam@pobox.com> | 2005-12-04 14:47:37 +0000 |
|---|---|---|
| committer | Frank Warmerdam <warmerdam@pobox.com> | 2005-12-04 14:47:37 +0000 |
| commit | 8f16680e0302bd3cb901f871d9ca578e8a40fc9e (patch) | |
| tree | e7bc2ff90e59a8767cc37b06ceceaf9d9083ff29 /src/pj_transform.c | |
| parent | 85d45256efdc41f7245f87bb4ca63dbaf163705e (diff) | |
| download | PROJ-8f16680e0302bd3cb901f871d9ca578e8a40fc9e.tar.gz PROJ-8f16680e0302bd3cb901f871d9ca578e8a40fc9e.zip | |
use symbolic names as per patch from Martin Vermeer
git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@1315 4e78687f-474d-0410-85f9-8d5e500ac6b2
Diffstat (limited to 'src/pj_transform.c')
| -rw-r--r-- | src/pj_transform.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/src/pj_transform.c b/src/pj_transform.c index a2411fd5..4934914f 100644 --- a/src/pj_transform.c +++ b/src/pj_transform.c @@ -30,6 +30,9 @@ ****************************************************************************** * * $Log$ + * Revision 1.15 2005/12/04 14:47:37 fwarmerdam + * use symbolic names as per patch from Martin Vermeer + * * Revision 1.14 2004/11/05 06:05:11 fwarmerdam * Fixed pj_geocentric_to_geodetic() to not try and process HUGE_VAL values * (those that have failed some previous transform step). Related to bug:5B @@ -465,9 +468,9 @@ int pj_geocentric_to_wgs84( PJ *defn, if( x[io] == HUGE_VAL ) continue; - x[io] = x[io] + defn->datum_params[0]; - y[io] = y[io] + defn->datum_params[1]; - z[io] = z[io] + defn->datum_params[2]; + x[io] = x[io] + Dx_BF; + y[io] = y[io] + Dy_BF; + z[io] = z[io] + Dz_BF; } } else if( defn->datum_type == PJD_7PARAM ) @@ -515,9 +518,9 @@ int pj_geocentric_from_wgs84( PJ *defn, if( x[io] == HUGE_VAL ) continue; - x[io] = x[io] - defn->datum_params[0]; - y[io] = y[io] - defn->datum_params[1]; - z[io] = z[io] - defn->datum_params[2]; + x[io] = x[io] - Dx_BF; + y[io] = y[io] - Dy_BF; + z[io] = z[io] - Dz_BF; } } else if( defn->datum_type == PJD_7PARAM ) @@ -593,13 +596,13 @@ int pj_datum_transform( PJ *srcdefn, PJ *dstdefn, CHECK_RETURN; src_a = SRS_WGS84_SEMIMAJOR; - src_es = 0.006694379990; + src_es = SRS_WGS84_ESQUARED; } if( dstdefn->datum_type == PJD_GRIDSHIFT ) { dst_a = SRS_WGS84_SEMIMAJOR; - dst_es = 0.006694379990; + dst_es = SRS_WGS84_ESQUARED; } /* ==================================================================== */ |