Skip to content

Commit e27e843

Browse files
committed
wfs provider: fix support for non-ascii wfs layer names (fix #7848)
1 parent af8479e commit e27e843

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

src/core/qgsgml.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ void QgsGml::handleProgressEvent( qint64 progress, qint64 totalSteps )
197197

198198
void QgsGml::startElement( const XML_Char* el, const XML_Char** attr )
199199
{
200-
QString elementName( el );
200+
QString elementName( QString::fromUtf8( el ) );
201201
ParseMode theParseMode( mParseModeStack.isEmpty() ? none : mParseModeStack.top() );
202202
QStringList splitName = elementName.split( NS_SEPARATOR );
203203
QString localName = splitName.last();
@@ -279,7 +279,7 @@ void QgsGml::startElement( const XML_Char* el, const XML_Char** attr )
279279

280280
void QgsGml::endElement( const XML_Char* el )
281281
{
282-
QString elementName( el );
282+
QString elementName( QString::fromUtf8( el ) );
283283
ParseMode theParseMode( mParseModeStack.isEmpty() ? none : mParseModeStack.top() );
284284
QStringList splitName = elementName.split( NS_SEPARATOR );
285285
QString localName = splitName.last();

src/providers/wfs/qgswfsprovider.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -701,9 +701,7 @@ int QgsWFSProvider::getFeatureGET( const QString& uri, const QString& geometryAt
701701
}
702702

703703
QString typeName = parameterFromUrl( "typename" );
704-
//QgsWFSData dataReader( uri, &mExtent, mFeatures, mIdMap, geometryAttribute, thematicAttributes, &mWKBType );
705704
QgsGml dataReader( typeName, geometryAttribute, mFields );
706-
//dataReader.setFeatureType( typeName, geometryAttribute, mFields );
707705

708706
QObject::connect( &dataReader, SIGNAL( dataProgressAndSteps( int , int ) ), this, SLOT( handleWFSProgressMessage( int, int ) ) );
709707

0 commit comments

Comments
 (0)