also fix #10747 for 2.5D points

jef-n · jef-n · commit b65d962260bf · 2015-10-10T22:01:11.000+02:00
diff --git a/src/core/qgis.cpp b/src/core/qgis.cpp
@@ -383,7 +383,7 @@ bool QGis::isSingleType( QGis::WkbType type )
 
 bool QGis::isMultiType( QGis::WkbType type )
 {
-  return QgsWKBTypes::flatType( fromOldWkbType( type ) );
+  return QgsWKBTypes::isMultiType( fromOldWkbType( type ) );
 }
 
 int QGis::wkbDimensions( QGis::WkbType type )
diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp
@@ -2544,7 +2544,7 @@ void QgsOgrProvider::recalculateFeatureCount()
 bool QgsOgrProvider::doesStrictFeatureTypeCheck() const
 {
   // FIXME probably other drivers too...
-  return ogrDriverName != "ESRI Shapefile" || geomType == wkbPoint;
+  return ogrDriverName != "ESRI Shapefile" || ( geomType == wkbPoint || geomType == wkbPoint25D );
 }
 
 OGRwkbGeometryType QgsOgrProvider::ogrWkbSingleFlatten( OGRwkbGeometryType type )

Original file line number	Diff line number	Diff line change
`@@ -383,7 +383,7 @@ bool QGis::isSingleType( QGis::WkbType type )`
`383`	`383`
`384`	`384`	`bool QGis::isMultiType( QGis::WkbType type )`
`385`	`385`	`{`
`386`		`- return QgsWKBTypes::flatType( fromOldWkbType( type ) );`
	`386`	`+ return QgsWKBTypes::isMultiType( fromOldWkbType( type ) );`
`387`	`387`	`}`
`388`	`388`
`389`	`389`	`int QGis::wkbDimensions( QGis::WkbType type )`
Original file line number	Diff line number	Diff line change
`@@ -2544,7 +2544,7 @@ void QgsOgrProvider::recalculateFeatureCount()`
`2544`	`2544`	`bool QgsOgrProvider::doesStrictFeatureTypeCheck() const`
`2545`	`2545`	`{`
`2546`	`2546`	`// FIXME probably other drivers too...`
`2547`		`- return ogrDriverName != "ESRI Shapefile" \|\| geomType == wkbPoint;`
	`2547`	`+ return ogrDriverName != "ESRI Shapefile" \|\| ( geomType == wkbPoint \|\| geomType == wkbPoint25D );`
`2548`	`2548`	`}`
`2549`	`2549`
`2550`	`2550`	`OGRwkbGeometryType QgsOgrProvider::ogrWkbSingleFlatten( OGRwkbGeometryType type )`