Converted rpoly

1 files changed, 96 insertions, 32 deletions

diff --git a/src/PJ_rpoly.c b/src/PJ_rpoly.c
index 7a7670ed..ad240917 100644
--- a/src/PJ_rpoly.c
+++ b/src/PJ_rpoly.c
@@ -1,35 +1,99 @@
-#define PROJ_PARMS__ \
-	double	phi1; \
-	double	fxa; \
-	double	fxb; \
-	int		mode;
-#define EPS	1e-9
 #define PJ_LIB__
-#include	<projects.h>
+#include <projects.h>
+
+struct pj_opaque {
+    double  phi1;
+    double  fxa;
+    double  fxb;
+    int     mode;
+};
+
 PROJ_HEAD(rpoly, "Rectangular Polyconic")
-	"\n\tConic, Sph., no inv.\n\tlat_ts=";
-FORWARD(s_forward); /* spheroid */
-	double fa;
-
-	if (P->mode)
-		fa = tan(lp.lam * P->fxb) * P->fxa;
-	else
-		fa = 0.5 * lp.lam;
-	if (fabs(lp.phi) < EPS) {
-		xy.x = fa + fa;
-		xy.y = - P->phi0;
-	} else {
-		xy.y = 1. / tan(lp.phi);
-		xy.x = sin(fa = 2. * atan(fa * sin(lp.phi))) * xy.y;
-		xy.y = lp.phi - P->phi0 + (1. - cos(fa)) * xy.y;
-	}
-	return (xy);
+    "\n\tConic, Sph., no inv.\n\tlat_ts=";
+
+#define EPS 1e-9
+
+static XY s_forward (LP lp, PJ *P) {           /* Spheroidal, forward */
+    XY xy = {0.0,0.0};
+    struct pj_opaque *Q = P->opaque;
+    double fa;
+
+    if (Q->mode)
+        fa = tan(lp.lam * Q->fxb) * Q->fxa;
+    else
+        fa = 0.5 * lp.lam;
+    if (fabs(lp.phi) < EPS) {
+        xy.x = fa + fa;
+        xy.y = - P->phi0;
+    } else {
+        xy.y = 1. / tan(lp.phi);
+        xy.x = sin(fa = 2. * atan(fa * sin(lp.phi))) * xy.y;
+        xy.y = lp.phi - P->phi0 + (1. - cos(fa)) * xy.y;
+    }
+    return xy;
+}
+
+
+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);
 }
-FREEUP; if (P) pj_dalloc(P); }
-ENTRY0(rpoly)
-	if ((P->mode = (P->phi1 = fabs(pj_param(P->ctx, P->params, "rlat_ts").f)) > EPS)) {
-		P->fxb = 0.5 * sin(P->phi1);
-		P->fxa = 0.5 / P->fxb;
-	}
-	P->es = 0.; P->fwd = s_forward;
-ENDENTRY(P)
+
+
+static void freeup (PJ *P) {
+    freeup_new (P);
+    return;
+}
+
+
+PJ *PROJECTION(rpoly) {
+    struct pj_opaque *Q = pj_calloc (1, sizeof (struct pj_opaque));
+    if (0==Q)
+        return freeup_new (P);
+    P->opaque = Q;
+
+    if ((Q->mode = (Q->phi1 = fabs(pj_param(P->ctx, P->params, "rlat_ts").f)) > EPS)) {
+        Q->fxb = 0.5 * sin(Q->phi1);
+        Q->fxa = 0.5 / Q->fxb;
+    }
+    P->es = 0.;
+    P->fwd = s_forward;
+
+    return P;
+}
+
+
+#ifdef PJ_OMIT_SELFTEST
+int pj_rpoly_selftest (void) {return 0;}
+#else
+
+int pj_rpoly_selftest (void) {
+    double tolerance_lp = 1e-10;
+    double tolerance_xy = 1e-7;
+
+    char s_args[] = {"+proj=rpoly   +a=6400000    +lat_1=0.5 +lat_2=2"};
+
+    LP fwd_in[] = {
+        { 2, 1},
+        { 2,-1},
+        {-2, 1},
+        {-2,-1}
+    };
+
+    XY s_fwd_expect[] = {
+        { 223368.09830201423,  111769.110486991223},
+        { 223368.09830201423, -111769.110486991223},
+        {-223368.09830201423,  111769.110486991223},
+        {-223368.09830201423, -111769.110486991223},
+    };
+
+    return pj_generic_selftest (0, s_args, tolerance_xy, tolerance_lp, 4, 4, fwd_in, 0, s_fwd_expect, 0, 0, 0);
+}
+
+
+#endif