Converted geocent. Only testing ellipsoidal input/output - need to check the spherical case

2 files changed, 93 insertions, 16 deletions

diff --git a/src/PJ_aea.c b/src/PJ_aea.c
index a84a781a..bde38783 100644
--- a/src/PJ_aea.c
+++ b/src/PJ_aea.c
@@ -354,7 +354,6 @@ source files
 ***********************************************************************/
 
 int pj_etmerc_selftest (void) {return 10000;}
-int pj_geocent_selftest (void) {return 10000;}
 
 int pj_latlon_selftest (void) {return 10000;}
 int pj_latlong_selftest (void) {return 10000;}
diff --git a/src/pj_geocent.c b/src/pj_geocent.c
index 6b2f3026..7283a174 100644
--- a/src/pj_geocent.c
+++ b/src/pj_geocent.c
@@ -32,24 +32,102 @@
 
 PROJ_HEAD(geocent, "Geocentric")  "\n\t";
 
-FORWARD(forward);
-	(void) P;
-        xy.x = lp.lam;
-        xy.y = lp.phi;
-        return xy;
+static XY forward(LP lp, PJ *P) {
+    XY xy = {0.0,0.0};
+    (void) P;
+    xy.x = lp.lam;
+    xy.y = lp.phi;
+    return xy;
 }
-INVERSE(inverse);
-	(void) P;
-        lp.phi = xy.y;
-        lp.lam = xy.x;
-        return lp;
+
+static LP inverse(XY xy, PJ *P) {
+    LP lp = {0.0,0.0};
+    (void) P;
+    lp.phi = xy.y;
+    lp.lam = xy.x;
+    return lp;
+}
+
+
+static void *freeup_new (PJ *P) {
+    if (0==P)
+        return 0;
+
+    return pj_dealloc(P);
+}
+
+static void freeup (PJ *P) {
+    freeup_new (P);
+    return;
 }
-FREEUP; if (P) pj_dalloc(P); }
 
-ENTRY0(geocent)
-    P->is_geocent = 1; 
+PJ *PROJECTION(geocent) {
+    P->is_geocent = 1;
     P->x0 = 0.0;
     P->y0 = 0.0;
-    P->inv = inverse; P->fwd = forward;
-ENDENTRY(P)
+    P->inv = inverse;
+    P->fwd = forward;
+
+    return P;
+}
+
+
+#ifdef PJ_OMIT_SELFTEST
+int pj_geocent_selftest (void) {return 0;}
+#else
+
+int pj_geocent_selftest (void) {
+
+    double tolerance_lp = 1e-10;
+    double tolerance_xy = 1e-7;
+
+    char e_args[] = {"+proj=geocent   +ellps=GRS80  +lat_1=0.5 +lat_2=2"};
+    char s_args[] = {"+proj=geocent   +a=6400000    +lat_1=0.5 +lat_2=2"};
+
+    LP fwd_in[] = {
+        { 2, 1},
+        { 2,-1},
+        {-2, 1},
+        {-2,-1}
+    };
+
+    XY e_fwd_expect[] = {
+        { 222638.98158654713,  111319.49079327357},
+        { 222638.98158654713, -111319.49079327357},
+        {-222638.98158654713,  111319.49079327357},
+        {-222638.98158654713, -111319.49079327357},
+    };
+
+    XY s_fwd_expect[] = {
+        { 223402.14425527418,  111701.07212763709},
+        { 223402.14425527418, -111701.07212763709},
+        {-223402.14425527418,  111701.07212763709},
+        {-223402.14425527418, -111701.07212763709},
+    };
+
+    XY inv_in[] = {
+        { 200, 100},
+        { 200,-100},
+        {-200, 100},
+        {-200,-100}
+    };
+
+    LP e_inv_expect[] = {
+        { 0.0017966305682390426,  0.00089831528411952132},
+        { 0.0017966305682390426, -0.00089831528411952132},
+        {-0.0017966305682390426,  0.00089831528411952132},
+        {-0.0017966305682390426, -0.00089831528411952132},
+    };
+
+    LP s_inv_expect[] = {
+        { 0.0017904931097838226,  0.00089831528411952132},
+        { 0.0017904931097838226, -0.00089831528411952132},
+        {-0.0017904931097838226,  0.00089831528411952132},
+        {-0.0017904931097838226, -0.00089831528411952132},
+    };
+
+    return pj_generic_selftest (e_args, s_args, tolerance_xy, tolerance_lp, 4, 4, fwd_in, e_fwd_expect, 0, inv_in, e_inv_expect, 0);
+}
+
+#endif