diff options
| author | Frank Warmerdam <warmerdam@pobox.com> | 2011-06-09 21:49:33 +0000 |
|---|---|---|
| committer | Frank Warmerdam <warmerdam@pobox.com> | 2011-06-09 21:49:33 +0000 |
| commit | 42abd11f539575007ae4eddec40d3748a2073fc9 (patch) | |
| tree | 47e59a9e558c5e63cd9843fc79004d9b44e2b4ac | |
| parent | 67e58252e9c5ce192afed5d3b777e06e93daea04 (diff) | |
| download | PROJ-42abd11f539575007ae4eddec40d3748a2073fc9.tar.gz PROJ-42abd11f539575007ae4eddec40d3748a2073fc9.zip | |
fix robinson projection constant (#113)
git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@2051 4e78687f-474d-0410-85f9-8d5e500ac6b2
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rwxr-xr-x | nad/testvarious | 10 | ||||
| -rw-r--r-- | nad/tv_out.dist | 4 | ||||
| -rw-r--r-- | src/PJ_robin.c | 2 |
4 files changed, 17 insertions, 1 deletions
@@ -1,5 +1,7 @@ 2011-06-09 Frank Warmerdam <warmerdam@pobox.com> + * src/PJ_robin.c: fix mistaken constant value (#113). + * src/pj_init.c: fix for +axis validation (#87) 2011-05-31 Frank Warmerdam <warmerdam@pobox.com> diff --git a/nad/testvarious b/nad/testvarious index 69bd949d..3913ce7d 100755 --- a/nad/testvarious +++ b/nad/testvarious @@ -228,6 +228,16 @@ $EXE +proj=latlong +datum=WGS84 \ 15d4'42.357"E 14d48'56.372"N 0.000 EOF # +echo "##############################################################" >> ${OUT} +echo "Test robinson projection (#113)" >> ${OUT} +# +$EXE +proj=latlong +datum=WGS84 \ + +to +proj=robin +datum=WGS84 \ + -E >>${OUT} <<EOF +-30 40 +-35 45 +EOF +# ############################################################################## # Done! # do 'diff' with distribution results diff --git a/nad/tv_out.dist b/nad/tv_out.dist index d7215a2b..8e9d5b12 100644 --- a/nad/tv_out.dist +++ b/nad/tv_out.dist @@ -80,3 +80,7 @@ Test transverse mercator inverse (#97) 10d40'55.532"W 17d42'48.526"N 0.000 999999.99 1999999.99 0.00 1d32'21.33"W 17d3'47.233"N 0.000 2000000.03 1999999.62 0.00 15d4'42.357"E 14d48'56.372"N 0.000 3999967.33 1999855.31 0.00 +############################################################## +Test robinson projection (#113) +-30 40 -2612095.95 4276351.58 0.00 +-35 45 -2963455.42 4805073.65 0.00 diff --git a/src/PJ_robin.c b/src/PJ_robin.c index b5c5b02f..71dac1e3 100644 --- a/src/PJ_robin.c +++ b/src/PJ_robin.c @@ -35,7 +35,7 @@ Y[] = { {0.31, 0.0124108, 3.73349e-06, -1.1779e-06}, {0.372, 0.0123598, -1.3935e-05, 4.39588e-06}, {0.434, 0.0125501, 5.20034e-05, -1.00051e-05}, - {0.4968, 0.0123198, -9.80735e-05, 9.22397e-06}, + {0.4958, 0.0123198, -9.80735e-05, 9.22397e-06}, {0.5571, 0.0120308, 4.02857e-05, -5.2901e-06}, {0.6176, 0.0120369, -3.90662e-05, 7.36117e-07}, {0.6769, 0.0117015, -2.80246e-05, -8.54283e-07}, |