Skip to content

Commit 33a8b63

Browse files
committed
wms provider: fix feature info (fixes #9630)
1 parent 89b50df commit 33a8b63

File tree

2 files changed

+1
-6
lines changed

2 files changed

+1
-6
lines changed

src/providers/wms/qgswmsprovider.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ QgsWmsProvider::QgsWmsProvider( QString const& uri, const QgsWmsCapabilities* ca
9090
, mCachedImage( 0 )
9191
, mCachedViewExtent( 0 )
9292
, mExtentDirty( true )
93-
, mGetFeatureInfoUrlBase( "" )
9493
, mTileReqNo( 0 )
9594
, mTileLayer( 0 )
9695
, mTileMatrixSet( 0 )
@@ -529,8 +528,6 @@ QImage *QgsWmsProvider::draw( QgsRectangle const &viewExtent, int pixelWidth, i
529528

530529
// cache some details for if the user wants to do an identifyAsHtml() later
531530

532-
mGetFeatureInfoUrlBase = mSettings.mIgnoreGetFeatureInfoUrl ? mSettings.mBaseUrl : getFeatureInfoUrl();
533-
534531
emit statusChanged( tr( "Getting map via WMS." ) );
535532

536533
QgsWmsImageDownloadHandler handler( dataSourceUri(), url, mSettings.authorization(), mCachedImage );
@@ -2151,7 +2148,7 @@ QgsRasterIdentifyResult QgsWmsProvider::identify( const QgsPoint & thePoint, Qgs
21512148

21522149
QgsDebugMsg( "Layer '" + *layers + "' is queryable." );
21532150

2154-
QUrl requestUrl( mGetFeatureInfoUrlBase );
2151+
QUrl requestUrl( mSettings.mIgnoreGetFeatureInfoUrl ? mSettings.mBaseUrl : getFeatureInfoUrl() );
21552152
setQueryItem( requestUrl, "SERVICE", "WMS" );
21562153
setQueryItem( requestUrl, "VERSION", mCaps.mCapabilities.version );
21572154
setQueryItem( requestUrl, "REQUEST", "GetFeatureInfo" );

src/providers/wms/qgswmsprovider.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -467,8 +467,6 @@ class QgsWmsProvider : public QgsRasterDataProvider
467467
//! See if calculateExtents() needs to be called before extent() returns useful data
468468
bool mExtentDirty;
469469

470-
//! Base URL for WMS GetFeatureInfo requests
471-
QString mGetFeatureInfoUrlBase;
472470
QString mServiceMetadataURL;
473471

474472
//! tile request number, cache hits and misses

0 commit comments

Comments
 (0)