Skip to content

Commit

Permalink
also fix #10747 for 2.5D points
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed Oct 10, 2015
1 parent beb4ffc commit b65d962
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/core/qgis.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down
2 changes: 1 addition & 1 deletion src/providers/ogr/qgsogrprovider.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down

0 comments on commit b65d962

Please sign in to comment.