Merge pull request #1831 from giohappy/wms_legend_fix

wonder-sk · wonder-sk · commit e26e365f086a · 2015-01-14T11:34:29.000+07:00
Fix erroneous extent for contextual legend
diff --git a/src/providers/wms/qgswmsprovider.cpp b/src/providers/wms/qgswmsprovider.cpp
@@ -3064,7 +3064,7 @@ QgsImageFetcher* QgsWmsProvider::getLegendGraphicFetcher( const QgsMapSettings*
   if ( mapSettings && mSettings.mEnableContextualLegend )
   {
     scale = mapSettings->scale();
-    mapExtent = mapSettings->extent();
+    mapExtent = mapSettings->visibleExtent();
   }
   else
   {

Original file line number	Diff line number	Diff line change
`@@ -3064,7 +3064,7 @@ QgsImageFetcher* QgsWmsProvider::getLegendGraphicFetcher( const QgsMapSettings*`
`3064`	`3064`	`if ( mapSettings && mSettings.mEnableContextualLegend )`
`3065`	`3065`	`{`
`3066`	`3066`	`scale = mapSettings->scale();`
`3067`		`- mapExtent = mapSettings->extent();`
	`3067`	`+ mapExtent = mapSettings->visibleExtent();`
`3068`	`3068`	`}`
`3069`	`3069`	`else`
`3070`	`3070`	`{`