From b75f02e24f570b6e4d113da2944ef69dc396f54f Mon Sep 17 00:00:00 2001
From: Frank Warmerdam <warmerdam@pobox.com>
Date: Sat, 3 Mar 2012 18:38:07 +0000
Subject: cleanup odd code construct in PJ_stere and extend stere testing a bit
 (#147)

git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@2180 4e78687f-474d-0410-85f9-8d5e500ac6b2
---
 ChangeLog       | 4 ++++
 nad/testvarious | 9 +++++++++
 nad/tv_out.dist | 3 +++
 src/PJ_stere.c  | 2 +-
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index a80a9111..751b1829 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-03-03  Frank Warmerdam  <warmerdam@pobox.com>
+
+	* src/PJ_stere.c: Cleanup odd code construct (#147)
+
 2012-02-26  Frank Warmerdam  <warmerdam@pobox.com>
 
 	* src/PJ_geos.c, nad/testvarious: Added GEOS +sweep and add GEOS 
diff --git a/nad/testvarious b/nad/testvarious
index 7a753404..aadb8796 100755
--- a/nad/testvarious
+++ b/nad/testvarious
@@ -153,6 +153,15 @@ $EXE +proj=latlong +datum=WGS84 \
 EOF
 #
 echo "##############################################################" >> ${OUT}
+echo "Test stere without lat_ts (#147)" >> ${OUT}
+#
+$EXE +proj=latlong +datum=WGS84 \
+ +to +proj=stere +lat_0=40 +lon_0=10  +datum=WGS84 \
+ -E >>${OUT} <<EOF
+20 45
+EOF
+#
+echo "##############################################################" >> ${OUT}
 echo "Test sts projection (re: ticket 12)" >> ${OUT}
 #
 $EXE +proj=latlong +ellps=WGS84 \
diff --git a/nad/tv_out.dist b/nad/tv_out.dist
index e13367f6..97c05ddf 100644
--- a/nad/tv_out.dist
+++ b/nad/tv_out.dist
@@ -46,6 +46,9 @@ Test geocentric x/y/z consumption.
 Test stere projection (re: win32 ticket 12)
 105 40	5577808.93	1494569.40 0.00
 ##############################################################
+Test stere without lat_ts (#147)
+20 45	789468.08	602385.33 0.00
+##############################################################
 Test sts projection (re: ticket 12)
 4.897000 52.371000	383646.09	5997047.89 0.00
 383646.088858 5997047.888175	4d53'49.2"E	52d22'15.6"N 0.000
diff --git a/src/PJ_stere.c b/src/PJ_stere.c
index 2ee63f53..52ec1df1 100644
--- a/src/PJ_stere.c
+++ b/src/PJ_stere.c
@@ -227,7 +227,7 @@ setup(PJ *P) { /* general initialization */
 }
 ENTRY0(stere)
 	P->phits = pj_param(P->ctx, P->params, "tlat_ts").i ?
-		P->phits = pj_param(P->ctx, P->params, "rlat_ts").f : HALFPI;
+            pj_param(P->ctx, P->params, "rlat_ts").f : HALFPI;
 ENDENTRY(setup(P))
 ENTRY0(ups)
 	/* International Ellipsoid */
-- 
cgit v1.2.3