Skip to content

Commit

Permalink
Merge pull request #41932 from qgis/revert-41306-fix_topological_edit…
Browse files Browse the repository at this point in the history 
…ing_different_crs

Revert "Fix Topological editing when CRS are different"
  • Loading branch information
@nyalldawson
nyalldawson committed Mar 1, 2021
2 parents 7d9cdd5 + 1f8cd39 commit 2101693
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 129 deletions.
14 changes: 1 addition & 13 deletions src/app/qgsmaptooladdfeature.cpp
View file
Expand Up @@ -98,19 +98,7 @@ void QgsMapToolAddFeature::digitized( const QgsFeature &f )
{
if ( sm.at( i ).layer() )
{
// transform geometry to vlayer crs and add topological point
QgsGeometry geom( f.geometry() );
try
{
geom.transform( QgsCoordinateTransform( vlayer->crs(), sm.at( i ).layer()->crs(), sm.at( i ).layer()->transformContext() ) );
sm.at( i ).layer()->addTopologicalPoints( geom.vertexAt( i ) );
}
catch ( QgsCsException &cse )
{
Q_UNUSED( cse )
QgsDebugMsg( QStringLiteral( "transformation to layer coordinate failed" ) );
}

sm.at( i ).layer()->addTopologicalPoints( f.geometry().vertexAt( i ) );
}
}
vlayer->addTopologicalPoints( f.geometry() );
Expand Down
33 changes: 3 additions & 30 deletions src/gui/qgsmaptoolcapture.cpp
View file
Expand Up @@ -462,8 +462,8 @@ int QgsMapToolCapture::fetchLayerPoint( const QgsPointLocator::Match &match, Qgs
{
QgsVectorLayer *vlayer = qobject_cast<QgsVectorLayer *>( mCanvas->currentLayer() );
QgsVectorLayer *sourceLayer = match.layer();
if ( match.isValid() && ( match.hasVertex() || ( QgsProject::instance()->topologicalEditing() && ( match.hasEdge() || match.hasMiddleSegment() ) ) ) && sourceLayer )

if ( match.isValid() && ( match.hasVertex() || ( QgsProject::instance()->topologicalEditing() && ( match.hasEdge() || match.hasMiddleSegment() ) ) ) && sourceLayer &&
( sourceLayer->crs() == vlayer->crs() ) )
{
QgsFeature f;
QgsFeatureRequest request;
Expand All @@ -483,34 +483,7 @@ int QgsMapToolCapture::fetchLayerPoint( const QgsPointLocator::Match &match, Qgs
return 2;
QgsLineString line( geom.constGet()->vertexAt( vId ), geom.constGet()->vertexAt( vId2 ) );

QgsPoint pt( match.point() );
// Transform point to sourceLayer crs, since vId and vId2 coordinates are in sourceLayer crs
if ( sourceLayer->crs() != QgsProject::instance()->crs() )
{
try
{
pt.transform( QgsCoordinateTransform( QgsProject::instance()->crs(), sourceLayer->crs(), sourceLayer->transformContext() ) );
}
catch ( QgsCsException &cse )
{
Q_UNUSED( cse )
QgsDebugMsg( QStringLiteral( "transformation to layer coordinate failed" ) );
return 2;
}
}
layerPoint = QgsGeometryUtils::closestPoint( line, pt );
// (re)Transform layerPoint to vlayer crs
try
{
layerPoint.transform( QgsCoordinateTransform( sourceLayer->crs(), vlayer->crs(), vlayer->transformContext() ) );
}
catch ( QgsCsException &cse )
{
Q_UNUSED( cse )
QgsDebugMsg( QStringLiteral( "transformation to layer coordinate failed" ) );
return 2;
}

layerPoint = QgsGeometryUtils::closestPoint( line, QgsPoint( match.point() ) );
}
else
{
Expand Down
87 changes: 1 addition & 86 deletions tests/src/app/testqgsmaptooladdfeatureline.cpp
View file
Expand Up @@ -73,7 +73,6 @@ class TestQgsMapToolAddFeatureLine : public QObject
void testTopologicalEditingZ();
void testCloseLine();
void testSelfSnapping();
void testDifferentCrs();

private:
QgisApp *mQgisApp = nullptr;
Expand All @@ -90,8 +89,6 @@ class TestQgsMapToolAddFeatureLine : public QObject
QgsVectorLayer *mLayerLine2D = nullptr;
QgsVectorLayer *mLayerCloseLine = nullptr;
QgsVectorLayer *mLayerSelfSnapLine = nullptr;
QgsVectorLayer *mLayerCRS3946Line = nullptr;
QgsVectorLayer *mLayerCRS3945Line = nullptr;
QgsFeatureId mFidLineF1 = 0;
QgsFeatureId mFidCurvedF1 = 0;
};
Expand Down Expand Up @@ -238,19 +235,8 @@ void TestQgsMapToolAddFeatureLine::initTestCase()
QgsProject::instance()->addMapLayers( QList<QgsMapLayer *>() << mLayerSelfSnapLine );
mLayerSelfSnapLine->startEditing();

// make layers with different CRS
mLayerCRS3946Line = new QgsVectorLayer( QStringLiteral( "LineString?crs=EPSG:3946" ), QStringLiteral( "layer line" ), QStringLiteral( "memory" ) );
QVERIFY( mLayerCRS3946Line ->isValid() );
QgsProject::instance()->addMapLayers( QList<QgsMapLayer *>() << mLayerCRS3946Line );
mLayerCRS3946Line->startEditing();

mLayerCRS3945Line = new QgsVectorLayer( QStringLiteral( "LineString?crs=EPSG:3945" ), QStringLiteral( "layer line" ), QStringLiteral( "memory" ) );
QVERIFY( mLayerCRS3945Line ->isValid() );
QgsProject::instance()->addMapLayers( QList<QgsMapLayer *>() << mLayerCRS3945Line );
mLayerCRS3945Line->startEditing();

// add layers to canvas
mCanvas->setLayers( QList<QgsMapLayer *>() << mLayerLine << mLayerLineCurved << mLayerLineCurvedOffset << mLayerLineZ << mLayerPointZM << mLayerTopoZ << mLayerLine2D << mLayerSelfSnapLine << mLayerCRS3946Line << mLayerCRS3945Line );
mCanvas->setLayers( QList<QgsMapLayer *>() << mLayerLine << mLayerLineCurved << mLayerLineCurvedOffset << mLayerLineZ << mLayerPointZM << mLayerTopoZ << mLayerLine2D << mLayerSelfSnapLine );
mCanvas->setSnappingUtils( new QgsMapCanvasSnappingUtils( mCanvas, this ) );

// create the tool
Expand Down Expand Up @@ -800,76 +786,5 @@ void TestQgsMapToolAddFeatureLine::testSelfSnapping()

}

void TestQgsMapToolAddFeatureLine::testDifferentCrs()
{

TestQgsMapToolAdvancedDigitizingUtils utils( mCaptureTool );
QSet<QgsFeatureId> oldFids = utils.existingFeatureIds();
mCanvas->setDestinationCrs( QgsCoordinateReferenceSystem( QStringLiteral( "EPSG:3946" ) ) );

// Prepare geometries
QgsPolylineXY line1;
line1 << QgsPointXY( 0, 0 ) << QgsPointXY( 0, 10 );
QgsFeature lineF1;
lineF1.setGeometry( QgsGeometry::fromPolylineXY( line1 ) );

mLayerCRS3946Line->startEditing();
mLayerCRS3946Line->addFeature( lineF1 );
QgsFeatureId mFidLine3946 = lineF1.id();
QCOMPARE( mLayerCRS3946Line->featureCount(), ( long )1 );
// just one added feature
QCOMPARE( mLayerCRS3946Line->undoStack()->index(), 1 );

// Draw the line to avoid some error with the projections
mLayerCRS3945Line->startEditing();
mCanvas->setCurrentLayer( mLayerCRS3945Line );
utils.mouseClick( 8, 2, Qt::LeftButton, Qt::KeyboardModifiers(), true );
utils.mouseClick( 8, 8, Qt::LeftButton, Qt::KeyboardModifiers(), true );
utils.mouseClick( 8, 8, Qt::RightButton );
QgsFeatureId mFidLine3945 = utils.newFeatureId( oldFids );
QCOMPARE( mLayerCRS3945Line->featureCount(), ( long )1 );
// just one added feature
QCOMPARE( mLayerCRS3945Line->undoStack()->index(), 1 );


mCanvas->setCurrentLayer( mLayerCRS3946Line );

QgsSnappingConfig cfg = mCanvas->snappingUtils()->config();
cfg.setEnabled( true );
cfg.setMode( QgsSnappingConfig::AllLayers );
cfg.setTypeFlag( QgsSnappingConfig::SegmentFlag );
cfg.setTolerance( 50 );
cfg.setUnits( QgsTolerance::Pixels );

bool topologicalEditing = cfg.project()->topologicalEditing();
cfg.project()->setTopologicalEditing( true );

mCanvas->snappingUtils()->setConfig( cfg );

utils.mouseClick( -2, 4, Qt::LeftButton, Qt::KeyboardModifiers(), true );
utils.mouseClick( 0, 4, Qt::LeftButton, Qt::KeyboardModifiers(), true );
utils.mouseClick( 2, 4, Qt::LeftButton, Qt::KeyboardModifiers(), true );
utils.mouseClick( 2, 4, Qt::RightButton );

QString new3946Wkt = "LineString (0 0, 0 4, 0 10)";

QCOMPARE( mLayerCRS3946Line->getFeature( mFidLine3946 ).geometry().asWkt( 0 ), new3946Wkt ); // use wkt to avoid float rounding errors
mLayerCRS3946Line->undoStack()->undo();

// same test with a layer with a different CRS
mCanvas->setCurrentLayer( mLayerCRS3945Line );
utils.mouseClick( 0, 4, Qt::LeftButton, Qt::KeyboardModifiers(), true );
utils.mouseClick( 8, 4, Qt::LeftButton, Qt::KeyboardModifiers(), true );
utils.mouseClick( 8, 4, Qt::RightButton );

// (2 2, 8 2, 8 4, 8 8) transformed from 3946 to 3945
QString new3945Wkt = "LineString (17441.5859966475982219 -862119.21677098423242569, 17441.58100318093784153 -862117.23846332356333733, 17441.57101624645292759 -862113.28184797242283821)";
QCOMPARE( mLayerCRS3945Line->getFeature( mFidLine3945 ).geometry().asWkt( 2 ), QgsGeometry::fromWkt( new3945Wkt ).asWkt( 2 ) );
mLayerCRS3945Line->undoStack()->undo();

cfg.project()->setTopologicalEditing( topologicalEditing );
mCanvas->setDestinationCrs( QgsCoordinateReferenceSystem( QStringLiteral( "EPSG:27700" ) ) );
}

QGSTEST_MAIN( TestQgsMapToolAddFeatureLine )
#include "testqgsmaptooladdfeatureline.moc"

0 comments on commit 2101693

Please sign in to comment.