diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2017-01-18 22:16:48 +0100 |
|---|---|---|
| committer | Kristian Evers <kristianevers@gmail.com> | 2017-01-18 22:16:48 +0100 |
| commit | 01fbd0ba628c82fe099efa2bb02cb37ddc882157 (patch) | |
| tree | abac77f504db45fb3d490a6c437c396f951a5ac8 | |
| parent | d8d7f8c7e40a484a665d2b1c3db7f18e3aa96800 (diff) | |
| download | PROJ-01fbd0ba628c82fe099efa2bb02cb37ddc882157.tar.gz PROJ-01fbd0ba628c82fe099efa2bb02cb37ddc882157.zip | |
Changed +ellps parameters of test pipelines. Originally +ellps was only set once in the pipeline which break tests on OSX. Moving the +ellps parameters to each +step of the pipelines seems to fix the OSX tests.
| -rw-r--r-- | src/PJ_pipeline.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/PJ_pipeline.c b/src/PJ_pipeline.c index 27fe6ec9..0dae0e59 100644 --- a/src/PJ_pipeline.c +++ b/src/PJ_pipeline.c @@ -525,7 +525,7 @@ int pj_pipeline_selftest (void) { double dist; /* forward-reverse geo->utm->geo */ - P = pj_create ("+proj=pipeline +ellps=GRS80 +zone=32 +step +proj=utm +step +proj=utm +inv"); + P = pj_create ("+proj=pipeline +zone=32 +step +proj=utm +ellps=GRS80 +step +proj=utm +ellps=GRS80 +inv"); if (0==P) return 1000; /* zero initialize everything, then set (longitude, latitude, height) to (12, 55, 0) */ @@ -547,7 +547,7 @@ int pj_pipeline_selftest (void) { pj_free (P); /* And now the back-to-back situation utm->geo->utm */ - P = pj_create ("+proj=pipeline +ellps=GRS80 +zone=32 +step +proj=utm +inv +step +proj=utm"); + P = pj_create ("+proj=pipeline +zone=32 +step +proj=utm +ellps=GRS80 +inv +step +proj=utm +ellps=GRS80"); if (0==P) return 2000; @@ -571,10 +571,11 @@ int pj_pipeline_selftest (void) { /* Finally testing a corner case: A rather pointless one-step pipeline geo->utm */ - P = pj_create ("+proj=pipeline +ellps=GRS80 +zone=32 +step +proj=utm"); + P = pj_create ("+proj=pipeline +zone=32 +step +proj=utm +ellps=GRS80 "); if (0==P) return 3000; + a = b = pj_obs_null; a.coo.lpz.lam = TORAD(12); a.coo.lpz.phi = TORAD(55); |