diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2016-04-15 15:21:06 +0200 |
|---|---|---|
| committer | Kristian Evers <kristianevers@gmail.com> | 2016-04-15 15:21:06 +0200 |
| commit | 439b43ce5652aacdda386edda62b02d9e6ed1b95 (patch) | |
| tree | 0a6f28e76cefc40bdcb66cb97ee697afaedb7529 /src | |
| parent | e83114c35547825a4665c19868ee898907b3810f (diff) | |
| download | PROJ-439b43ce5652aacdda386edda62b02d9e6ed1b95.tar.gz PROJ-439b43ce5652aacdda386edda62b02d9e6ed1b95.zip | |
Converted eck5. Expanded tabs.
Diffstat (limited to 'src')
| -rw-r--r-- | src/PJ_aea.c | 1 | ||||
| -rw-r--r-- | src/PJ_eck4.c | 16 | ||||
| -rw-r--r-- | src/PJ_eck5.c | 128 |
3 files changed, 116 insertions, 29 deletions
diff --git a/src/PJ_aea.c b/src/PJ_aea.c index bea5d6e6..8b96b5a9 100644 --- a/src/PJ_aea.c +++ b/src/PJ_aea.c @@ -355,7 +355,6 @@ source files int pj_aeqd_selftest (void) {return 10000;} int pj_alsk_selftest (void) {return 10000;} -int pj_eck5_selftest (void) {return 10000;} int pj_eck6_selftest (void) {return 10000;} int pj_eqc_selftest (void) {return 10000;} int pj_eqdc_selftest (void) {return 10000;} diff --git a/src/PJ_eck4.c b/src/PJ_eck4.c index 06998ad4..8a56f019 100644 --- a/src/PJ_eck4.c +++ b/src/PJ_eck4.c @@ -90,10 +90,10 @@ int pj_eck4_selftest (void) { };
XY s_fwd_expect[] = {
- { 188646.38935641639, 132268.54017406539
},
- { 188646.38935641639, -132268.54017406539
},
- {-188646.38935641639, 132268.54017406539
},
- {-188646.38935641639, -132268.54017406539
},
+ { 188646.38935641639, 132268.54017406539},
+ { 188646.38935641639, -132268.54017406539},
+ {-188646.38935641639, 132268.54017406539},
+ {-188646.38935641639, -132268.54017406539},
};
XY inv_in[] = {
@@ -104,10 +104,10 @@ int pj_eck4_selftest (void) { };
LP s_inv_expect[] = {
- { 0.0021202405520236059, 0.00075601458836610643
},
- { 0.0021202405520236059, -0.00075601458836610643
},
- {-0.0021202405520236059, 0.00075601458836610643
},
- {-0.0021202405520236059, -0.00075601458836610643
},
+ { 0.0021202405520236059, 0.00075601458836610643},
+ { 0.0021202405520236059, -0.00075601458836610643},
+ {-0.0021202405520236059, 0.00075601458836610643},
+ {-0.0021202405520236059, -0.00075601458836610643},
};
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);
diff --git a/src/PJ_eck5.c b/src/PJ_eck5.c index 029c18e0..ccfcb88f 100644 --- a/src/PJ_eck5.c +++ b/src/PJ_eck5.c @@ -1,20 +1,108 @@ -#define PJ_LIB__ -# include <projects.h> -PROJ_HEAD(eck5, "Eckert V") "\n\tPCyl, Sph."; -#define XF 0.44101277172455148219 -#define RXF 2.26750802723822639137 -#define YF 0.88202554344910296438 -#define RYF 1.13375401361911319568 -FORWARD(s_forward); /* spheroid */ - (void) P; - xy.x = XF * (1. + cos(lp.phi)) * lp.lam; - xy.y = YF * lp.phi; - return (xy); -} -INVERSE(s_inverse); /* spheroid */ - (void) P; - lp.lam = RXF * xy.x / (1. + cos( lp.phi = RYF * xy.y)); - return (lp); -} -FREEUP; if (P) pj_dalloc(P); } -ENTRY0(eck5); P->es = 0.; P->inv = s_inverse; P->fwd = s_forward; ENDENTRY(P) +#define PJ_LIB__
+#include <projects.h>
+
+PROJ_HEAD(eck5, "Eckert V") "\n\tPCyl, Sph.";
+
+#define XF 0.44101277172455148219
+#define RXF 2.26750802723822639137
+#define YF 0.88202554344910296438
+#define RYF 1.13375401361911319568
+
+
+static XY s_forward (LP lp, PJ *P) { /* Spheroidal, forward */
+ XY xy = {0.0,0.0};
+ (void) P;
+ xy.x = XF * (1. + cos(lp.phi)) * lp.lam;
+ xy.y = YF * lp.phi;
+
+ return xy;
+}
+
+
+static LP s_inverse (XY xy, PJ *P) { /* Spheroidal, inverse */
+ LP lp = {0.0,0.0};
+ (void) P;
+ lp.lam = RXF * xy.x / (1. + cos( lp.phi = RYF * xy.y));
+
+ return lp;
+}
+
+
+static void *freeup_new (PJ *P) { /* Destructor */
+ if (0==P)
+ return 0;
+ return pj_dealloc(P);
+}
+
+static void freeup (PJ *P) {
+ freeup_new (P);
+ return;
+}
+
+
+PJ *PROJECTION(eck5) {
+ P->es = 0.0;
+ P->inv = s_inverse;
+ P->fwd = s_forward;
+
+ return P;
+}
+
+#ifdef PJ_OMIT_SELFTEST
+int pj_eck5_selftest (void) {return 0;}
+#else
+
+int pj_eck5_selftest (void) {
+ double tolerance_lp = 1e-10;
+ double tolerance_xy = 1e-7;
+
+ char e_args[] = {"+proj=eck5 +ellps=GRS80 +lat_1=0.5 +lat_2=2"};
+ char s_args[] = {"+proj=eck5 +a=6400000 +lat_1=0.5 +lat_2=2"};
+
+ LP fwd_in[] = {
+ { 2, 1},
+ { 2,-1},
+ {-2, 1},
+ {-2,-1}
+ };
+
+ XY e_fwd_expect[] = {
+ { 196358.31442683787, 98186.634363414545
},
+ { 196358.31442683787, -98186.634363414545
},
+ {-196358.31442683787, 98186.634363414545
},
+ {-196358.31442683787, -98186.634363414545
},
+ };
+
+ XY s_fwd_expect[] = {
+ { 197031.39213406085, 98523.198847226551
},
+ { 197031.39213406085, -98523.198847226551
},
+ {-197031.39213406085, 98523.198847226551
},
+ {-197031.39213406085, -98523.198847226551
},
+ };
+
+ XY inv_in[] = {
+ { 200, 100},
+ { 200,-100},
+ {-200, 100},
+ {-200,-100}
+ };
+
+ LP e_inv_expect[] = {
+ {0.0020369371178927064, 0.0010184685588659013
},
+ {0.0020369371178927064, -0.0010184685588659013
},
+ {-0.0020369371178927064, 0.0010184685588659013
},
+ {-0.0020369371178927064, -0.0010184685588659013
},
+ };
+
+ LP s_inv_expect[] = {
+ {0.002029978749734037, 0.001014989374787388
},
+ {0.002029978749734037, -0.001014989374787388
},
+ {-0.002029978749734037, 0.001014989374787388
},
+ {-0.002029978749734037, -0.001014989374787388
},
+ };
+
+ 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
|