Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add feature tool: add topological point to each editable layer instead of only the snapped layer #57723

Merged
merged 7 commits into from
Jun 17, 2024
Merged

Add feature tool: add topological point to each editable layer instead of only the snapped layer #57723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5bc83af
Test topo editing with features from sep. layers
JuhoErvasti Jun 5, 2024
1765ebc
Add topo point to editable layers at snapped point
JuhoErvasti Jun 10, 2024
967cde7
Add comments
JuhoErvasti Jun 10, 2024
8b8374b
Add whole geom of digitized feature as topo points
JuhoErvasti Jun 10, 2024
a00d39e
Add edit command
JuhoErvasti Jun 10, 2024
4da7b75
Destroy edit command if no points were added
JuhoErvasti Jun 10, 2024
af1e04a
Address review
JuhoErvasti Jun 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 32 additions & 19 deletions src/app/qgsmaptooladdfeature.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,33 +121,46 @@ void QgsMapToolAddFeature::featureDigitized( const QgsFeature &feature )
}
if ( topologicalEditing )
{
const QList<QgsPointLocator::Match> sm = snappingMatches();
for ( int i = 0; i < sm.size() ; ++i )
const QList<QgsMapLayer *> layers = canvas()->layers( true );

for ( QgsMapLayer *layer : layers )
{
if ( sm.at( i ).layer() && sm.at( i ).layer()->isEditable() && sm.at( i ).layer() != vlayer )
QgsVectorLayer *vectorLayer = qobject_cast<QgsVectorLayer *>( layer );

if ( !vectorLayer || !vectorLayer->isEditable() )
continue;

if ( !( vectorLayer->geometryType() == Qgis::GeometryType::Polygon || vectorLayer->geometryType() == Qgis::GeometryType::Line ) )
continue;

vectorLayer->beginEditCommand( tr( "Topological points added by 'Add Feature'" ) );

int res = 2;
if ( vectorLayer->crs() != vlayer->crs() )
{
QgsPoint topologicalPoint{ feature.geometry().vertexAt( i ) };
if ( sm.at( i ).layer()->crs() != vlayer->crs() )
QgsGeometry transformedGeom = feature.geometry();
try
{
// transform digitized geometry from vlayer crs to snapping layer crs and add topological point
try
{
topologicalPoint.transform( QgsCoordinateTransform( vlayer->crs(), sm.at( i ).layer()->crs(), sm.at( i ).layer()->transformContext() ) );
sm.at( i ).layer()->addTopologicalPoints( topologicalPoint );
}
catch ( QgsCsException &cse )
{
Q_UNUSED( cse )
QgsDebugError( QStringLiteral( "transformation to layer coordinate failed" ) );
}
// transform digitized geometry from vlayer crs to vectorLayer crs and add topological points
transformedGeom.transform( QgsCoordinateTransform( vlayer->crs(), vectorLayer->crs(), vectorLayer->transformContext() ) );
res = vectorLayer->addTopologicalPoints( transformedGeom );
}
else
catch ( QgsCsException &cse )
{
sm.at( i ).layer()->addTopologicalPoints( topologicalPoint );
Q_UNUSED( cse )
QgsDebugError( QStringLiteral( "transformation to vectorLayer coordinate failed" ) );
}
}
else
{
res = vectorLayer->addTopologicalPoints( feature.geometry() );
}

if ( res == 0 ) // i.e. if any points were added
vectorLayer->endEditCommand();
else
vectorLayer->destroyEditCommand();
}
vlayer->addTopologicalPoints( feature.geometry() );
}
}
}
82 changes: 81 additions & 1 deletion tests/src/app/maptooladdfeatureline/testqgsmaptooladdfeatureline.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ class TestQgsMapToolAddFeatureLine : public QObject
void testStreamTolerance();
void testWithTopologicalEditingDifferentCanvasCrs();
void testWithTopologicalEditingWIthDiffLayerWithDiffCrs();
void testWithTopologicalEditingWithMoreThanOneLayer();

private:
QgisApp *mQgisApp = nullptr;
Expand All @@ -94,8 +95,13 @@ class TestQgsMapToolAddFeatureLine : public QObject
QgsVectorLayer *mLayerSelfSnapLine = nullptr;
QgsVectorLayer *mLayerCRS3946Line = nullptr;
QgsVectorLayer *mLayerCRS3945Line = nullptr;
QgsVectorLayer *mLayerTopo1 = nullptr;
QgsVectorLayer *mLayerTopo2 = nullptr;
QgsVectorLayer *mLayerTopo3 = nullptr;
QgsFeatureId mFidLineF1 = 0;
QgsFeatureId mFidCurvedF1 = 0;
QgsFeatureId mFidTopoLineF1 = 0;
QgsFeatureId mFidTopoLineF2 = 0;
};

TestQgsMapToolAddFeatureLine::TestQgsMapToolAddFeatureLine() = default;
Expand Down Expand Up @@ -228,8 +234,44 @@ void TestQgsMapToolAddFeatureLine::initTestCase()
QgsProject::instance()->addMapLayers( QList<QgsMapLayer *>() << mLayerCRS3945Line );
mLayerCRS3945Line->startEditing();

// make layers with overlapping features to test topo editing
mLayerTopo1 = new QgsVectorLayer( QStringLiteral( "LineString?crs=EPSG:27700" ), QStringLiteral( "layer line topo1" ), QStringLiteral( "memory" ) );
QVERIFY( mLayerTopo1 ->isValid() );
QgsProject::instance()->addMapLayers( QList<QgsMapLayer *>() << mLayerTopo1 );
mLayerTopo1->startEditing();

QgsFeature topoLineF1;
topoLineF1.setGeometry( QgsGeometry::fromWkt( "LineString (1 6, 1 7, 2 7, 2 6)" ) );

mLayerTopo1->addFeature( topoLineF1 );
mFidTopoLineF1 = topoLineF1.id();
QCOMPARE( mLayerTopo1->featureCount(), ( long )1 );

// just one added feature
QCOMPARE( mLayerTopo1->undoStack()->index(), 1 );

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

QgsFeature topoLineF2;
topoLineF2.setGeometry( QgsGeometry::fromWkt( "LineString (0 7, 3 7)" ) );

mLayerTopo2->addFeature( topoLineF2 );
mFidTopoLineF2 = topoLineF2.id();
QCOMPARE( mLayerTopo2->featureCount(), ( long )1 );

// just one added feature
QCOMPARE( mLayerTopo2->undoStack()->index(), 1 );

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

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

// create the tool
Expand Down Expand Up @@ -1070,6 +1112,44 @@ void TestQgsMapToolAddFeatureLine::testWithTopologicalEditingWIthDiffLayerWithDi
snapConfig.project()->setTopologicalEditing( topologicalEditing );
}

void TestQgsMapToolAddFeatureLine::testWithTopologicalEditingWithMoreThanOneLayer()
{
TestQgsMapToolAdvancedDigitizingUtils utils( mCaptureTool );

mCanvas->setCurrentLayer( mLayerTopo3 );
mCaptureTool->setLayer( mLayerTopo3 );

QgsSnappingConfig snapConfig = mCanvas->snappingUtils()->config();
snapConfig.setEnabled( true );
snapConfig.setMode( Qgis::SnappingMode::AllLayers );
snapConfig.setTypeFlag( Qgis::SnappingType::Segment );
bool topologicalEditing = snapConfig.project()->topologicalEditing();
snapConfig.project()->setTopologicalEditing( true );
mCanvas->snappingUtils()->setConfig( snapConfig );

const QSet<QgsFeatureId> oldFids = utils.existingFeatureIds();
utils.mouseMove( 2, 5 );
utils.mouseClick( 2, 5, Qt::LeftButton );
utils.mouseMove( 1.5, 7 );
utils.mouseClick( 1.5, 7, Qt::LeftButton );
utils.mouseClick( 1.5, 7, Qt::RightButton );

const QgsFeatureId newFid = utils.newFeatureId( oldFids );

const QString wkt1 = "LineString (1 6, 1 7, 1.5 7, 2 7, 2 6)";
QCOMPARE( mLayerTopo1->getFeature( mFidTopoLineF1 ).geometry(), QgsGeometry::fromWkt( wkt1 ) );

const QString wkt2 = "LineString (0 7, 1.5 7, 3 7)";
QCOMPARE( mLayerTopo2->getFeature( mFidTopoLineF2 ).geometry(), QgsGeometry::fromWkt( wkt2 ) );

const QString wkt3 = "LineString (2 5, 1.5 7)";
QCOMPARE( mLayerTopo3->getFeature( newFid ).geometry(), QgsGeometry::fromWkt( wkt3 ) );

mLayerTopo1->undoStack()->undo();
mLayerTopo2->undoStack()->undo();
mLayerTopo3->undoStack()->undo();
snapConfig.project()->setTopologicalEditing( topologicalEditing );
}

QGSTEST_MAIN( TestQgsMapToolAddFeatureLine )
#include "testqgsmaptooladdfeatureline.moc"
Loading