Converted eqc

2 files changed, 104 insertions, 20 deletions

diff --git a/src/PJ_aea.c b/src/PJ_aea.c
index cb1be3d5..9047ae25 100644
--- a/src/PJ_aea.c
+++ b/src/PJ_aea.c
@@ -353,7 +353,6 @@ source files
 
 ***********************************************************************/
 
-int pj_eqc_selftest (void) {return 10000;}
 int pj_eqdc_selftest (void) {return 10000;}
 int pj_etmerc_selftest (void) {return 10000;}
 int pj_geocent_selftest (void) {return 10000;}
diff --git a/src/PJ_eqc.c b/src/PJ_eqc.c
index c69a6baa..3fcb1007 100644
--- a/src/PJ_eqc.c
+++ b/src/PJ_eqc.c
@@ -1,23 +1,108 @@
-#define PROJ_PARMS__ \
-	double rc;
 #define PJ_LIB__
-# include	<projects.h>
+#include <projects.h>
+
+struct pj_opaque {
+    double rc;
+};
+
 PROJ_HEAD(eqc, "Equidistant Cylindrical (Plate Caree)")
-	"\n\tCyl, Sph\n\tlat_ts=[, lat_0=0]";
-FORWARD(s_forward); /* spheroid */
-	xy.x = P->rc * lp.lam;
-	xy.y = lp.phi - P->phi0;
-	return (xy);
+    "\n\tCyl, Sph\n\tlat_ts=[, lat_0=0]";
+
+
+static XY s_forward (LP lp, PJ *P) {           /* Spheroidal, forward */
+    XY xy = {0.0,0.0};
+    struct pj_opaque *Q = P->opaque;
+
+    xy.x = Q->rc * lp.lam;
+    xy.y = lp.phi - P->phi0;
+
+    return xy;
 }
-INVERSE(s_inverse); /* spheroid */
-	lp.lam = xy.x / P->rc;
-	lp.phi = xy.y + P->phi0;
-	return (lp);
+
+
+static LP s_inverse (XY xy, PJ *P) {           /* Spheroidal, inverse */
+    LP lp = {0.0,0.0};
+    struct pj_opaque *Q = P->opaque;
+
+    lp.lam = xy.x / Q->rc;
+    lp.phi = xy.y + P->phi0;
+
+    return lp;
 }
-FREEUP; if (P) pj_dalloc(P); }
-ENTRY0(eqc)
-	if ((P->rc = cos(pj_param(P->ctx, P->params, "rlat_ts").f)) <= 0.) E_ERROR(-24);
-	P->inv = s_inverse;
-	P->fwd = s_forward;
-	P->es = 0.;
-ENDENTRY(P)
+
+
+static void *freeup_new (PJ *P) {                       /* Destructor */
+    if (0==P)
+        return 0;
+    if (0==P->opaque)
+        return pj_dealloc (P);
+
+    pj_dealloc (P->opaque);
+    return pj_dealloc(P);
+}
+
+
+static void freeup (PJ *P) {
+    freeup_new (P);
+    return;
+}
+
+
+PJ *PROJECTION(eqc) {
+    struct pj_opaque *Q = pj_calloc (1, sizeof (struct pj_opaque));
+    if (0==Q)
+        return freeup_new (P);
+    P->opaque = Q;
+
+    if ((Q->rc = cos(pj_param(P->ctx, P->params, "rlat_ts").f)) <= 0.) E_ERROR(-24);
+    P->inv = s_inverse;
+    P->fwd = s_forward;
+    P->es = 0.;
+
+    return P;
+}
+
+
+#ifdef PJ_OMIT_SELFTEST
+int pj_eqc_selftest (void) {return 0;}
+#else
+
+int pj_eqc_selftest (void) {
+    double tolerance_lp = 1e-10;
+    double tolerance_xy = 1e-7;
+
+    char s_args[] = {"+proj=eqc   +a=6400000    +lat_1=0.5 +lat_2=2"};
+
+    LP fwd_in[] = {
+        { 2, 1},
+        { 2,-1},
+        {-2, 1},
+        {-2,-1}
+    };
+
+    XY s_fwd_expect[] = {
+        { 223402.144255274179,  111701.07212763709},
+        { 223402.144255274179, -111701.07212763709},
+        {-223402.144255274179,  111701.07212763709},
+        {-223402.144255274179, -111701.07212763709},
+    };
+
+    XY inv_in[] = {
+        { 200, 100},
+        { 200,-100},
+        {-200, 100},
+        {-200,-100}
+    };
+
+    LP s_inv_expect[] = {
+        { 0.00179049310978382265,  0.000895246554891911323},
+        { 0.00179049310978382265, -0.000895246554891911323},
+        {-0.00179049310978382265,  0.000895246554891911323},
+        {-0.00179049310978382265, -0.000895246554891911323},
+    };
+
+    return pj_generic_selftest (0, s_args, tolerance_xy, tolerance_lp, 4, 4, fwd_in, 0, s_fwd_expect, inv_in, 0, s_inv_expect);
+}
+
+
+#endif