also fix #10747 for 2.5D points

qgis · Oct 10, 2015 · b65d962 · b65d962
1 parent beb4ffc
commit b65d962
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
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 )