fix #17562 broken legend uris

rduivenvoorde · m-kuhn · commit f6ffb00c9f0c · 2017-11-30T10:03:14.000+01:00
diff --git a/src/providers/wms/qgswmsprovider.cpp b/src/providers/wms/qgswmsprovider.cpp
@@ -175,6 +175,9 @@ QgsWmsProvider::QgsWmsProvider( QString const &uri, const QgsWmsCapabilities *ca
 
 QString QgsWmsProvider::prepareUri( QString uri )
 {
+  // some services provide a percent/url encoded (legend) uri string, always decode here
+  uri = QUrl::fromPercentEncoding( uri.toUtf8() );
+
   if ( uri.contains( QLatin1String( "SERVICE=WMTS" ) ) || uri.contains( QLatin1String( "/WMTSCapabilities.xml" ) ) )
   {
     return uri;

Original file line number	Diff line number	Diff line change
`@@ -175,6 +175,9 @@ QgsWmsProvider::QgsWmsProvider( QString const &uri, const QgsWmsCapabilities *ca`
`175`	`175`
`176`	`176`	`QString QgsWmsProvider::prepareUri( QString uri )`
`177`	`177`	`{`
	`178`	`+ // some services provide a percent/url encoded (legend) uri string, always decode here`
	`179`	`+ uri = QUrl::fromPercentEncoding( uri.toUtf8() );`
	`180`	`+`
`178`	`181`	`if ( uri.contains( QLatin1String( "SERVICE=WMTS" ) ) \|\| uri.contains( QLatin1String( "/WMTSCapabilities.xml" ) ) )`
`179`	`182`	`{`
`180`	`183`	`return uri;`