sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-27 00:33:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3261 from ahuarte47/Issue_DestinationCrsChanged

Browse Source 
[Bugfix] Fix position and scale when on-the-fly CRS transformation is disabled (fixes #15183)
This commit is contained in:
Nyall Dawson 2016-07-07 07:17:55 +10:00 committed by GitHub
commit 156e7e0f78
3 changed files with 57 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/core/qgstestutils.h
View File

@ -32,5 +32,16 @@
QVERIFY( qgsDoubleNear( value, expected, epsilon ) ); \
}
#define QGSCOMPARENEARPOINT(point1,point2,epsilon) { \
QGSCOMPARENEAR( point1.x(), point2.x(), epsilon ); \
QGSCOMPARENEAR( point1.y(), point2.y(), epsilon ); \
}
#define QGSCOMPARENEARRECTANGLE(rectangle1,rectangle2,epsilon) { \
QGSCOMPARENEAR( rectangle1.xMinimum(), rectangle2.xMinimum(), epsilon ); \
QGSCOMPARENEAR( rectangle1.xMaximum(), rectangle2.xMaximum(), epsilon ); \
QGSCOMPARENEAR( rectangle1.yMinimum(), rectangle2.yMinimum(), epsilon ); \
QGSCOMPARENEAR( rectangle1.yMaximum(), rectangle2.yMaximum(), epsilon ); \
}
#endif // QGSTESTUTILS_H

40
src/gui/qgsmapcanvas.cpp
View File

@ -559,32 +559,34 @@ void QgsMapCanvas::setDestinationCrs( const QgsCoordinateReferenceSystem &crs )
if ( mSettings.destinationCrs() == crs )
return;
if ( mSettings.hasCrsTransformEnabled() )
// try to reproject current extent to the new one
QgsRectangle rect;
if ( !mSettings.visibleExtent().isEmpty() )
{
// try to reproject current extent to the new one
QgsRectangle rect;
if ( !mSettings.visibleExtent().isEmpty() )
QgsCoordinateTransform transform( mSettings.destinationCrs(), crs );
try
{
QgsCoordinateTransform transform( mSettings.destinationCrs(), crs );
try
{
rect = transform.transformBoundingBox( mSettings.visibleExtent() );
}
catch ( QgsCsException &e )
{
Q_UNUSED( e );
QgsDebugMsg( QString( "Transform error caught: %1" ).arg( e.what() ) );
}
rect = transform.transformBoundingBox( mSettings.visibleExtent() );
}
if ( !rect.isEmpty() )
catch ( QgsCsException &e )
{
setExtent( rect );
Q_UNUSED( e );
QgsDebugMsg( QString( "Transform error caught: %1" ).arg( e.what() ) );
}
QgsDebugMsg( "refreshing after destination CRS changed" );
refresh();
}
if ( !mSettings.hasCrsTransformEnabled() )
{
mSettings.setMapUnits( crs.mapUnits() );
}
if ( !rect.isEmpty() )
{
setExtent( rect );
}
QgsDebugMsg( "refreshing after destination CRS changed" );
refresh();
mSettings.setDestinationCrs( crs );
updateDatumTransformEntries();

25
tests/src/gui/testprojectionissues.cpp
View File

@ -23,6 +23,7 @@
#include "qgsrasterlayer.h"
#include <QObject>
#include <QtTest/QtTest>
#include "qgstestutils.h"
class TestProjectionIssues : public QObject
{
@ -39,6 +40,7 @@ class TestProjectionIssues : public QObject
void init();// will be called before each testfunction is executed.
void cleanup();// will be called after every testfunction.
void issue5895();// test for #5895
void issue15183();// test for #15183
private:
QgsRasterLayer* mRasterLayer;
@ -109,5 +111,28 @@ void TestProjectionIssues::issue5895()
mMapCanvas->zoomByFactor( 2.0 ); // Zoom out. This should exceed the transform limits.
}
void TestProjectionIssues::issue15183()
{
QgsRectangle largeExtent( -610861, 5101721, 2523921, 6795055 );
mMapCanvas->setExtent( largeExtent );
// Set to CRS's
QgsCoordinateReferenceSystem sourceCRS;
sourceCRS = mMapCanvas->mapSettings().destinationCrs();
QgsCoordinateReferenceSystem targetCRS;
targetCRS.createFromId( 4326, QgsCoordinateReferenceSystem::EpsgCrsId );
QgsCoordinateTransform ct( sourceCRS, targetCRS );
QgsRectangle initialExtent = ct.transformBoundingBox( mMapCanvas->extent() );
mMapCanvas->setCrsTransformEnabled( false );
mMapCanvas->setDestinationCrs( targetCRS );
QgsRectangle currentExtent = mMapCanvas->extent();
// Compare center
QGSCOMPARENEARPOINT( initialExtent.center(), currentExtent.center(), 0.00001 );
}
QTEST_MAIN( TestProjectionIssues )
#include "testprojectionissues.moc"