Converted moll, wag4 and wag5

2 files changed, 247 insertions, 55 deletions

diff --git a/src/PJ_aea.c b/src/PJ_aea.c
index e1d6013d..dd0c0f48 100644
--- a/src/PJ_aea.c
+++ b/src/PJ_aea.c
@@ -364,7 +364,6 @@ int pj_latlong_selftest (void) {return 10000;}
 int pj_lonlat_selftest (void) {return 10000;}
 int pj_longlat_selftest (void) {return 10000;}
 
-int pj_moll_selftest (void) {return 10000;}
 int pj_natearth_selftest (void) {return 10000;}
 int pj_natearth2_selftest (void) {return 10000;}
 int pj_nell_selftest (void) {return 10000;}
@@ -401,7 +400,5 @@ int pj_vandg_selftest (void) {return 10000;}
 int pj_vandg2_selftest (void) {return 10000;}
 int pj_vandg3_selftest (void) {return 10000;}
 int pj_vandg4_selftest (void) {return 10000;}
-int pj_wag4_selftest (void) {return 10000;}
-int pj_wag5_selftest (void) {return 10000;}
 int pj_weren_selftest (void) {return 10000;}
 #endif
diff --git a/src/PJ_moll.c b/src/PJ_moll.c
index cf9369dc..31829b68 100644
--- a/src/PJ_moll.c
+++ b/src/PJ_moll.c
@@ -1,64 +1,259 @@
-#define PROJ_PARMS__ \
-	double	C_x, C_y, C_p;
 #define PJ_LIB__
-#include	<projects.h>
+#include <projects.h>
+
 PROJ_HEAD(moll, "Mollweide") "\n\tPCyl., Sph.";
 PROJ_HEAD(wag4, "Wagner IV") "\n\tPCyl., Sph.";
 PROJ_HEAD(wag5, "Wagner V") "\n\tPCyl., Sph.";
-#define MAX_ITER	10
-#define LOOP_TOL	1e-7
-FORWARD(s_forward); /* spheroid */
-	double k, V;
-	int i;
-
-	k = P->C_p * sin(lp.phi);
-	for (i = MAX_ITER; i ; --i) {
-		lp.phi -= V = (lp.phi + sin(lp.phi) - k) /
-			(1. + cos(lp.phi));
-		if (fabs(V) < LOOP_TOL)
-			break;
-	}
-	if (!i)
-		lp.phi = (lp.phi < 0.) ? -HALFPI : HALFPI;
-	else
-		lp.phi *= 0.5;
-	xy.x = P->C_x * lp.lam * cos(lp.phi);
-	xy.y = P->C_y * sin(lp.phi);
-	return (xy);
+
+#define MAX_ITER    10
+#define LOOP_TOL    1e-7
+
+struct pj_opaque {
+    double  C_x, C_y, C_p;
+};
+
+
+static XY s_forward (LP lp, PJ *P) {           /* Spheroidal, forward */
+    XY xy = {0.0,0.0};
+    struct pj_opaque *Q = P->opaque;
+    double k, V;
+    int i;
+
+    k = Q->C_p * sin(lp.phi);
+    for (i = MAX_ITER; i ; --i) {
+        lp.phi -= V = (lp.phi + sin(lp.phi) - k) /
+            (1. + cos(lp.phi));
+        if (fabs(V) < LOOP_TOL)
+            break;
+    }
+    if (!i)
+        lp.phi = (lp.phi < 0.) ? -HALFPI : HALFPI;
+    else
+        lp.phi *= 0.5;
+    xy.x = Q->C_x * lp.lam * cos(lp.phi);
+    xy.y = Q->C_y * sin(lp.phi);
+    return xy;
 }
-INVERSE(s_inverse); /* spheroid */
-	lp.phi = aasin(P->ctx, xy.y / P->C_y);
-	lp.lam = xy.x / (P->C_x * cos(lp.phi));
+
+
+static LP s_inverse (XY xy, PJ *P) {           /* Spheroidal, inverse */
+    LP lp = {0.0,0.0};
+    struct pj_opaque *Q = P->opaque;
+    lp.phi = aasin(P->ctx, xy.y / Q->C_y);
+    lp.lam = xy.x / (Q->C_x * cos(lp.phi));
         if (fabs(lp.lam) < PI) {
             lp.phi += lp.phi;
-            lp.phi = aasin(P->ctx, (lp.phi + sin(lp.phi)) / P->C_p);
+            lp.phi = aasin(P->ctx, (lp.phi + sin(lp.phi)) / Q->C_p);
         } else {
             lp.lam = lp.phi = HUGE_VAL;
         }
-	return (lp);
+    return lp;
+}
+
+
+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;
+}
+
+
+static PJ * setup(PJ *P, double p) {
+    struct pj_opaque *Q = P->opaque;
+    double r, sp, p2 = p + p;
+
+    P->es = 0;
+    sp = sin(p);
+    r = sqrt(TWOPI * sp / (p2 + sin(p2)));
+
+    Q->C_x = 2. * r / PI;
+    Q->C_y = r / sp;
+    Q->C_p = p2 + sin(p2);
+
+    P->inv = s_inverse;
+    P->fwd = s_forward;
+    return P;
+}
+
+
+PJ *PROJECTION(moll) {
+    struct pj_opaque *Q = pj_calloc (1, sizeof (struct pj_opaque));
+    if (0==Q)
+        return freeup_new (P);
+    P->opaque = Q;
+
+    return setup(P, HALFPI);
+}
+
+
+PJ *PROJECTION(wag4) {
+    struct pj_opaque *Q = pj_calloc (1, sizeof (struct pj_opaque));
+    if (0==Q)
+        return freeup_new (P);
+    P->opaque = Q;
+
+    return setup(P, PI/3.);
+}
+
+PJ *PROJECTION(wag5) {
+    struct pj_opaque *Q = pj_calloc (1, sizeof (struct pj_opaque));
+    if (0==Q)
+        return freeup_new (P);
+    P->opaque = Q;
+
+    P->es = 0;
+    Q->C_x = 0.90977;
+    Q->C_y = 1.65014;
+    Q->C_p = 3.00896;
+
+    P->inv = s_inverse;
+    P->fwd = s_forward;
+
+    return P;
+}
+
+
+#ifdef PJ_OMIT_SELFTEST
+int pj_moll_selftest (void) {return 0;}
+#else
+
+int pj_moll_selftest (void) {
+    double tolerance_lp = 1e-10;
+    double tolerance_xy = 1e-7;
+
+    char s_args[] = {"+proj=moll   +a=6400000    +lat_1=0.5 +lat_2=2"};
+
+    LP fwd_in[] = {
+        { 2, 1},
+        { 2,-1},
+        {-2, 1},
+        {-2,-1}
+    };
+
+    XY s_fwd_expect[] = {
+        {201113.698641813244,  124066.283433859542},
+        {201113.698641813244,  -124066.283433859542},
+        {-201113.698641813244,  124066.283433859542},
+        {-201113.698641813244,  -124066.283433859542},
+    };
+
+    XY inv_in[] = {
+        { 200, 100},
+        { 200,-100},
+        {-200, 100},
+        {-200,-100}
+    };
+
+    LP s_inv_expect[] = {
+        {0.00198873782220854774,  0.000806005080362811612},
+        {0.00198873782220854774,  -0.000806005080362811612},
+        {-0.00198873782220854774,  0.000806005080362811612},
+        {-0.00198873782220854774,  -0.000806005080362811612},
+    };
+
+    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);
 }
-FREEUP; if (P) pj_dalloc(P); }
-	static PJ *
-setup(PJ *P, double p) {
-	double r, sp, p2 = p + p;
-
-	P->es = 0;
-	sp = sin(p);
-	r = sqrt(TWOPI * sp / (p2 + sin(p2)));
-	P->C_x = 2. * r / PI;
-	P->C_y = r / sp;
-	P->C_p = p2 + sin(p2);
-	P->inv = s_inverse;
-	P->fwd = s_forward;
-	return P;
+
+#endif
+
+
+#ifdef PJ_OMIT_SELFTEST
+int pj_wag4_selftest (void) {return 0;}
+#else
+
+int pj_wag4_selftest (void) {
+    double tolerance_lp = 1e-10;
+    double tolerance_xy = 1e-7;
+
+    char s_args[] = {"+proj=wag4   +a=6400000    +lat_1=0.5 +lat_2=2"};
+
+    LP fwd_in[] = {
+        { 2, 1},
+        { 2,-1},
+        {-2, 1},
+        {-2,-1}
+    };
+
+    XY s_fwd_expect[] = {
+        { 192801.218662384286,  129416.216394802992},
+        { 192801.218662384286, -129416.216394802992},
+        {-192801.218662384286,  129416.216394802992},
+        {-192801.218662384286, -129416.216394802992},
+    };
+
+    XY inv_in[] = {
+        { 200, 100},
+        { 200,-100},
+        {-200, 100},
+        {-200,-100}
+    };
+
+    LP s_inv_expect[] = {
+        { 0.00207450259783523421, 0.000772682950537716476},
+        { 0.00207450259783523421, -0.000772682950537716476},
+        {-0.00207450259783523421,  0.000772682950537716476},
+        {-0.00207450259783523421, -0.000772682950537716476},
+   };
+
+    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);
 }
-ENTRY0(moll) ENDENTRY(setup(P, HALFPI))
-ENTRY0(wag4) ENDENTRY(setup(P, PI/3.))
-ENTRY0(wag5)
-	P->es = 0;
-	P->C_x = 0.90977;
-	P->C_y = 1.65014;
-	P->C_p = 3.00896;
-	P->inv = s_inverse;
-	P->fwd = s_forward;
-ENDENTRY(P)
+
+#endif
+
+#ifdef PJ_OMIT_SELFTEST
+int pj_wag5_selftest (void) {return 0;}
+#else
+
+int pj_wag5_selftest (void) {
+    double tolerance_lp = 1e-10;
+    double tolerance_xy = 1e-7;
+
+    char s_args[] = {"+proj=wag5   +a=6400000    +lat_1=0.5 +lat_2=2"};
+
+    LP fwd_in[] = {
+        { 2, 1},
+        { 2,-1},
+        {-2, 1},
+        {-2,-1}
+    };
+
+
+    XY s_fwd_expect[] = {
+        { 203227.05192532466,  138651.631442713202},
+        { 203227.05192532466, -138651.631442713202},
+        {-203227.05192532466,  138651.631442713202},
+        {-203227.05192532466, -138651.631442713202},
+    };
+
+    XY inv_in[] = {
+        { 200, 100},
+        { 200,-100},
+        {-200, 100},
+        {-200,-100}
+    };
+
+
+
+
+    LP s_inv_expect[] = {
+        { 0.00196807227086416396,  0.00072121615041701424},
+        { 0.00196807227086416396, -0.00072121615041701424},
+        {-0.00196807227086416396,  0.00072121615041701424},
+        {-0.00196807227086416396, -0.00072121615041701424},
+    };
+
+    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