Skip to content
Permalink
Browse files
fix build (followup 737719e)
  • Loading branch information
jef-n committed Mar 19, 2017
1 parent d03ec91 commit af74635168d1c7b79d3540cff24180a66a575c7c
Showing with 8 additions and 9 deletions.
  1. +6 −6 src/providers/wfs/qgswfscapabilities.cpp
  2. +2 −3 src/providers/wfs/qgswfsfeatureiterator.cpp
@@ -144,16 +144,16 @@ void QgsWFSCapabilities::capabilitiesReplyFinished()

if ( mCaps.version.startsWith( QLatin1String( "1.0" ) ) )
{
QDomElement capabilityElem = doc.firstChildElement( QStringLiteral( "Capability" ) );
QDomElement capabilityElem = doc.firstChildElement( "Capability" );
if ( !capabilityElem.isNull() )
{
QDomElement requestElem = capabilityElem.firstChildElement( QStringLiteral( "Request" ) );
QDomElement requestElem = capabilityElem.firstChildElement( "Request" );
if ( !requestElem.isNull() )
{
QDomElement getFeatureElem = requestElem.firstChildElement( QStringLiteral( "GetFeature" ) );
QDomElement getFeatureElem = requestElem.firstChildElement( "GetFeature" );
if ( !getFeatureElem.isNull() )
{
QDomElement resultFormatElem = getFeatureElem.firstChildElement( QStringLiteral( "ResultFormat" ) );
QDomElement resultFormatElem = getFeatureElem.firstChildElement( "ResultFormat" );
if ( !resultFormatElem.isNull() )
{
QDomElement child = resultFormatElem.firstChildElement();
@@ -257,9 +257,9 @@ void QgsWFSCapabilities::capabilitiesReplyFinished()
}
}
}
else if ( parameter.attribute( QStringLiteral( "name" ) ) == QLatin1String( "outputFormat" ) )
else if ( parameter.attribute( "name" ) == QLatin1String( "outputFormat" ) )
{
QDomNodeList valueList = parameter.elementsByTagName( QStringLiteral( "Value" ) );
QDomNodeList valueList = parameter.elementsByTagName( "Value" );
for ( int k = 0; k < valueList.size(); ++k )
{
QDomElement value = valueList.at( k ).toElement();
@@ -330,7 +330,7 @@ QUrl QgsWFSFeatureDownloader::buildURL( int startIndex, int maxFeatures, bool fo

if ( !forHits && !mShared->mURI.outputFormat().isEmpty() )
{
getFeatureUrl.addQueryItem( QStringLiteral( "OUTPUTFORMAT" ), mShared->mURI.outputFormat() );
getFeatureUrl.addQueryItem( "OUTPUTFORMAT", mShared->mURI.outputFormat() );
}
else if ( !forHits && mShared->mWFSVersion.startsWith( QLatin1String( "1.0" ) ) )
{
@@ -346,8 +346,7 @@ QUrl QgsWFSFeatureDownloader::buildURL( int startIndex, int maxFeatures, bool fo
{
if ( mShared->mCaps.outputFormats.contains( format ) )
{
getFeatureUrl.addQueryItem( QStringLiteral( "OUTPUTFORMAT" ),
format );
getFeatureUrl.addQueryItem( "OUTPUTFORMAT", format );
break;
}
}

0 comments on commit af74635

Please sign in to comment.