Converted lagrng

2 files changed, 100 insertions, 33 deletions

diff --git a/src/PJ_aea.c b/src/PJ_aea.c
index 382116b2..fb9cc1d0 100644
--- a/src/PJ_aea.c
+++ b/src/PJ_aea.c
@@ -362,7 +362,6 @@ int pj_geocent_selftest (void) {return 10000;}
 int pj_gs48_selftest (void) {return 10000;}
 int pj_gs50_selftest (void) {return 10000;}
 
-int pj_lagrng_selftest (void) {return 10000;}
 int pj_larr_selftest (void) {return 10000;}
 int pj_lask_selftest (void) {return 10000;}
 int pj_latlon_selftest (void) {return 10000;}
diff --git a/src/PJ_lagrng.c b/src/PJ_lagrng.c
index 8a13b3da..9a018808 100644
--- a/src/PJ_lagrng.c
+++ b/src/PJ_lagrng.c
@@ -1,35 +1,103 @@
-#define PROJ_PARMS__ \
-	double	hrw; \
-	double	rw; \
-	double	a1;
-#define TOL	1e-10
 #define PJ_LIB__
-#include	<projects.h>
+#include <projects.h>
+
 PROJ_HEAD(lagrng, "Lagrange") "\n\tMisc Sph, no inv.\n\tW=";
-FORWARD(s_forward); /* spheroid */
-	double v, c;
-
-	if (fabs(fabs(lp.phi) - HALFPI) < TOL) {
-		xy.x = 0;
-		xy.y = lp.phi < 0 ? -2. : 2.;
-	} else {
-		lp.phi = sin(lp.phi);
-		v = P->a1 * pow((1. + lp.phi)/(1. - lp.phi), P->hrw);
-		if ((c = 0.5 * (v + 1./v) + cos(lp.lam *= P->rw)) < TOL)
-			F_ERROR;
-		xy.x = 2. * sin(lp.lam) / c;
-		xy.y = (v - 1./v) / c;
-	}
-	return (xy);
+
+#define TOL 1e-10
+
+struct pj_opaque {
+    double  a1;
+    double  hrw;
+    double  rw;
+};
+
+
+static XY s_forward (LP lp, PJ *P) {           /* Spheroidal, forward */
+    XY xy = {0.0,0.0};
+    struct pj_opaque *Q = P->opaque;
+    double v, c;
+
+    if (fabs(fabs(lp.phi) - HALFPI) < TOL) {
+        xy.x = 0;
+        xy.y = lp.phi < 0 ? -2. : 2.;
+    } else {
+        lp.phi = sin(lp.phi);
+        v = Q->a1 * pow((1. + lp.phi)/(1. - lp.phi), Q->hrw);
+        if ((c = 0.5 * (v + 1./v) + cos(lp.lam *= Q->rw)) < TOL)
+            F_ERROR;
+        xy.x = 2. * sin(lp.lam) / c;
+        xy.y = (v - 1./v) / c;
+    }
+    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);
+}
+
+static void freeup (PJ *P) {
+    freeup_new (P);
+    return;
+}
+
+
+PJ *PROJECTION(lagrng) {
+    struct pj_opaque *Q = pj_calloc (1, sizeof (struct pj_opaque));
+    if (0==Q)
+        return freeup_new (P);
+    P->opaque = Q;
+    double phi1;
+
+    Q->rw = pj_param(P->ctx, P->params, "dW").f;
+    if (Q->rw <= 0) E_ERROR(-27);
+
+    Q->rw = 1. / Q->rw;
+    Q->hrw = 0.5 * Q->rw;
+    phi1 = sin(pj_param(P->ctx, P->params, "rlat_1").f);
+    if (fabs(fabs(phi1) - 1.) < TOL) E_ERROR(-22);
+
+    Q->a1 = pow((1. - phi1)/(1. + phi1), Q->hrw);
+
+    P->es = 0.;
+    P->fwd = s_forward;
+
+    return P;
 }
-FREEUP; if (P) pj_dalloc(P); }
-ENTRY0(lagrng)
-	double phi1;
-
-	if ((P->rw = pj_param(P->ctx, P->params, "dW").f) <= 0) E_ERROR(-27);
-	P->hrw = 0.5 * (P->rw = 1. / P->rw);
-	phi1 = pj_param(P->ctx, P->params, "rlat_1").f;
-	if (fabs(fabs(phi1 = sin(phi1)) - 1.) < TOL) E_ERROR(-22);
-	P->a1 = pow((1. - phi1)/(1. + phi1), P->hrw);
-	P->es = 0.; P->fwd = s_forward;
-ENDENTRY(P)
+
+
+#ifdef PJ_OMIT_SELFTEST
+int pj_lagrng_selftest (void) {return 0;}
+#else
+
+int pj_lagrng_selftest (void) {
+    double tolerance_lp = 1e-10;
+    double tolerance_xy = 1e-7;
+
+    char s_args[] = {"+proj=lagrng   +a=6400000    +lat_1=0.5 +lat_2=2"};
+
+    LP fwd_in[] = {
+        { 2, 1},
+        { 2,-1},
+        {-2, 1},
+        {-2,-1}
+    };
+
+    XY s_fwd_expect[] = {
+        { 111703.37591722561,   27929.8319080333386},
+        { 111699.122088816002, -83784.1780133577704},
+        {-111703.37591722561,   27929.8319080333386},
+        {-111699.122088816002, -83784.1780133577704},
+    };
+
+    return pj_generic_selftest (0, s_args, tolerance_xy, tolerance_lp, 4, 4, fwd_in, 0, s_fwd_expect, 0, 0, 0);
+}
+
+
+#endif