Only convert geometries to provider type when provider does strict type checking (ie. not for shapes; fixes #16593, #16784, #16792, #16770, followup 53d90b5)

Author: jef-n

src/core/qgsvectorlayereditbuffer.cpp

@@ -310,19 +310,22 @@ bool QgsVectorLayerEditBuffer::commitChanges( QStringList& commitErrors )
   {
     if ( cap & QgsVectorDataProvider::AddFeatures )
     {
-      QgsFeatureMap::iterator featureIt = mAddedFeatures.begin();
-      for ( ; featureIt != mAddedFeatures.end(); ++featureIt )
+      if ( provider->doesStrictFeatureTypeCheck() )
       {
-        if ( !featureIt->geometry() ||
-             featureIt->geometry()->isEmpty() ||
-             featureIt->geometry()->wkbType() == provider->geometryType() )
-          continue;
-
-        if ( !provider->convertToProviderType( featureIt->geometry() ) )
+        QgsFeatureMap::iterator featureIt = mAddedFeatures.begin();
+        for ( ; featureIt != mAddedFeatures.end(); ++featureIt )
         {
-          commitErrors << tr( "ERROR: %n feature(s) not added - geometry type is not compatible with the current layer.", "not added features count", mAddedFeatures.size() );
-          success = false;
-          break;
+          if ( !featureIt->geometry() ||
+               featureIt->geometry()->isEmpty() ||
+               featureIt->geometry()->wkbType() == provider->geometryType() )
+            continue;
+
+          if ( !provider->convertToProviderType( featureIt->geometry() ) )
+          {
+            commitErrors << tr( "ERROR: %n feature(s) not added - geometry type is not compatible with the current layer.", "not added features count", mAddedFeatures.size() );
+            success = false;
+            break;
+          }
         }
       }
     }