Skip to content
Permalink
Browse files

Geometry type check in merge tool is not necessary any more (geometry…

… type conversion is done in provider)
  • Loading branch information
mhugent committed May 9, 2016
1 parent f1e6d87 commit 8d70a5141b0f56c40fc19e32d5d55475e22ec10f
Showing with 0 additions and 22 deletions.
  1. +0 −22 src/app/qgisapp.cpp
@@ -6657,18 +6657,6 @@ void QgisApp::mergeSelectedFeatures()
return;
}

//make a first geometry union and notify the user straight away if the union geometry type does not match the layer one
if ( providerChecksTypeStrictly && unionGeom->wkbType() != vl->wkbType() )
{
messageBar()->pushMessage(
tr( "Merge cancelled" ),
tr( "The union operation would result in a geometry type that is not compatible with the current layer." ),
QgsMessageBar::CRITICAL );

delete unionGeom;
return;
}

//merge the attributes together
QgsMergeAttributesDialog d( featureList, vl, mapCanvas() );
if ( d.exec() == QDialog::Rejected )
@@ -6707,16 +6695,6 @@ void QgisApp::mergeSelectedFeatures()
}
return;
}

if ( providerChecksTypeStrictly && unionGeom->wkbType() != vl->wkbType() )
{
messageBar()->pushMessage(
tr( "Merge cancelled" ),
tr( "The union operation would result in a geometry type that is not compatible with the current layer." ),
QgsMessageBar::CRITICAL );
delete unionGeom;
return;
}
}

vl->beginEditCommand( tr( "Merged features" ) );

0 comments on commit 8d70a51

Please sign in to comment.
You can’t perform that action at this time.