diff options
| author | Even Rouault <even.rouault@mines-paris.org> | 2018-08-21 18:56:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-21 18:56:16 +0200 |
| commit | 6680dffb592882437aaa28b6199e4ac74324a743 (patch) | |
| tree | c4ddb399639f8f42541799938b7e0b7a23806207 /src | |
| parent | c1f0673b3335a37eb03900315d6db3f43e3bf64c (diff) | |
| parent | 589a540a21fb914b09fb19d5e0a89c6d955042c0 (diff) | |
| download | PROJ-6680dffb592882437aaa28b6199e4ac74324a743.tar.gz PROJ-6680dffb592882437aaa28b6199e4ac74324a743.zip | |
Merge pull request #1095 from rouault/webmerc_fixes
Fixes for webmerc projection (fixes #1078)
Diffstat (limited to 'src')
| -rw-r--r-- | src/PJ_merc.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/PJ_merc.c b/src/PJ_merc.c index b75f9b11..46cd4b3d 100644 --- a/src/PJ_merc.c +++ b/src/PJ_merc.c @@ -9,7 +9,7 @@ #include "projects.h" PROJ_HEAD(merc, "Mercator") "\n\tCyl, Sph&Ell\n\tlat_ts="; -PROJ_HEAD(webmerc, "Web Mercator / Pseudo Mercator") "\n\tCyl, Sph\n\t"; +PROJ_HEAD(webmerc, "Web Mercator / Pseudo Mercator") "\n\tCyl, Ell\n\t"; #define EPS10 1.e-10 static double logtanpfpim1(double x) { /* log(tan(x/2 + M_FORTPI)) */ @@ -92,15 +92,9 @@ PJ *PROJECTION(merc) { PJ *PROJECTION(webmerc) { - /* Overriding k_0, lat_0 and lon_0 with fixed parameters */ + /* Overriding k_0 with fixed parameter */ P->k0 = 1.0; - P->phi0 = 0.0; - P->lam0 = 0.0; - P->b = P->a; - /* Clean up the ellipsoidal parameters to reflect the sphere */ - P->es = P->e = P->f = 0; - pj_calc_ellipsoid_params (P, P->a, 0); P->inv = s_inverse; P->fwd = s_forward; return P; |