diff options
| author | Frank Warmerdam <warmerdam@pobox.com> | 2012-03-07 04:16:11 +0000 |
|---|---|---|
| committer | Frank Warmerdam <warmerdam@pobox.com> | 2012-03-07 04:16:11 +0000 |
| commit | 3ea87ae29cf6c3e9688c3f5c27280b717b671374 (patch) | |
| tree | 4ffa7e334bec9573323140631620b612f60cc038 | |
| parent | 5229741fe5cdf2e5fa4772b9141298417331fa98 (diff) | |
| download | PROJ-3ea87ae29cf6c3e9688c3f5c27280b717b671374.tar.gz PROJ-3ea87ae29cf6c3e9688c3f5c27280b717b671374.zip | |
fix pconic forward to use P->sig (#148)
git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@2186 4e78687f-474d-0410-85f9-8d5e500ac6b2
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | nad/testvarious | 13 | ||||
| -rw-r--r-- | nad/tv_out.dist | 4 | ||||
| -rw-r--r-- | src/PJ_sconics.c | 2 |
4 files changed, 23 insertions, 1 deletions
@@ -1,3 +1,8 @@ +2012-03-06 Frank Warmerdam <warmerdam@pobox.com> + + * src/PJ_sconics.c: Fix missing P->sig term in pconic forward + projection equation (#148). + 2012-03-03 Frank Warmerdam <warmerdam@pobox.com> * src/PJ_omerc.c: Support +no_uoff and +no_off (#128) diff --git a/nad/testvarious b/nad/testvarious index 3886de56..31a86c9b 100755 --- a/nad/testvarious +++ b/nad/testvarious @@ -402,6 +402,19 @@ $EXE +proj=latlong +a=1 +lon_0=0 \ 180.0 67.5 0 1.341974988462332E7 7400065.6562573705 180.0 90.0 0 9591912.979377454 9062062.394736718 EOF +echo "##############################################################" >> ${OUT} +echo "Test pconic (#148)" >> ${OUT} +# +$EXE +proj=latlong +datum=WGS84 \ + +to +proj=pconic +units=m +lat_1=20n +lat_2=60n +lon_0=60W +datum=WGS84 \ + -E >>${OUT} <<EOF +-70.4 -23.65 +EOF +$EXE +proj=pconic +units=m +lat_1=20n +lat_2=60n +lon_0=60W +datum=WGS84 \ + +to +proj=latlong +datum=WGS84 \ + -E >>${OUT} <<EOF +-2240096.40 -6940342.15 +EOF ############################################################################## # Done! # do 'diff' with distribution results diff --git a/nad/tv_out.dist b/nad/tv_out.dist index 912302e3..20d00d3e 100644 --- a/nad/tv_out.dist +++ b/nad/tv_out.dist @@ -182,3 +182,7 @@ Test the natural earth projection 180.0 45.0 0 15698086.3318062 5052537.3899732 0.0000000 1.5698086331806187E7 5052537.389973222 180.0 67.5 0 13419749.8846233 7400065.6562574 0.0000000 1.341974988462332E7 7400065.6562573705 180.0 90.0 0 9591912.9793775 9062062.3947367 0.0000000 9591912.979377454 9062062.394736718 +############################################################## +Test pconic (#148) +-70.4 -23.65 -2240096.40 -6940342.15 0.00 +-2240096.40 -6940342.15 70d24'W 23d39'S 0.000 diff --git a/src/PJ_sconics.c b/src/PJ_sconics.c index b999f95c..8c17533d 100644 --- a/src/PJ_sconics.c +++ b/src/PJ_sconics.c @@ -58,7 +58,7 @@ FORWARD(s_forward); /* spheroid */ rho = P->rho_c + tan(P->sig - lp.phi); break; case PCONIC: - rho = P->c2 * (P->c1 - tan(lp.phi)); + rho = P->c2 * (P->c1 - tan(lp.phi - P->sig)); break; default: rho = P->rho_c - lp.phi; |