diff options
| author | Frank Warmerdam <warmerdam@pobox.com> | 2003-09-16 03:46:21 +0000 |
|---|---|---|
| committer | Frank Warmerdam <warmerdam@pobox.com> | 2003-09-16 03:46:21 +0000 |
| commit | 6b961a0dcaeaf9fa900cb9c4bf1df0073998413e (patch) | |
| tree | 96e8e035e92719d9a2bd859a646db126e3e6bffe /src/pj_init.c | |
| parent | a23c58598fab2a7b897600fa7d8cc11e7da9fb7a (diff) | |
| download | PROJ-6b961a0dcaeaf9fa900cb9c4bf1df0073998413e.tar.gz PROJ-6b961a0dcaeaf9fa900cb9c4bf1df0073998413e.zip | |
dont use default ellps if any earth model info is set: bug 386
git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@1158 4e78687f-474d-0410-85f9-8d5e500ac6b2
Diffstat (limited to 'src/pj_init.c')
| -rw-r--r-- | src/pj_init.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/pj_init.c b/src/pj_init.c index 5bb17638..d64ba84b 100644 --- a/src/pj_init.c +++ b/src/pj_init.c @@ -30,6 +30,9 @@ ****************************************************************************** * * $Log$ + * Revision 1.13 2003/09/16 03:46:21 warmerda + * dont use default ellps if any earth model info is set: bug 386 + * * Revision 1.12 2003/08/21 02:15:59 warmerda * improve MAX_ARG checking * @@ -81,9 +84,15 @@ get_opt(FILE *fid, char *name, paralist *next) { break; } } else if (!first && !pj_param(start, sword).i) { - /* don't default ellipse if datum is set */ + /* don't default ellipse if datum, ellps or any earth model + information is set. */ if( strncmp(word,"ellps=",6) != 0 - || !pj_param(start, "tdatum").i ) + || (!pj_param(start, "tdatum").i + && !pj_param(start, "tellps").i + && !pj_param(start, "ta").i + && !pj_param(start, "tb").i + && !pj_param(start, "trf").i + && !pj_param(start, "tf").i) ) { next = next->next = pj_mkparam(word); } |