diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2017-05-17 09:49:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-17 09:49:44 +0200 |
| commit | 34f266e1ced700f2f42e66f5d58efd81cd80134c (patch) | |
| tree | 88431d6e161facdd626620cd7c09008067ca38ac /src | |
| parent | b0315bba5e7ec2104961c81715f0276e799af5d2 (diff) | |
| parent | 042074b2f1d8a52ffda4d7f61341627a01912765 (diff) | |
| download | PROJ-34f266e1ced700f2f42e66f5d58efd81cd80134c.tar.gz PROJ-34f266e1ced700f2f42e66f5d58efd81cd80134c.zip | |
Merge pull request #515 from awulkiew/patch-1
Check validity of +n parameter in urm5 projection and fix selftest.
Diffstat (limited to 'src')
| -rw-r--r-- | src/PJ_urm5.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/PJ_urm5.c b/src/PJ_urm5.c index f19d5c43..d215fa14 100644 --- a/src/PJ_urm5.c +++ b/src/PJ_urm5.c @@ -37,8 +37,13 @@ PJ *PROJECTION(urm5) { if (0==Q) return freeup_new (P); P->opaque = Q; - - Q->n = pj_param(P->ctx, P->params, "dn").f; + + if (pj_param(P->ctx, P->params, "tn").i) { + Q->n = pj_param(P->ctx, P->params, "dn").f; + if (Q->n <= 0. || Q->n > 1.) + E_ERROR(-40) + } else + E_ERROR(-40) Q->q3 = pj_param(P->ctx, P->params, "dq").f / 3.; alpha = pj_param(P->ctx, P->params, "ralpha").f; t = Q->n * sin (alpha); @@ -60,7 +65,7 @@ int pj_urm5_selftest (void) { double tolerance_lp = 1e-10; double tolerance_xy = 1e-7; - char s_args[] = {"+proj=urm5 +a=6400000 +lat_1=0.5 +lat_2=2"}; + char s_args[] = {"+proj=urm5 +a=6400000 +lat_1=0.5 +lat_2=2 +n=0.5"}; LP fwd_in[] = { { 2, 1}, |