Merge pull request #6452 from elpaso/delete-existing-from-browser

[bugfix] Respect multi-single part when importing and allow delete existing from browser
qgis · Feb 26, 2018 · c13b627 · c13b627
2 parents bfa3cab + 772adec
commit c13b627
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 25 deletions.
diff --git a/src/core/qgsdataitem.h b/src/core/qgsdataitem.h
@@ -297,7 +297,7 @@ class CORE_EXPORT QgsDataItem : public QObject
     void setToolTip( const QString &msg ) { mToolTip = msg; }
     QString toolTip() const { return mToolTip; }
 
-    // deleteLater() items anc clear the vector
+    // deleteLater() items and clear the vector
     static void deleteLater( QVector<QgsDataItem *> &items );
 
     //! Move object and all its descendants to thread

diff --git a/src/providers/ogr/qgsgeopackagedataitems.cpp b/src/providers/ogr/qgsgeopackagedataitems.cpp
@@ -265,6 +265,7 @@ bool QgsGeoPackageCollectionItem::handleDrop( const QMimeData *data, Qt::DropAct
             options.insert( QStringLiteral( "update" ), true );
             options.insert( QStringLiteral( "overwrite" ), true );
             options.insert( QStringLiteral( "layerName" ), dropUri.name );
+            options.insert( QStringLiteral( "forceSinglePartGeometryType" ), true );
             QgsVectorLayerExporterTask *exportTask = new QgsVectorLayerExporterTask( vectorSrcLayer, uri, QStringLiteral( "ogr" ), vectorSrcLayer->crs(), options, owner );
             mainTask->addSubTask( exportTask, importTasks );
             importTasks << exportTask;
@@ -537,40 +538,48 @@ QList<QAction *> QgsGeoPackageAbstractLayerItem::actions( QWidget * )
 
 void QgsGeoPackageAbstractLayerItem::deleteLayer()
 {
-  // Check if the layer is in the registry
-  const QgsMapLayer *projectLayer = nullptr;
+  // Check if the layer(s) are in the registry
+  QList<QgsMapLayer *> layersList;
   const auto mapLayers( QgsProject::instance()->mapLayers() );
-  for ( const QgsMapLayer *layer :  mapLayers )
+  for ( QgsMapLayer *layer :  mapLayers )
   {
     if ( layer->publicSource() == mUri )
     {
-      projectLayer = layer;
+      layersList << layer;
     }
   }
-  if ( ! projectLayer )
-  {
-    if ( QMessageBox::question( nullptr, QObject::tr( "Delete Layer" ),
-                                QObject::tr( "Are you sure you want to delete layer <b>%1</b> from GeoPackage?" ).arg( mName ),
-                                QMessageBox::Yes | QMessageBox::No, QMessageBox::No ) != QMessageBox::Yes )
-      return;
 
-    QString errCause;
-    bool res = executeDeleteLayer( errCause );
-    if ( !res )
-    {
-      QMessageBox::warning( nullptr, tr( "Delete Layer" ), errCause );
-    }
-    else
+  if ( ! layersList.isEmpty( ) )
+  {
+    if ( QMessageBox::question( nullptr, QObject::tr( "Delete Layer" ), QObject::tr( "The layer <b>%1</b> exists in the current project <b>%2</b>,"
+                                " do you want to remove it from the project and delete it?" ).arg( mName, layersList.at( 0 )->name() ), QMessageBox::Yes | QMessageBox::No, QMessageBox::No ) != QMessageBox::Yes )
     {
-      QMessageBox::information( nullptr, tr( "Delete Layer" ), tr( "Layer <b>%1</b> deleted successfully." ).arg( mName ) );
-      if ( mParent )
-        mParent->refreshConnections();
+      return;
     }
   }
+  else if ( QMessageBox::question( nullptr, QObject::tr( "Delete Layer" ),
+                                   QObject::tr( "Are you sure you want to delete layer <b>%1</b> from GeoPackage?" ).arg( mName ),
+                                   QMessageBox::Yes | QMessageBox::No, QMessageBox::No ) != QMessageBox::Yes )
+  {
+    return;
+  }
+
+  if ( layersList.isEmpty() )
+  {
+    QgsProject::instance()->removeMapLayers( layersList );
+  }
+
+  QString errCause;
+  bool res = executeDeleteLayer( errCause );
+  if ( !res )
+  {
+    QMessageBox::warning( nullptr, tr( "Delete Layer" ), errCause );
+  }
   else
   {
-    QMessageBox::warning( nullptr, QObject::tr( "Delete Layer" ), QObject::tr( "The layer <b>%1</b> cannot be deleted because it is in the current project as <b>%2</b>,"
-                          " remove it from the project and retry." ).arg( mName, projectLayer->name() ) );
+    QMessageBox::information( nullptr, tr( "Delete Layer" ), tr( "Layer <b>%1</b> deleted successfully." ).arg( mName ) );
+    if ( mParent )
+      mParent->refreshConnections();
   }
 
 }

diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp
@@ -4560,7 +4560,6 @@ QgsWkbTypes::Type QgsOgrProviderUtils::qgisTypeFromOgrType( OGRwkbGeometryType t
   {
     case wkbUnknown:
       return QgsWkbTypes::Unknown;
-
     case wkbPoint:
       return QgsWkbTypes::Point;
     case wkbLineString:

diff --git a/src/providers/postgres/qgspostgresdataitems.cpp b/src/providers/postgres/qgspostgresdataitems.cpp
@@ -244,7 +244,9 @@ bool QgsPGConnectionItem::handleDrop( const QMimeData *data, const QString &toSc
         uri.setSchema( toSchema );
       }
 
-      std::unique_ptr< QgsVectorLayerExporterTask > exportTask( new QgsVectorLayerExporterTask( srcLayer, uri.uri( false ), QStringLiteral( "postgres" ), srcLayer->crs(), QVariantMap(), owner ) );
+      QVariantMap options;
+      options.insert( QStringLiteral( "forceSinglePartGeometryType" ), true );
+      std::unique_ptr< QgsVectorLayerExporterTask > exportTask( new QgsVectorLayerExporterTask( srcLayer, uri.uri( false ), QStringLiteral( "postgres" ), srcLayer->crs(), options, owner ) );
 
       // when export is successful:
       connect( exportTask.get(), &QgsVectorLayerExporterTask::exportComplete, this, [ = ]()