vector file writer: scan shape file geometries instead of just assumi…

…ng multi geometry types (followup 528c4ca, refs #10584, fixes #11542, fixes #11597)
qgis · Nov 11, 2014 · 11c2bae74079ab008d7e7fb9233d714409aff008 · 11c2bae
1 parent ef5955a
commit 11c2bae74079ab008d7e7fb9233d714409aff008
Unified Split

Showing with 14 additions and 1 deletion.

+14 −1 src/core/qgsvectorfilewriter.cpp
diff --git a/src/core/qgsvectorfilewriter.cpp b/src/core/qgsvectorfilewriter.cpp
@@ -1869,7 +1869,20 @@ QgsVectorFileWriter::WriterError QgsVectorFileWriter::writeAsVectorFormat( QgsVe
     // Shapefiles might contain multi types although wkbType() only reports singles
     if ( layer->storageType() == "ESRI Shapefile" )
     {
-      wkbType = QGis::multiType( wkbType );
+      const QgsFeatureIds &ids = layer->selectedFeaturesIds();
+      QgsFeatureIterator fit = layer->getFeatures();
+      QgsFeature fet;
+      while ( fit.nextFeature( fet ) )
+      {
+        if ( onlySelected && !ids.contains( fet.id() ) )
+          continue;
+
+        if ( fet.geometry() && fet.geometry()->wkbType() == QGis::multiType( wkbType ) )
+        {
+          wkbType = QGis::multiType( wkbType );
+          break;
+        }
+      }
     }
   }