diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rwxr-xr-x | nad/testvarious | 8 | ||||
| -rw-r--r-- | src/PJ_geos.c | 2 |
3 files changed, 9 insertions, 5 deletions
@@ -1,3 +1,7 @@ +2013-12-09 Frank Warmerdam <warmerdam@pobox.com> + + * src/PJ_geos.c, testvarious: reverse sense of sweep flag. (#146) + 2013-12-05 Frank Warmerdam <warmerdam@pobox.com> * src/PJ_qsc.c: Add QSC projection (#179) diff --git a/nad/testvarious b/nad/testvarious index 335fc6de..88964dd7 100755 --- a/nad/testvarious +++ b/nad/testvarious @@ -404,7 +404,7 @@ $EXE +proj=latlong +ellps=sphere \ EOF echo "Test geos on a sphere with alternate sweep" >> ${OUT} $EXE +proj=latlong +ellps=sphere \ - +to +proj=geos +h=35785831.0 +lon_0=0 +ellps=sphere +sweep=y -E >>${OUT} <<EOF + +to +proj=geos +h=35785831.0 +lon_0=0 +ellps=sphere +sweep=x -E >>${OUT} <<EOF 16d11'8" 58d35'31" -43d11'47" -22d54'30" 18d25'26" -33d55'31" @@ -412,7 +412,7 @@ $EXE +proj=latlong +ellps=sphere \ EOF echo "Test geos on a ellipsoid with alternate sweep" >> ${OUT} $EXE +proj=latlong +ellps=sphere \ - +to +proj=geos +h=35785831.0 +lon_0=0 +ellps=WGS84 +sweep=y -E >>${OUT} <<EOF + +to +proj=geos +h=35785831.0 +lon_0=0 +ellps=WGS84 +sweep=x -E >>${OUT} <<EOF 16d11'8" 58d35'31" -43d11'47" -22d54'30" 18d25'26" -33d55'31" @@ -420,7 +420,7 @@ $EXE +proj=latlong +ellps=sphere \ EOF echo "Test inv geos on a sphere with alternate sweep" >> ${OUT} $EXE +proj=latlong +ellps=sphere \ - +to +proj=geos +h=35785831.0 +lon_0=0 +ellps=sphere +sweep=y -I -E >>${OUT} <<EOF + +to +proj=geos +h=35785831.0 +lon_0=0 +ellps=sphere +sweep=x -I -E >>${OUT} <<EOF 841586.28 4961396.21 -3772913.22 -2339604.71 1601377.77 -3415545.15 @@ -428,7 +428,7 @@ $EXE +proj=latlong +ellps=sphere \ EOF echo "Test inv geos on a ellipsoid with alternate sweep" >> ${OUT} $EXE +proj=latlong +ellps=sphere \ - +to +proj=geos +h=35785831.0 +lon_0=0 +ellps=WGS84 +sweep=y -I -E >>${OUT} <<EOF + +to +proj=geos +h=35785831.0 +lon_0=0 +ellps=WGS84 +sweep=x -I -E >>${OUT} <<EOF 844731.03 4946509.59 -3779077.27 -2327750.87 1605067.15 -3400461.47 diff --git a/src/PJ_geos.c b/src/PJ_geos.c index 2629d41d..7952c508 100644 --- a/src/PJ_geos.c +++ b/src/PJ_geos.c @@ -170,7 +170,7 @@ ENTRY0(geos) (P->sweep_axis[0] != 'x' && P->sweep_axis[0] != 'y')) E_ERROR(-49); - if (P->sweep_axis[0] == 'y') + if (P->sweep_axis[0] == 'x') P->flip_axis = 1; else P->flip_axis = 0; |