Move information about strict provider geometry type check on point shapefiles

jef-n · jef-n · commit ce99b8ef0aac · 2015-06-29T18:49:16.000+02:00
to OGR provider and make use of it when pasting & merging features (fixes #12488, refs #10672, refs #10747) TODO: check if other OGR drivers have similar restrictions. (cherry picked from commit 8289891)
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -6208,12 +6208,13 @@ void QgisApp::editPaste( QgsMapLayer *destinationLayer )
       // convert geometry to match destination layer
       QGis::GeometryType destType = pasteVectorLayer->geometryType();
       bool destIsMulti = QGis::isMultiType( pasteVectorLayer->wkbType() );
-      if ( pasteVectorLayer->storageType() == "ESRI Shapefile" && destType != QGis::Point )
+      if ( pasteVectorLayer->dataProvider() &&
+           !pasteVectorLayer->dataProvider()->doesStrictFeatureTypeCheck() )
       {
-        // force destination to multi if shapefile if it's not a point file
-        // Should we really force anything here?  Isn't it better to just transform?
+        // force destination to multi if provider doesn't do a feature strict check
         destIsMulti = true;
       }
+
       if ( destType != QGis::UnknownGeometry )
       {
         QgsGeometry* newGeometry = featureIt->geometry()->convertToType( destType, destIsMulti );
diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp
@@ -2526,6 +2526,12 @@ void QgsOgrProvider::recalculateFeatureCount()
   }
 }
 
+bool QgsOgrProvider::doesStrictFeatureTypeCheck() const
+{
+  // FIXME probably other drivers too...
+  return ogrDriverName != "ESRI Shapefile" || geomType == wkbPoint;
+}
+
 OGRwkbGeometryType QgsOgrProvider::ogrWkbSingleFlatten( OGRwkbGeometryType type )
 {
   type = wkbFlatten( type );
diff --git a/src/providers/ogr/qgsogrprovider.h b/src/providers/ogr/qgsogrprovider.h
@@ -243,9 +243,9 @@ class QgsOgrProvider : public QgsVectorDataProvider
     QString description() const override;
 
     /** Returns true if the provider is strict about the type of inserted features
-          (e.g. no multipolygon in a polygon layer)
-          */
-    virtual bool doesStrictFeatureTypeCheck() const override { return false;}
+        (e.g. no multipolygon in a polygon layer)
+      */
+    virtual bool doesStrictFeatureTypeCheck() const override;
 
     /** return OGR geometry type */
     static OGRwkbGeometryType getOgrGeomType( OGRLayerH ogrLayer );

Original file line number	Diff line number	Diff line change
`@@ -6208,12 +6208,13 @@ void QgisApp::editPaste( QgsMapLayer *destinationLayer )`
`6208`	`6208`	`// convert geometry to match destination layer`
`6209`	`6209`	`QGis::GeometryType destType = pasteVectorLayer->geometryType();`
`6210`	`6210`	`bool destIsMulti = QGis::isMultiType( pasteVectorLayer->wkbType() );`
`6211`		`- if ( pasteVectorLayer->storageType() == "ESRI Shapefile" && destType != QGis::Point )`
	`6211`	`+ if ( pasteVectorLayer->dataProvider() &&`
	`6212`	`+ !pasteVectorLayer->dataProvider()->doesStrictFeatureTypeCheck() )`
`6212`	`6213`	`{`
`6213`		`- // force destination to multi if shapefile if it's not a point file`
`6214`		`- // Should we really force anything here? Isn't it better to just transform?`
	`6214`	`+ // force destination to multi if provider doesn't do a feature strict check`
`6215`	`6215`	`destIsMulti = true;`
`6216`	`6216`	`}`
	`6217`	`+`
`6217`	`6218`	`if ( destType != QGis::UnknownGeometry )`
`6218`	`6219`	`{`
`6219`	`6220`	`QgsGeometry* newGeometry = featureIt->geometry()->convertToType( destType, destIsMulti );`
Original file line number	Diff line number	Diff line change
`@@ -2526,6 +2526,12 @@ void QgsOgrProvider::recalculateFeatureCount()`
`2526`	`2526`	`}`
`2527`	`2527`	`}`
`2528`	`2528`
	`2529`	`+bool QgsOgrProvider::doesStrictFeatureTypeCheck() const`
	`2530`	`+{`
	`2531`	`+ // FIXME probably other drivers too...`
	`2532`	`+ return ogrDriverName != "ESRI Shapefile" \|\| geomType == wkbPoint;`
	`2533`	`+}`
	`2534`	`+`
`2529`	`2535`	`OGRwkbGeometryType QgsOgrProvider::ogrWkbSingleFlatten( OGRwkbGeometryType type )`
`2530`	`2536`	`{`
`2531`	`2537`	`type = wkbFlatten( type );`