diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/PJ_eqc.c | 6 | ||||
| -rw-r--r-- | src/PJ_eqr.c | 36 | ||||
| -rw-r--r-- | src/makefile.vc | 2 | ||||
| -rw-r--r-- | src/pj_list.h | 1 |
5 files changed, 5 insertions, 42 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 9d777211..c1f8450d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -29,7 +29,7 @@ libproj_la_SOURCES = \ PJ_aea.c PJ_bipc.c PJ_bonne.c PJ_eqdc.c \ PJ_imw_p.c PJ_krovak.c PJ_lcc.c PJ_poly.c \ PJ_rpoly.c PJ_sconics.c proj_rouss.c \ - PJ_cass.c PJ_cc.c PJ_cea.c PJ_eqc.c PJ_eqr.c \ + PJ_cass.c PJ_cc.c PJ_cea.c PJ_eqc.c \ PJ_gall.c PJ_labrd.c PJ_lsat.c PJ_merc.c \ PJ_mill.c PJ_ocea.c PJ_omerc.c PJ_somerc.c \ PJ_tcc.c PJ_tcea.c PJ_tmerc.c \ diff --git a/src/PJ_eqc.c b/src/PJ_eqc.c index d956a47b..e7ac93be 100644 --- a/src/PJ_eqc.c +++ b/src/PJ_eqc.c @@ -6,15 +6,15 @@ static const char SCCSID[]="@(#)PJ_eqc.c 4.1 94/02/15 GIE REL"; #define PJ_LIB__ # include <projects.h> PROJ_HEAD(eqc, "Equidistant Cylindrical (Plate Caree)") - "\n\tCyl, Sph\n\tlat_ts="; + "\n\tCyl, Sph\n\tlat_ts=[, lat_0=0]"; FORWARD(s_forward); /* spheroid */ xy.x = P->rc * lp.lam; - xy.y = lp.phi; + xy.y = lp.phi - P->phi0; return (xy); } INVERSE(s_inverse); /* spheroid */ - lp.phi = xy.y; lp.lam = xy.x / P->rc; + lp.phi = xy.y + P->phi0; return (lp); } FREEUP; if (P) pj_dalloc(P); } diff --git a/src/PJ_eqr.c b/src/PJ_eqr.c deleted file mode 100644 index f984e83b..00000000 --- a/src/PJ_eqr.c +++ /dev/null @@ -1,36 +0,0 @@ -#ifndef lint -static const char SCCSID[]="@(#)PJ_eqr.c 4.5 07/07/18 ??? ???"; -#endif -#define PROJ_PARMS__ \ - double rc; - -#define PJ_LIB__ -# include <projects.h> -PROJ_HEAD(eqr, "Equidistant Cylindrical (Generalized)") - "\n\tCyl, Sph\n\tk_0= lat_ts="; -FORWARD(s_forward); /* spheroid */ - xy.x = P->rc * lp.lam * P->k0 * P->ra; - xy.y = (lp.phi - P->phi0) * P->k0 * P->ra; - return (xy); -} -INVERSE(s_inverse); /* spheroid */ - lp.lam = (xy.x * P->a) / (P->k0 * P->rc); - lp.phi = ((xy.y * P->a) / P->k0) + P->phi0; - return (lp); -} -FREEUP; if (P) pj_dalloc(P); } -ENTRY0(eqr) - /* DGR, 2007-08-29 : due to Geoconcept bad implementation */ - /* phi0 no longer use lat_ts ! */ - if ((P->rc = cos(pj_param(P->params, "rlat_ts").f)) <= 0.) E_ERROR(-24); - P->inv = s_inverse; - P->fwd = s_forward; -#if 0 - /* - * if set to 0. the computation is being made on a sphere! - * We simply approximate this as the projection is only - * used for displaying - */ - P->es = 0.; -#endif -ENDENTRY(P) diff --git a/src/makefile.vc b/src/makefile.vc index 9614bcab..7db85ccc 100644 --- a/src/makefile.vc +++ b/src/makefile.vc @@ -36,7 +36,7 @@ conic = \ PJ_rpoly.obj PJ_sconics.obj PJ_lcca.obj cylinder = \ - PJ_cass.obj PJ_cc.obj PJ_cea.obj PJ_eqc.obj PJ_eqr.obj \ + PJ_cass.obj PJ_cc.obj PJ_cea.obj PJ_eqc.obj \ PJ_gall.obj PJ_labrd.obj PJ_lsat.obj PJ_merc.obj \ PJ_mill.obj PJ_ocea.obj PJ_omerc.obj PJ_somerc.obj \ PJ_tcc.obj PJ_tcea.obj PJ_tmerc.obj PJ_geos.obj PJ_glabsgm.obj diff --git a/src/pj_list.h b/src/pj_list.h index 64ae4a34..f10aca25 100644 --- a/src/pj_list.h +++ b/src/pj_list.h @@ -30,7 +30,6 @@ PROJ_HEAD(eck4, "Eckert IV") PROJ_HEAD(eck5, "Eckert V") PROJ_HEAD(eck6, "Eckert VI") PROJ_HEAD(eqc, "Equidistant Cylindrical (Plate Caree)") -PROJ_HEAD(eqr, "Equidistant Cylindrical (Generalized)") PROJ_HEAD(eqdc, "Equidistant Conic") PROJ_HEAD(euler, "Euler") PROJ_HEAD(fahey, "Fahey") |