diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2016-10-18 21:03:18 +0200 |
|---|---|---|
| committer | Kristian Evers <kristianevers@gmail.com> | 2016-10-18 21:03:18 +0200 |
| commit | 282d6abed47b040cae76cac4d4899bc8c08029f8 (patch) | |
| tree | 20f98b28ad3893be876ffe479cc4408f00489d03 | |
| parent | 0eccceb7e89a798d07390f65f3261cdf85a69ff6 (diff) | |
| download | PROJ-282d6abed47b040cae76cac4d4899bc8c08029f8.tar.gz PROJ-282d6abed47b040cae76cac4d4899bc8c08029f8.zip | |
Fixes #162. Latitude origin was erroneously set to -39 instead of 39. Updated origin confirmed in Snyder p.209. Self-test data was based on bad implementation and has been recalculated.
| -rw-r--r-- | src/PJ_mod_ster.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/PJ_mod_ster.c b/src/PJ_mod_ster.c index 3e41b746..9d34aa73 100644 --- a/src/PJ_mod_ster.c +++ b/src/PJ_mod_ster.c @@ -194,7 +194,7 @@ PJ *PROJECTION(gs48) { Q->n = 4; P->lam0 = DEG_TO_RAD * -96.; - P->phi0 = DEG_TO_RAD * -39.; + P->phi0 = DEG_TO_RAD * 39.; Q->zcoeff = AB; P->es = 0.; P->a = 6370997.; @@ -398,24 +398,24 @@ int pj_gs48_selftest (void) { }; XY s_fwd_expect[] = { - {-12110635.970867658000, 11668127.145744404000}, - { 55440975.381938063000, 52147696.705027729000}, - { 4451809.270766614000, 8613528.123849634100}, - { 468857.625827528540, 14336668.749030361000}, + { -1923908.446529345820, 355874.658944479190}, + { 1354020.375109298155, 3040846.007866524626}, + { 1625139.160484319553, -1413614.894029108109}, + { 90241.658071457961, -439595.048485902138}, }; XY inv_in[] = { - {-11980000.0, 11570000.0}, - { 5500000.0, 52000000.0}, - { 4400000.0, 8600000.0}, - { 460000.0, 14000000.0}, + { -1923000.0, 355000.0}, + { 1354000.0, 3040000.0}, + { 1625000.0, -1413000.0}, + { 90000.0, -439000.0}, }; LP s_inv_expect[] = { - {-119.003821215898, 39.801671381755}, - { -92.805621432558, 59.836947814918}, - { -80.122548940303, 24.869675983950}, - { -94.990474496482, 34.401182359832}, + {-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); |