Ignore getLegendGraphic URL if GetMap url is ignored (#41596)

qgis · Feb 19, 2021 · 0f35847 · 0f35847
1 parent 57cb687
commit 0f35847
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/providers/wms/qgswmsprovider.cpp b/src/providers/wms/qgswmsprovider.cpp
@@ -3723,7 +3723,15 @@ QUrl QgsWmsProvider::getLegendGraphicFullURL( double scale, const QgsRectangle &
 {
   bool useContextualWMSLegend = mSettings.mEnableContextualLegend;
 
-  QString lurl = getLegendGraphicUrl();
+  QString lurl;
+  if ( mSettings.mIgnoreGetMapUrl )
+  {
+    lurl = mSettings.mBaseUrl;
+  }
+  else
+  {
+    lurl = getLegendGraphicUrl();
+  }
 
   if ( lurl.isEmpty() )
   {

diff --git a/src/ui/qgsnewhttpconnectionbase.ui b/src/ui/qgsnewhttpconnectionbase.ui
@@ -119,7 +119,7 @@
          <item row="1" column="0" colspan="2">
           <widget class="QCheckBox" name="cbxIgnoreGetMapURI">
            <property name="text">
-            <string>Ignore GetMap/GetTile URI reported in capabilities</string>
+            <string>Ignore GetMap/GetTile/GetLegendGraphic URI reported in capabilities</string>
            </property>
           </widget>
          </item>