diff options
| author | Thomas Knudsen <busstoptaktik@users.noreply.github.com> | 2018-02-12 16:45:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-12 16:45:09 +0100 |
| commit | f1dd367c64de4f48eb48f6dcf17c2be93c7eaafc (patch) | |
| tree | d506bdb3f140af97421c0bc1a851be3a149f4e2b | |
| parent | a557b49e85ebfbfe0af076bc529002ca60e4a045 (diff) | |
| download | PROJ-f1dd367c64de4f48eb48f6dcf17c2be93c7eaafc.tar.gz PROJ-f1dd367c64de4f48eb48f6dcf17c2be93c7eaafc.zip | |
Avoid invalid ellps error messages from pj_init (#794)
Reset error type PJD_ERR_MAJOR_AXIS_NOT_GIVEN for operations
that do not need an ellipsoid.
| -rw-r--r-- | src/pj_init.c | 2 | ||||
| -rw-r--r-- | test/gie/4D-API_cs2cs-style.gie | 21 |
2 files changed, 20 insertions, 3 deletions
diff --git a/src/pj_init.c b/src/pj_init.c index bf098686..78486480 100644 --- a/src/pj_init.c +++ b/src/pj_init.c @@ -600,6 +600,8 @@ pj_init_ctx(projCtx ctx, int argc, char **argv) { return pj_default_destructor (PIN, proj_errno(PIN)); } else { + if (PJD_ERR_MAJOR_AXIS_NOT_GIVEN==proj_errno (PIN)) + proj_errno_reset (PIN); PIN->f = 1.0/298.257223563; PIN->a_orig = PIN->a = 6378137.0; PIN->es_orig = PIN->es = PIN->f*(2-PIN->f); diff --git a/test/gie/4D-API_cs2cs-style.gie b/test/gie/4D-API_cs2cs-style.gie index 2b7a851d..ed67afce 100644 --- a/test/gie/4D-API_cs2cs-style.gie +++ b/test/gie/4D-API_cs2cs-style.gie @@ -161,14 +161,29 @@ expect -7424275.1946 -36.0213 1391493.6349 0.0000 ------------------------------------------------------------------------------- -A test point from a comment by Github user c0nk +A test case from a comment by Github user c0nk ------------------------------------------------------------------------------- operation proj=somerc lat_0=46.95240555555556 lon_0=7.439583333333333 k_0=1 x_0=2600000 y_0=1200000 ellps=bessel - towgs84=674.374,15.056,405.346 + towgs84=674.374,15.056,405.346 no_defs ------------------------------------------------------------------------------- -tolerance 20 cm # lax tolerance due to widely distributed, bad egm96 file +tolerance 20 cm +accept 7.438632495 46.951082877 +expect 2600000.0 1200000.0 +------------------------------------------------------------------------------- +Same test, but now implemented as a pipeline. This is for testing a nasty bug, +where, at the end of pipeline creation, a false warning about missing ellps was +left behind from the creation of the Helmert step (now repaired in pj_init). +------------------------------------------------------------------------------- +operation proj=pipeline + step proj=cart ellps=WGS84 no_defs + step proj=helmert x=674.37400 y=15.05600 z=405.34600 inv no_defs + step proj=cart ellps=bessel no_defs inv + step proj=somerc lat_0=46.95240555555556 lon_0=7.439583333333333 + k_0=1 x_0=2600000 y_0=1200000 ellps=bessel units=m no_defs +------------------------------------------------------------------------------- +tolerance 20 cm accept 7.438632495 46.951082877 expect 2600000.0 1200000.0 ------------------------------------------------------------------------------- |