diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2018-07-22 00:56:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-22 00:56:06 +0100 |
| commit | 54c854abb78a16169ff4f883805050734ecaa65d (patch) | |
| tree | a8019f3e51e7952f4e12d90304e82c36888d23f7 | |
| parent | 22de7792281577a89c51bb7aa7ea4084a75bd565 (diff) | |
| parent | 380eb835e4e88a8ba8581fa26de123c9df334ae9 (diff) | |
| download | PROJ-54c854abb78a16169ff4f883805050734ecaa65d.tar.gz PROJ-54c854abb78a16169ff4f883805050734ecaa65d.zip | |
Merge pull request #1082 from kbevers/various-minor-fixes
Various minor fixes
| -rw-r--r-- | src/PJ_imw_p.c | 2 | ||||
| -rw-r--r-- | src/PJ_krovak.c | 4 | ||||
| -rw-r--r-- | src/PJ_labrd.c | 4 |
3 files changed, 4 insertions, 6 deletions
diff --git a/src/PJ_imw_p.c b/src/PJ_imw_p.c index 4c1b5e45..abed5006 100644 --- a/src/PJ_imw_p.c +++ b/src/PJ_imw_p.c @@ -32,7 +32,7 @@ static int phi12(PJ *P, double *del, double *sig) { if (!pj_param(P->ctx, P->params, "tlat_1").i || !pj_param(P->ctx, P->params, "tlat_2").i) { - err = -41; + err = PJD_ERR_LAT_1_2_UNSPECIFIED; } else { Q->phi_1 = pj_param(P->ctx, P->params, "rlat_1").f; Q->phi_2 = pj_param(P->ctx, P->params, "rlat_2").f; diff --git a/src/PJ_krovak.c b/src/PJ_krovak.c index 44143e77..afb7847b 100644 --- a/src/PJ_krovak.c +++ b/src/PJ_krovak.c @@ -196,8 +196,8 @@ PJ *PROJECTION(krovak) { P->lam0 = 0.7417649320975901 - 0.308341501185665; /* if scale not set default to 0.9999 */ - if (!pj_param(P->ctx, P->params, "tk").i) - P->k0 = 0.9999; + if (!pj_param(P->ctx, P->params, "tk").i && !pj_param(P->ctx, P->params, "tk_0").i) + P->k0 = 0.9999; Q->czech = 1; if( !pj_param(P->ctx, P->params, "tczech").i ) diff --git a/src/PJ_labrd.c b/src/PJ_labrd.c index 502adf0f..769dc620 100644 --- a/src/PJ_labrd.c +++ b/src/PJ_labrd.c @@ -9,8 +9,7 @@ PROJ_HEAD(labrd, "Laborde") "\n\tCyl, Sph\n\tSpecial for Madagascar"; #define EPS 1.e-10 struct pj_opaque { - double kRg, p0s, A, C, Ca, Cb, Cc, Cd; \ - int rot; + double kRg, p0s, A, C, Ca, Cb, Cc, Cd; }; @@ -106,7 +105,6 @@ PJ *PROJECTION(labrd) { return pj_default_destructor (P, ENOMEM); P->opaque = Q; - Q->rot = pj_param(P->ctx, P->params, "bno_rot").i == 0; Az = pj_param(P->ctx, P->params, "razi").f; sinp = sin(P->phi0); t = 1. - P->es * sinp * sinp; |