Skip to content

Commit 6aa1c6c

Browse files
author
mhugent
committed
improved last commit
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@9752 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent e0a19f5 commit 6aa1c6c

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

src/providers/wms/qgswmsprovider.cpp

+3-5
Original file line numberDiff line numberDiff line change
@@ -379,14 +379,14 @@ QImage* QgsWmsProvider::draw( QgsRectangle const & viewExtent, int pixelWidth,
379379
crsKey = "CRS";
380380
}
381381

382-
int dcpTypeSize = mCapabilities.capability.request.getMap.dcpType.size();
383-
if(dcpTypeSize < 1)
382+
std::vector<QgsWmsDcpTypeProperty> dcpType = mCapabilities.capability.request.getMap.dcpType;
383+
if(dcpType.size() < 1)
384384
{
385385
mError = tr("Could not determine URL for GetMap from the WMS capabilities response");
386386
return 0;
387387
}
388388

389-
QString url = prepareUri( mCapabilities.capability.request.getMap.dcpType.front().http.get.onlineResource.xlinkHref );
389+
QString url = prepareUri( dcpType.front().http.get.onlineResource.xlinkHref );
390390

391391
url += "SERVICE=WMS";
392392
url += "&";
@@ -413,8 +413,6 @@ QImage* QgsWmsProvider::draw( QgsRectangle const & viewExtent, int pixelWidth,
413413
url += "TRANSPARENT=TRUE";
414414
}
415415

416-
qWarning( url.toUtf8() );
417-
418416
// cache some details for if the user wants to do an identifyAsHtml() later
419417
mGetFeatureInfoUrlBase = baseUrl;
420418
mGetFeatureInfoUrlBase += "SERVICE=WMS";

0 commit comments

Comments
 (0)