More descriptive error messages when arcgis rest calls fail

This commit is contained in:
Nyall Dawson 2018-10-17 17:08:53 +10:00
parent 100a14ed32
commit 724102563d

View File

@ -521,7 +521,15 @@ QVariantMap QgsArcGisRestUtils::queryServiceJSON( const QUrl &url, QString &erro
QgsDebugMsg( QStringLiteral( "Parsing error: %1" ).arg( err.errorString() ) );
return QVariantMap();
}
return doc.object().toVariantMap();
const QVariantMap res = doc.object().toVariantMap();
if ( res.contains( QStringLiteral( "error" ) ) )
{
const QVariantMap error = res.value( QStringLiteral( "error" ) ).toMap();
errorText = error.value( QStringLiteral( "message" ) ).toString();
errorTitle = QObject::tr( "Error %1" ).arg( error.value( QStringLiteral( "code" ) ).toString() );
return QVariantMap();
}
return res;
}
std::unique_ptr<QgsSymbol> QgsArcGisRestUtils::parseEsriSymbolJson( const QVariantMap &symbolData )