Fix missing mapserver legends in some circumstances

nyalldawson · nyalldawson · commit 4a60e184f87c · 2019-06-07T19:24:10.000+10:00
diff --git a/src/providers/arcgisrest/qgsamsprovider.cpp b/src/providers/arcgisrest/qgsamsprovider.cpp
@@ -108,7 +108,9 @@ void QgsAmsLegendFetcher::handleFinished()
   {
     QVariantMap queryResultMap = result.toMap();
     QString layerId = queryResultMap[QStringLiteral( "layerId" )].toString();
-    if ( layerId != dataSource.param( QStringLiteral( "layer" ) ) && !mProvider->subLayers().contains( layerId ) )
+    if ( !dataSource.param( QStringLiteral( "layer" ) ).isNull()
+         && layerId != dataSource.param( QStringLiteral( "layer" ) )
+         && !mProvider->subLayers().contains( layerId ) )
     {
       continue;
     }

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,9 @@ void QgsAmsLegendFetcher::handleFinished()`
`108`	`108`	`{`
`109`	`109`	`QVariantMap queryResultMap = result.toMap();`
`110`	`110`	`QString layerId = queryResultMap[QStringLiteral( "layerId" )].toString();`
`111`		`- if ( layerId != dataSource.param( QStringLiteral( "layer" ) ) && !mProvider->subLayers().contains( layerId ) )`
	`111`	`+ if ( !dataSource.param( QStringLiteral( "layer" ) ).isNull()`
	`112`	`+ && layerId != dataSource.param( QStringLiteral( "layer" ) )`
	`113`	`+ && !mProvider->subLayers().contains( layerId ) )`
`112`	`114`	`{`
`113`	`115`	`continue;`
`114`	`116`	`}`