sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-16 00:03:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

[ogr] return multipart geometry for multipart datasets in feature iterator

Browse Source
This commit is contained in:
nirvn 2017-07-10 11:10:20 +07:00
parent 1aa0091e7a
commit 5b149fb389
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/providers/ogr/qgsogrfeatureiterator.cpp
View File

@ -25,6 +25,7 @@
#include "qgsmessagelog.h" #include "qgsmessagelog.h"
#include "qgssettings.h" #include "qgssettings.h"
#include "qgsexception.h" #include "qgsexception.h"
#include "qgswkbtypes.h"
#include <QTextCodec> #include <QTextCodec>
#include <QFile> #include <QFile>
@ -334,7 +335,15 @@ bool QgsOgrFeatureIterator::readFeature( OGRFeatureH fet, QgsFeature &feature )
if ( geom ) if ( geom )
{ {
feature.setGeometry( QgsOgrUtils::ogrGeometryToQgsGeometry( geom ) ); QgsGeometry g = QgsOgrUtils::ogrGeometryToQgsGeometry( geom );
// Insure that multipart datasets return multipart geometry
if ( QgsWkbTypes::isMultiType( mSource->mWkbType ) && !g.isMultipart() )
{
g.convertToMultiType();
}
feature.setGeometry( g );
} }
else else
feature.clearGeometry(); feature.clearGeometry();
@ -390,6 +399,7 @@ QgsOgrFeatureSource::QgsOgrFeatureSource( const QgsOgrProvider *p )
, mOgrGeometryTypeFilter( QgsOgrProvider::ogrWkbSingleFlatten( p->mOgrGeometryTypeFilter ) ) , mOgrGeometryTypeFilter( QgsOgrProvider::ogrWkbSingleFlatten( p->mOgrGeometryTypeFilter ) )
, mDriverName( p->ogrDriverName ) , mDriverName( p->ogrDriverName )
, mCrs( p->crs() ) , mCrs( p->crs() )
, mWkbType( p->wkbType() )
{ {
for ( int i = ( p->mFirstFieldIsFid ) ? 1 : 0; i < mFields.size(); i++ ) for ( int i = ( p->mFirstFieldIsFid ) ? 1 : 0; i < mFields.size(); i++ )
mFieldsWithoutFid.append( mFields.at( i ) ); mFieldsWithoutFid.append( mFields.at( i ) );

1
src/providers/ogr/qgsogrfeatureiterator.h
View File

@ -44,6 +44,7 @@ class QgsOgrFeatureSource : public QgsAbstractFeatureSource
OGRwkbGeometryType mOgrGeometryTypeFilter; OGRwkbGeometryType mOgrGeometryTypeFilter;
QString mDriverName; QString mDriverName;
QgsCoordinateReferenceSystem mCrs; QgsCoordinateReferenceSystem mCrs;
QgsWkbTypes::Type mWkbType = QgsWkbTypes::Unknown;
friend class QgsOgrFeatureIterator; friend class QgsOgrFeatureIterator;
friend class QgsOgrExpressionCompiler; friend class QgsOgrExpressionCompiler;