Fix #10747 - Don't force multi type on point features

NathanW2 · NathanW2 · commit a8ce3565f79e · 2014-09-28T16:06:34.000+10:00
Ref #10672 - Commited fix to force multitypes on shapefiles
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -5965,9 +5965,10 @@ 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" )
+      if ( pasteVectorLayer->storageType() == "ESRI Shapefile" && destType != QGis::Point)
       {
-        // force destination to multi if shapefile
+        // 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?
         destIsMulti = true;
       }
       if ( destType != QGis::UnknownGeometry )

Original file line number	Diff line number	Diff line change
`@@ -5965,9 +5965,10 @@ void QgisApp::editPaste( QgsMapLayer *destinationLayer )`
`5965`	`5965`	`// convert geometry to match destination layer`
`5966`	`5966`	`QGis::GeometryType destType = pasteVectorLayer->geometryType();`
`5967`	`5967`	`bool destIsMulti = QGis::isMultiType( pasteVectorLayer->wkbType() );`
`5968`		`- if ( pasteVectorLayer->storageType() == "ESRI Shapefile" )`
	`5968`	`+ if ( pasteVectorLayer->storageType() == "ESRI Shapefile" && destType != QGis::Point)`
`5969`	`5969`	`{`
`5970`		`- // force destination to multi if shapefile`
	`5970`	`+ // force destination to multi if shapefile if it's not a point file`
	`5971`	`+ // Should we really force anything here? Isn't it better to just transform?`
`5971`	`5972`	`destIsMulti = true;`
`5972`	`5973`	`}`
`5973`	`5974`	`if ( destType != QGis::UnknownGeometry )`