Skip to content
Permalink
Browse files

wms provider: fix feature info (fixes #9630)

  • Loading branch information
jef-n committed Feb 27, 2014
1 parent 89b50df commit 33a8b6344b006696dec3322f7e6336fc69267fdf
Showing with 1 addition and 6 deletions.
  1. +1 −4 src/providers/wms/qgswmsprovider.cpp
  2. +0 −2 src/providers/wms/qgswmsprovider.h
@@ -90,7 +90,6 @@ QgsWmsProvider::QgsWmsProvider( QString const& uri, const QgsWmsCapabilities* ca
, mCachedImage( 0 )
, mCachedViewExtent( 0 )
, mExtentDirty( true )
, mGetFeatureInfoUrlBase( "" )
, mTileReqNo( 0 )
, mTileLayer( 0 )
, mTileMatrixSet( 0 )
@@ -529,8 +528,6 @@ QImage *QgsWmsProvider::draw( QgsRectangle const &viewExtent, int pixelWidth, i

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

mGetFeatureInfoUrlBase = mSettings.mIgnoreGetFeatureInfoUrl ? mSettings.mBaseUrl : getFeatureInfoUrl();

emit statusChanged( tr( "Getting map via WMS." ) );

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

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

QUrl requestUrl( mGetFeatureInfoUrlBase );
QUrl requestUrl( mSettings.mIgnoreGetFeatureInfoUrl ? mSettings.mBaseUrl : getFeatureInfoUrl() );
setQueryItem( requestUrl, "SERVICE", "WMS" );
setQueryItem( requestUrl, "VERSION", mCaps.mCapabilities.version );
setQueryItem( requestUrl, "REQUEST", "GetFeatureInfo" );
@@ -467,8 +467,6 @@ class QgsWmsProvider : public QgsRasterDataProvider
//! See if calculateExtents() needs to be called before extent() returns useful data
bool mExtentDirty;

//! Base URL for WMS GetFeatureInfo requests
QString mGetFeatureInfoUrlBase;
QString mServiceMetadataURL;

//! tile request number, cache hits and misses

0 comments on commit 33a8b63

Please sign in to comment.
You can’t perform that action at this time.