diff options
| author | Thomas Knudsen <busstoptaktik@users.noreply.github.com> | 2017-11-12 06:37:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-12 06:37:50 +0100 |
| commit | 3bfab730edf6d6cb55d6c9cd29f3571bb815df33 (patch) | |
| tree | f325075a75c3672d73a67593a2183972a8acfe2e /src | |
| parent | 42e375fac802c535899f4a190b2c60667048e586 (diff) | |
| parent | 48e476b968ce7cc90234b529d6af1265902be623 (diff) | |
| download | PROJ-3bfab730edf6d6cb55d6c9cd29f3571bb815df33.tar.gz PROJ-3bfab730edf6d6cb55d6c9cd29f3571bb815df33.zip | |
Merge pull request #657 from busstoptaktik/selftest-removal-lm
Remove selftests from projection files starting with l, m
Diffstat (limited to 'src')
| -rw-r--r-- | src/PJ_labrd.c | 44 | ||||
| -rw-r--r-- | src/PJ_laea.c | 59 | ||||
| -rw-r--r-- | src/PJ_lagrng.c | 30 | ||||
| -rw-r--r-- | src/PJ_larr.c | 30 | ||||
| -rw-r--r-- | src/PJ_lask.c | 30 | ||||
| -rw-r--r-- | src/PJ_latlong.c | 8 | ||||
| -rw-r--r-- | src/PJ_lcc.c | 44 | ||||
| -rw-r--r-- | src/PJ_lcca.c | 44 | ||||
| -rw-r--r-- | src/PJ_loxim.c | 44 | ||||
| -rw-r--r-- | src/PJ_lsat.c | 44 | ||||
| -rw-r--r-- | src/PJ_mbt_fps.c | 44 | ||||
| -rw-r--r-- | src/PJ_mbtfpp.c | 44 | ||||
| -rw-r--r-- | src/PJ_mbtfpq.c | 44 | ||||
| -rw-r--r-- | src/PJ_merc.c | 59 | ||||
| -rw-r--r-- | src/PJ_mill.c | 44 | ||||
| -rw-r--r-- | src/PJ_misrsom.c | 59 | ||||
| -rw-r--r-- | src/PJ_mod_ster.c | 257 | ||||
| -rw-r--r-- | src/PJ_moll.c | 138 |
18 files changed, 27 insertions, 1039 deletions
diff --git a/src/PJ_labrd.c b/src/PJ_labrd.c index 4b5d93a5..7db03249 100644 --- a/src/PJ_labrd.c +++ b/src/PJ_labrd.c @@ -129,46 +129,4 @@ PJ *PROJECTION(labrd) { } -#ifndef PJ_SELFTEST -int pj_labrd_selftest (void) {return 0;} -#else - -int pj_labrd_selftest (void) { - double tolerance_lp = 1e-10; - double tolerance_xy = 1e-7; - - char e_args[] = {"+proj=labrd +ellps=GRS80 +lon_0=0.5 +lat_0=2"}; - - LP fwd_in[] = { - { 2, 1}, - { 2,-1}, - {-2, 1}, - {-2,-1} - }; - - XY e_fwd_expect[] = { - { 166973.166090228391, -110536.912730266107}, - { 166973.168287157256, -331761.993650884193}, - {-278345.500519976194, -110469.032642031714}, - {-278345.504185269645, -331829.870790275279}, - }; - - XY inv_in[] = { - { 200, 100}, - { 200,-100}, - {-200, 100}, - {-200,-100} - }; - - LP e_inv_expect[] = { - {0.501797719349373672, 2.00090435742047923}, - {0.501797717380853658, 1.99909564058898681}, - {0.498202280650626328, 2.00090435742047923}, - {0.498202282619146342, 1.99909564058898681}, - }; - - return pj_generic_selftest (e_args, 0, tolerance_xy, tolerance_lp, 4, 4, fwd_in, e_fwd_expect, 0, inv_in, e_inv_expect, 0); -} - - -#endif +int pj_labrd_selftest (void) {return 10000;} diff --git a/src/PJ_laea.c b/src/PJ_laea.c index 0c5d5db9..5cf5f5cd 100644 --- a/src/PJ_laea.c +++ b/src/PJ_laea.c @@ -296,61 +296,4 @@ PJ *PROJECTION(laea) { } -#ifndef PJ_SELFTEST -int pj_laea_selftest (void) {return 0;} -#else - -int pj_laea_selftest (void) { - double tolerance_lp = 1e-10; - double tolerance_xy = 1e-7; - - char e_args[] = {"+proj=laea +ellps=GRS80 +lat_1=0.5 +lat_2=2"}; - char s_args[] = {"+proj=laea +R=6400000 +lat_1=0.5 +lat_2=2"}; - - LP fwd_in[] = { - { 2, 1}, - { 2,-1}, - {-2, 1}, - {-2,-1} - }; - - XY e_fwd_expect[] = { - { 222602.471450095181, 110589.82722441027}, - { 222602.471450095181, -110589.827224408786}, - {-222602.471450095181, 110589.82722441027}, - {-222602.471450095181, -110589.827224408786}, - }; - - XY s_fwd_expect[] = { - { 223365.281370124663, 111716.668072915665}, - { 223365.281370124663, -111716.668072915665}, - {-223365.281370124663, 111716.668072915665}, - {-223365.281370124663, -111716.668072915665}, - }; - - XY inv_in[] = { - { 200, 100}, - { 200,-100}, - {-200, 100}, - {-200,-100} - }; - - LP e_inv_expect[] = { - { 0.00179663056847900867, 0.000904369475966495845}, - { 0.00179663056847900867, -0.000904369475966495845}, - {-0.00179663056847900867, 0.000904369475966495845}, - {-0.00179663056847900867, -0.000904369475966495845}, - }; - - LP s_inv_expect[] = { - { 0.00179049311002060264, 0.000895246554791735271}, - { 0.00179049311002060264, -0.000895246554791735271}, - {-0.00179049311002060264, 0.000895246554791735271}, - {-0.00179049311002060264, -0.000895246554791735271}, - }; - - return pj_generic_selftest (e_args, s_args, tolerance_xy, tolerance_lp, 4, 4, fwd_in, e_fwd_expect, s_fwd_expect, inv_in, e_inv_expect, s_inv_expect); -} - - -#endif +int pj_laea_selftest (void) {return 10000;} diff --git a/src/PJ_lagrng.c b/src/PJ_lagrng.c index e30f6a36..584f9a7a 100644 --- a/src/PJ_lagrng.c +++ b/src/PJ_lagrng.c @@ -62,32 +62,4 @@ PJ *PROJECTION(lagrng) { } -#ifndef PJ_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 +W=2 +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 +int pj_lagrng_selftest (void) {return 10000;} diff --git a/src/PJ_larr.c b/src/PJ_larr.c index cd6e6c8a..dc791ba0 100644 --- a/src/PJ_larr.c +++ b/src/PJ_larr.c @@ -25,32 +25,4 @@ PJ *PROJECTION(larr) { } -#ifndef PJ_SELFTEST -int pj_larr_selftest (void) {return 0;} -#else - -int pj_larr_selftest (void) { - double tolerance_lp = 1e-10; - double tolerance_xy = 1e-7; - - char s_args[] = {"+proj=larr +a=6400000 +lat_1=0.5 +lat_2=2"}; - - LP fwd_in[] = { - { 2, 1}, - { 2,-1}, - {-2, 1}, - {-2,-1} - }; - - XY s_fwd_expect[] = { - {223393.637624200899, 111707.215961255497}, - {223393.637624200899, -111707.215961255497}, - {-223393.637624200899, 111707.215961255497}, - {-223393.637624200899, -111707.215961255497}, - }; - - return pj_generic_selftest (0, s_args, tolerance_xy, tolerance_lp, 4, 4, fwd_in, 0, s_fwd_expect, 0, 0, 0); -} - - -#endif +int pj_larr_selftest (void) {return 10000;} diff --git a/src/PJ_lask.c b/src/PJ_lask.c index d0efeb7d..998b3bbe 100644 --- a/src/PJ_lask.c +++ b/src/PJ_lask.c @@ -37,32 +37,4 @@ PJ *PROJECTION(lask) { return P; } -#ifndef PJ_SELFTEST -int pj_lask_selftest (void) {return 0;} -#else - -int pj_lask_selftest (void) { - double tolerance_lp = 1e-10; - double tolerance_xy = 1e-7; - - char s_args[] = {"+proj=lask +a=6400000 +lat_1=0.5 +lat_2=2"}; - - LP fwd_in[] = { - { 2, 1}, - { 2,-1}, - {-2, 1}, - {-2,-1} - }; - - XY s_fwd_expect[] = { - { 217928.275907355128, 112144.32922014239}, - { 217928.275907355128, -112144.32922014239}, - {-217928.275907355128, 112144.32922014239}, - {-217928.275907355128, -112144.32922014239}, - }; - - return pj_generic_selftest (0, s_args, tolerance_xy, tolerance_lp, 4, 4, fwd_in, 0, s_fwd_expect, 0, 0, 0); -} - - -#endif +int pj_lask_selftest (void) {return 10000;} diff --git a/src/PJ_latlong.c b/src/PJ_latlong.c index 35c573aa..612bef78 100644 --- a/src/PJ_latlong.c +++ b/src/PJ_latlong.c @@ -131,7 +131,7 @@ PJ *PROJECTION(lonlat) { * * The code should be covered by the tests in nad/. * */ -int pj_latlong_selftest (void) {return 0;} -int pj_longlat_selftest (void) {return 0;} -int pj_latlon_selftest (void) {return 0;} -int pj_lonlat_selftest (void) {return 0;} +int pj_latlong_selftest (void) {return 10000;} +int pj_longlat_selftest (void) {return 10000;} +int pj_latlon_selftest (void) {return 10000;} +int pj_lonlat_selftest (void) {return 10000;} diff --git a/src/PJ_lcc.c b/src/PJ_lcc.c index 78c227b8..4a392690 100644 --- a/src/PJ_lcc.c +++ b/src/PJ_lcc.c @@ -145,46 +145,4 @@ PJ *PROJECTION(lcc) { } -#ifndef PJ_SELFTEST -int pj_lcc_selftest (void) {return 0;} -#else - -int pj_lcc_selftest (void) { - double tolerance_lp = 1e-10; - double tolerance_xy = 1e-7; - - char e_args[] = {"+proj=lcc +ellps=GRS80 +lat_1=0.5 +lat_2=2"}; - - LP fwd_in[] = { - { 2, 1}, - { 2,-1}, - {-2, 1}, - {-2,-1} - }; - - XY e_fwd_expect[] = { - { 222588.439735968423, 110660.533870799671}, - { 222756.879700278747, -110532.797660827026}, - {-222588.439735968423, 110660.533870799671}, - {-222756.879700278747, -110532.797660827026}, - }; - - XY inv_in[] = { - { 200, 100}, - { 200,-100}, - {-200, 100}, - {-200,-100} - }; - - LP e_inv_expect[] = { - { 0.00179635940600536667, 0.000904232207322381741}, - { 0.00179635817735249777, -0.000904233135128348995}, - {-0.00179635940600536667, 0.000904232207322381741}, - {-0.00179635817735249777, -0.000904233135128348995}, - }; - - return pj_generic_selftest (e_args, 0, tolerance_xy, tolerance_lp, 4, 4, fwd_in, e_fwd_expect, 0, inv_in, e_inv_expect, 0); -} - - -#endif +int pj_lcc_selftest (void) {return 10000;} diff --git a/src/PJ_lcca.c b/src/PJ_lcca.c index cf1aa83f..6aa33c4f 100644 --- a/src/PJ_lcca.c +++ b/src/PJ_lcca.c @@ -160,46 +160,4 @@ PJ *PROJECTION(lcca) { -#ifndef PJ_SELFTEST -int pj_lcca_selftest (void) {return 0;} -#else - -int pj_lcca_selftest (void) { - double tolerance_lp = 1e-10; - double tolerance_xy = 1e-7; - - char e_args[] = {"+proj=lcca +ellps=GRS80 +lat_0=1 +lat_1=0.5 +lat_2=2"}; - - LP fwd_in[] = { - { 2, 1}, - { 2,-1}, - {-2, 1}, - {-2,-1} - }; - - XY e_fwd_expect[] = { - { 222605.285770237417, 67.8060072715846616}, - { 222740.037637936533, -221125.539829601563}, - {-222605.285770237417, 67.8060072715846616}, - {-222740.037637936533, -221125.539829601563}, - }; - - XY inv_in[] = { - { 200, 100}, - { 200,-100}, - {-200, 100}, - {-200,-100} - }; - - LP e_inv_expect[] = { - { 0.00179690290525662526, 1.00090436621350798}, - { 0.00179690192174008037, 0.999095632791497268}, - {-0.00179690290525662526, 1.00090436621350798}, - {-0.00179690192174008037, 0.999095632791497268}, - }; - - return pj_generic_selftest (e_args, 0, tolerance_xy, tolerance_lp, 4, 4, fwd_in, e_fwd_expect, 0, inv_in, e_inv_expect, 0); -} - - -#endif +int pj_lcca_selftest (void) {return 10000;} diff --git a/src/PJ_loxim.c b/src/PJ_loxim.c index a4ae074b..2b3e922d 100644 --- a/src/PJ_loxim.c +++ b/src/PJ_loxim.c @@ -72,46 +72,4 @@ PJ *PROJECTION(loxim) { } -#ifndef PJ_SELFTEST -int pj_loxim_selftest (void) {return 0;} -#else - -int pj_loxim_selftest (void) { - double tolerance_lp = 1e-10; - double tolerance_xy = 1e-7; - - char s_args[] = {"+proj=loxim +a=6400000 +lat_1=0.5 +lat_2=2"}; - - LP fwd_in[] = { - { 2, 1}, - { 2,-1}, - {-2, 1}, - {-2,-1} - }; - - XY s_fwd_expect[] = { - { 223382.295791338867, 55850.5360638185448}, - { 223393.637462243292, -167551.608191455656}, - {-223382.295791338867, 55850.5360638185448}, - {-223393.637462243292, -167551.608191455656}, - }; - - XY inv_in[] = { - { 200, 100}, - { 200,-100}, - {-200, 100}, - {-200,-100} - }; - - LP s_inv_expect[] = { - { 0.00179056141104335601, 0.500895246554891926}, - { 0.00179056116683692576, 0.499104753445108074}, - {-0.00179056141104335601, 0.500895246554891926}, - {-0.00179056116683692576, 0.499104753445108074}, - }; - - 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 +int pj_loxim_selftest (void) {return 10000;} diff --git a/src/PJ_lsat.c b/src/PJ_lsat.c index 7319bee7..b3c36fe8 100644 --- a/src/PJ_lsat.c +++ b/src/PJ_lsat.c @@ -209,46 +209,4 @@ PJ *PROJECTION(lsat) { } -#ifndef PJ_SELFTEST -int pj_lsat_selftest (void) {return 0;} -#else - -int pj_lsat_selftest (void) { - double tolerance_lp = 1e-10; - double tolerance_xy = 1e-7; - - char e_args[] = {"+proj=lsat +ellps=GRS80 +lat_1=0.5 +lat_2=2 +lsat=1 +path=2"}; - - LP fwd_in[] = { - { 2, 1}, - { 2,-1}, - {-2, 1}, - {-2,-1} - }; - - XY e_fwd_expect[] = { - {18241950.01455855, 9998256.83982293494}, - {18746856.2533194572, 10215761.669925211}, - {18565503.6836331636, 9085039.14672705345}, - {19019696.9020289108, 9247763.0394328218}, - }; - - XY inv_in[] = { - { 200, 100}, - { 200,-100}, - {-200, 100}, - {-200,-100} - }; - - LP e_inv_expect[] = { - {126.000423834530011, 0.00172378224025701425}, - {126.002213738256714, 0.00188015467480917966}, - {126.000734468914601, -0.00188015467480917966}, - {126.002524372641304, -0.00172378224025701425}, - }; - - return pj_generic_selftest (e_args, 0, tolerance_xy, tolerance_lp, 4, 4, fwd_in, e_fwd_expect, 0, inv_in, e_inv_expect, 0); -} - - -#endif +int pj_lsat_selftest (void) {return 10000;} diff --git a/src/PJ_mbt_fps.c b/src/PJ_mbt_fps.c index c35da04c..6499249c 100644 --- a/src/PJ_mbt_fps.c +++ b/src/PJ_mbt_fps.c @@ -53,46 +53,4 @@ PJ *PROJECTION(mbt_fps) { return P; } -#ifndef PJ_SELFTEST -int pj_mbt_fps_selftest (void) {return 0;} -#else - -int pj_mbt_fps_selftest (void) { - double tolerance_lp = 1e-10; - double tolerance_xy = 1e-7; - - char s_args[] = {"+proj=mbt_fps +a=6400000 +lat_1=0.5 +lat_2=2"}; - - LP fwd_in[] = { - { 2, 1}, - { 2,-1}, - {-2, 1}, - {-2,-1} - }; - - XY s_fwd_expect[] = { - { 198798.176129849948, 125512.017254530627}, - { 198798.176129849948, -125512.017254530627}, - {-198798.176129849948, 125512.017254530627}, - {-198798.176129849948, -125512.017254530627}, - }; - - XY inv_in[] = { - { 200, 100}, - { 200,-100}, - {-200, 100}, - {-200,-100} - }; - - LP s_inv_expect[] = { - { 0.00201197086238270742, 0.000796711850174446003}, - { 0.00201197086238270742, -0.000796711850174446003}, - {-0.00201197086238270742, 0.000796711850174446003}, - {-0.00201197086238270742, -0.000796711850174446003}, - }; - - 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 +int pj_mbt_fps_selftest (void) {return 10000;} diff --git a/src/PJ_mbtfpp.c b/src/PJ_mbtfpp.c index 2bbb16b1..61254859 100644 --- a/src/PJ_mbtfpp.c +++ b/src/PJ_mbtfpp.c @@ -61,46 +61,4 @@ PJ *PROJECTION(mbtfpp) { return P; } -#ifndef PJ_SELFTEST -int pj_mbtfpp_selftest (void) {return 0;} -#else - -int pj_mbtfpp_selftest (void) { - double tolerance_lp = 1e-10; - double tolerance_xy = 1e-7; - - char s_args[] = {"+proj=mbtfpp +a=6400000 +lat_1=0.5 +lat_2=2"}; - - LP fwd_in[] = { - { 2, 1}, - { 2,-1}, - {-2, 1}, - {-2,-1} - }; - - XY s_fwd_expect[] = { - {206804.786929820373, 120649.762565792524}, - {206804.786929820373, -120649.762565792524}, - {-206804.786929820373, 120649.762565792524}, - {-206804.786929820373, -120649.762565792524}, - }; - - XY inv_in[] = { - { 200, 100}, - { 200,-100}, - {-200, 100}, - {-200,-100} - }; - - LP s_inv_expect[] = { - {0.00193395359462902698, 0.00082883725477665357}, - {0.00193395359462902698, -0.00082883725477665357}, - {-0.00193395359462902698, 0.00082883725477665357}, - {-0.00193395359462902698, -0.00082883725477665357}, - }; - - 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 +int pj_mbtfpp_selftest (void) {return 10000;} diff --git a/src/PJ_mbtfpq.c b/src/PJ_mbtfpq.c index 4901401e..a3743b59 100644 --- a/src/PJ_mbtfpq.c +++ b/src/PJ_mbtfpq.c @@ -70,46 +70,4 @@ PJ *PROJECTION(mbtfpq) { return P; } -#ifndef PJ_SELFTEST -int pj_mbtfpq_selftest (void) {return 0;} -#else - -int pj_mbtfpq_selftest (void) { - double tolerance_lp = 1e-10; - double tolerance_xy = 1e-7; - - char s_args[] = {"+proj=mbtfpq +a=6400000 +lat_1=0.5 +lat_2=2"}; - - LP fwd_in[] = { - { 2, 1}, - { 2,-1}, - {-2, 1}, - {-2,-1} - }; - - XY s_fwd_expect[] = { - { 209391.854738393013, 119161.040199054827}, - { 209391.854738393013, -119161.040199054827}, - {-209391.854738393013, 119161.040199054827}, - {-209391.854738393013, -119161.040199054827}, - }; - - XY inv_in[] = { - { 200, 100}, - { 200,-100}, - {-200, 100}, - {-200,-100} - }; - - LP s_inv_expect[] = { - { 0.00191010555824111571, 0.000839185447792341723}, - { 0.00191010555824111571, -0.000839185447792341723}, - {-0.00191010555824111571, 0.000839185447792341723}, - {-0.00191010555824111571, -0.000839185447792341723}, - }; - - 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 +int pj_mbtfpq_selftest (void) {return 10000;} diff --git a/src/PJ_merc.c b/src/PJ_merc.c index d17a2d50..994d540f 100644 --- a/src/PJ_merc.c +++ b/src/PJ_merc.c @@ -77,61 +77,4 @@ PJ *PROJECTION(merc) { } -#ifndef PJ_SELFTEST -int pj_merc_selftest (void) {return 0;} -#else - -int pj_merc_selftest (void) { - double tolerance_lp = 1e-10; - double tolerance_xy = 1e-7; - - char e_args[] = {"+proj=merc +ellps=GRS80 +lat_1=0.5 +lat_2=2"}; - char s_args[] = {"+proj=merc +R=6400000 +lat_1=0.5 +lat_2=2"}; - - LP fwd_in[] = { - { 2, 1}, - { 2,-1}, - {-2, 1}, - {-2,-1} - }; - - XY e_fwd_expect[] = { - { 222638.981586547132, 110579.965218249708}, - { 222638.981586547132, -110579.965218249112}, - {-222638.981586547132, 110579.965218249708}, - {-222638.981586547132, -110579.965218249112}, - }; - - XY s_fwd_expect[] = { - { 223402.144255274179, 111706.743574944077}, - { 223402.144255274179, -111706.743574944485}, - {-223402.144255274179, 111706.743574944077}, - {-223402.144255274179, -111706.743574944485}, - }; - - XY inv_in[] = { - { 200, 100}, - { 200,-100}, - {-200, 100}, - {-200,-100} - }; - - LP e_inv_expect[] = { - { 0.00179663056823904264, 0.00090436947522799056}, - { 0.00179663056823904264, -0.00090436947522799056}, - {-0.00179663056823904264, 0.00090436947522799056}, - {-0.00179663056823904264, -0.00090436947522799056}, - }; - - LP s_inv_expect[] = { - { 0.00179049310978382265, 0.000895246554845297135}, - { 0.00179049310978382265, -0.000895246554858019272}, - {-0.00179049310978382265, 0.000895246554845297135}, - {-0.00179049310978382265, -0.000895246554858019272}, - }; - - return pj_generic_selftest (e_args, s_args, tolerance_xy, tolerance_lp, 4, 4, fwd_in, e_fwd_expect, s_fwd_expect, inv_in, e_inv_expect, s_inv_expect); -} - - -#endif +int pj_merc_selftest (void) {return 10000;} diff --git a/src/PJ_mill.c b/src/PJ_mill.c index 829bc3be..c491d79d 100644 --- a/src/PJ_mill.c +++ b/src/PJ_mill.c @@ -34,46 +34,4 @@ PJ *PROJECTION(mill) { } -#ifndef PJ_SELFTEST -int pj_mill_selftest (void) {return 0;} -#else - -int pj_mill_selftest (void) { - double tolerance_lp = 1e-10; - double tolerance_xy = 1e-7; - - char s_args[] = {"+proj=mill +a=6400000 +lat_1=0.5 +lat_2=2"}; - - LP fwd_in[] = { - { 2, 1}, - { 2,-1}, - {-2, 1}, - {-2,-1} - }; - - XY s_fwd_expect[] = { - { 223402.144255274179, 111704.701754393827}, - { 223402.144255274179, -111704.701754396243}, - {-223402.144255274179, 111704.701754393827}, - {-223402.144255274179, -111704.701754396243}, - }; - - XY inv_in[] = { - { 200, 100}, - { 200,-100}, - {-200, 100}, - {-200,-100} - }; - - LP s_inv_expect[] = { - { 0.00179049310978382265, 0.000895246554873922024}, - { 0.00179049310978382265, -0.000895246554873922024}, - {-0.00179049310978382265, 0.000895246554873922024}, - {-0.00179049310978382265, -0.000895246554873922024}, - }; - - 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 +int pj_mill_selftest (void) {return 10000;} diff --git a/src/PJ_misrsom.c b/src/PJ_misrsom.c index 5c5a226f..77717f03 100644 --- a/src/PJ_misrsom.c +++ b/src/PJ_misrsom.c @@ -216,61 +216,4 @@ PJ *PROJECTION(misrsom) { } -#ifndef PJ_SELFTEST -int pj_misrsom_selftest (void) {return 0;} -#else - -int pj_misrsom_selftest (void) { - double tolerance_lp = 1e-10; - double tolerance_xy = 1e-7; - - char e_args[] = {"+proj=misrsom +ellps=GRS80 +lat_1=0.5 +lat_2=2 +path=1"}; - char s_args[] = {"+proj=misrsom +R=6400000 +lat_1=0.5 +lat_2=2 +path=1"}; - - LP fwd_in[] = { - { 2, 1}, - { 2,-1}, - {-2, 1}, - {-2,-1} - }; - - XY e_fwd_expect[] = { - {18556630.3683698252, 9533394.6753112711}, - {19041866.0067297369, 9707182.17532352544}, - {18816810.1301847994, 8647669.64980295487}, - {19252610.7845367305, 8778164.08580140397}, - }; - - XY s_fwd_expect[] = { - {18641249.2791703865, 9563342.53233416565}, - {19130982.4615812786, 9739539.59350463562}, - {18903483.5150115378, 8675064.50061797537}, - {19343388.3998006098, 8807471.90406848863}, - }; - - XY inv_in[] = { - { 200, 100}, - { 200,-100}, - {-200, 100}, - {-200,-100} - }; - - LP e_inv_expect[] = { - {127.759503987730625, 0.00173515039622462014}, - {127.761295471077958, 0.00187196632421706517}, - {127.759775773557251, -0.00187196632421891525}, - {127.76156725690457, -0.00173515039622462014}, - }; - - LP s_inv_expect[] = { - {127.75950514818588, 0.00171623111593511971}, - {127.761290323778738, 0.00185412132880796244}, - {127.759780920856471, -0.00185412132880796244}, - {127.761566096449329, -0.00171623111593511971}, - }; - - return pj_generic_selftest (e_args, s_args, tolerance_xy, tolerance_lp, 4, 4, fwd_in, e_fwd_expect, s_fwd_expect, inv_in, e_inv_expect, s_inv_expect); -} - - -#endif +int pj_misrsom_selftest (void) {return 10000;} diff --git a/src/PJ_mod_ster.c b/src/PJ_mod_ster.c index 767863c1..ca81a43f 100644 --- a/src/PJ_mod_ster.c +++ b/src/PJ_mod_ster.c @@ -278,255 +278,8 @@ PJ *PROJECTION(gs50) { } -#ifndef PJ_SELFTEST -int pj_mil_os_selftest (void) {return 0;} -#else - -int pj_mil_os_selftest (void) { - double tolerance_lp = 1e-10; - double tolerance_xy = 1e-7; - - char s_args[] = {"+proj=mil_os +R=6400000 +lat_1=0.5 +lat_2=2"}; - - LP fwd_in[] = { - { 2, 1}, - { 2,-1}, - {-2, 1}, - {-2,-1} - }; - - XY s_fwd_expect[] = { - {-1908527.94959420455, -1726237.4730614475}, - {-1916673.02291848511, -1943133.88812552323}, - {-2344429.41208962305, -1706258.05121891224}, - {-2354637.83553299867, -1926468.60513541684}, - }; - - XY inv_in[] = { - { 200, 100}, - { 200,-100}, - {-200, 100}, - {-200,-100} - }; - - LP s_inv_expect[] = { - {20.0020363939492398, 18.0009683469140498}, - {20.0020363715837419, 17.999031631815086}, - {19.9979636060507602, 18.0009683469140498}, - {19.9979636284162581, 17.999031631815086}, - }; - - 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 - - -#ifndef PJ_SELFTEST -int pj_lee_os_selftest (void) {return 0;} -#else - -int pj_lee_os_selftest (void) { - double tolerance_lp = 1e-10; - double tolerance_xy = 1e-7; - - char s_args[] = {"+proj=lee_os +R=6400000 +lat_1=0.5 +lat_2=2"}; - - LP fwd_in[] = { - { 2, 1}, - { 2,-1}, - {-2, 1}, - {-2,-1} - }; - - XY s_fwd_expect[] = { - {-25564478.9526050538, 154490848.8286255}, - { 30115393.9385746419, 125193997.439701974}, - {-31039340.5921660066, 57678685.0448915437}, - {-3088419.93942357088, 58150091.0991110131}, - }; - - XY inv_in[] = { - { 200, 100}, - { 200,-100}, - {-200, 100}, - {-200,-100} - }; - - LP s_inv_expect[] = { - {-164.997479457813824, -9.99875886103541411}, - {-164.997479438558884, -10.0012411200022751}, - {-165.002520542186289, -9.99875886103545142}, - {-165.002520561440946, -10.0012411200022999}, - }; - - 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 - - -#ifndef PJ_SELFTEST -int pj_gs48_selftest (void) {return 0;} -#else - -int pj_gs48_selftest (void) { - double tolerance_lp = 1e-12; - double tolerance_xy = 1e-8; - - char s_args[] = {"+proj=gs48 +R=6370997"}; - - /* All latitudes and longitudes within the continental US */ - LP fwd_in[] = { - { -119.0, 40.0}, - { -70.0, 64.0}, - { -80.0, 25.0}, - { -95.0, 35.0} - }; - - XY s_fwd_expect[] = { - { -1923908.446529345820, 355874.658944479190}, - { 1354020.375109298155, 3040846.007866524626}, - { 1625139.160484319553, -1413614.894029108109}, - { 90241.658071457961, -439595.048485902138}, - }; - - XY inv_in[] = { - { -1923000.0, 355000.0}, - { 1354000.0, 3040000.0}, - { 1625000.0, -1413000.0}, - { 90000.0, -439000.0}, - }; - - LP s_inv_expect[] = { - {-118.987112613284, 39.994449789388}, - { -70.005208999424, 63.993387835525}, - { -80.000346610440, 25.005602546594}, - { -95.002606473071, 35.005424705030}, - }; - - 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 - - -#ifndef PJ_SELFTEST -int pj_alsk_selftest (void) {return 0;} -#else - -int pj_alsk_selftest (void) { - - /* The standard test points are way outside the definition area bounds, hence we relax tolerances */ - double tolerance_lp = 1e-12; - double tolerance_xy = 1e-8; - - char e_args[] = {"+proj=alsk +ellps=clrk66"}; - char s_args[] = {"+proj=alsk +R=6370997"}; - - LP fwd_in[] = { - {-160.0, 55.0}, - {-160.0, 70.0}, - {-145.0, 70.0}, - {-145.0, 60.0} - }; - - XY e_fwd_expect[] = { - {-513253.146950842060, -968928.031867943470}, - {-305001.133897637190, 687494.464958650530}, - {266454.305088600490, 683423.477493030950}, - {389141.322439243960, -423913.251230396680}, - }; - - XY s_fwd_expect[] = { - {-511510.319410844070, -967150.991676078060}, - {-303744.771290368980, 685439.745941123230}, - {265354.974019662940, 681386.892874573010}, - {387711.995394026630, -422980.685505462640}, - }; - - XY inv_in[] = { - {-500000.0, -950000.0}, - {-305000.0, 700000.0}, - { 250000.0, 700000.0}, - { 400000.0, -400000.0} - }; - - LP e_inv_expect[] = { - {-159.830804302926, 55.183195262220}, - {-160.042203155537, 70.111086864056}, - {-145.381043551466, 70.163900908411}, - {-144.758985461448, 60.202929200739}, - }; - - LP s_inv_expect[] = { - {-159.854014457557, 55.165653849074}, - {-160.082332371601, 70.128307617632}, - {-145.347827407243, 70.181566919011}, - {-144.734239827146, 60.193564732505}, - }; - - return pj_generic_selftest (e_args, s_args, tolerance_xy, tolerance_lp, 4, 4, fwd_in, e_fwd_expect, s_fwd_expect, inv_in, e_inv_expect, s_inv_expect); -} - -#endif - - -#ifndef PJ_SELFTEST -int pj_gs50_selftest (void) {return 0;} -#else - -int pj_gs50_selftest (void) { - double tolerance_lp = 1e-12; - double tolerance_xy = 1e-8; - - char e_args[] = {"+proj=gs50 +ellps=clrk66"}; - char s_args[] = {"+proj=gs50 +R=6370997"}; - - LP fwd_in[] = { - {-160.0, 65.0}, - {-130.0, 45.0}, - { -65.0, 45.0}, - { -80.0, 36.0}, - }; - - XY e_fwd_expect[] = { - {-1874628.5377402329, 2660907.942291015300}, - { -771831.51885333552, 48465.166491304852}, - { 4030931.8339815089, 1323687.864777399200}, - { 3450764.2615361013, -175619.041820732440}, - }; - - XY s_fwd_expect[] = { - {-1867268.2534600089, 2656506.230401823300}, - { -769572.18967299373, 48324.312440863941}, - { 4019393.068680791200, 1320191.309350289200}, - { 3442685.615172345700, -178760.423489428680}, - }; - - XY inv_in[] = { - {-1800000.0, 2600000.0}, - { -800000.0, 500000.0}, - { 4000000.0, 1300000.0}, - { 3900000.0, -170000.0}, - }; - - LP e_inv_expect[] = { - {-157.989284999679, 64.851559609698}, - {-131.171390466814, 49.084969745967}, - { -65.491568685301, 44.992837923774}, - { -75.550660091101, 34.191114075743}, - }; - - LP s_inv_expect[] = { - {-158.163295044933, 64.854288364994}, - {-131.206816959506, 49.082915350974}, - { -65.348945220767, 44.957292681774}, - { -75.446820242089, 34.185406225616}, - }; - - return pj_generic_selftest (e_args, s_args, tolerance_xy, tolerance_lp, 4, 4, fwd_in, e_fwd_expect, s_fwd_expect, inv_in, e_inv_expect, s_inv_expect); -} - - -#endif +int pj_mil_os_selftest (void) {return 10000;} +int pj_lee_os_selftest (void) {return 10000;} +int pj_gs48_selftest (void) {return 10000;} +int pj_alsk_selftest (void) {return 10000;} +int pj_gs50_selftest (void) {return 10000;} diff --git a/src/PJ_moll.c b/src/PJ_moll.c index 8470bb3e..80dd70d0 100644 --- a/src/PJ_moll.c +++ b/src/PJ_moll.c @@ -106,138 +106,6 @@ PJ *PROJECTION(wag5) { return P; } - -#ifndef PJ_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); -} - -#endif - - -#ifndef PJ_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); -} - -#endif - -#ifndef PJ_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 +int pj_moll_selftest (void) {return 10000;} +int pj_wag4_selftest (void) {return 10000;} +int pj_wag5_selftest (void) {return 10000;} |
