Skip to content

Commit bdef557

Browse files
author
mhugent
committed
Changed WMS version to 1.1.1, since the difference between 1.1.0 and 1.1.1 are very small. But some servers (e.g. bug #652) complain if version is not 1.1.1
git-svn-id: http://svn.osgeo.org/qgis/trunk@6944 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent d7a9cf1 commit bdef557

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

src/plugins/wfs/qgswfssourceselect.cpp

+5
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,11 @@ int QgsWFSSourceSelect::getCapabilitiesGET(const QString& uri, std::list<QString
124124
if(nameList.length() > 0)
125125
{
126126
tname = nameList.at(0).toElement().text();
127+
//strip away namespace prefixes
128+
if(tname.contains(":"))
129+
{
130+
tname = tname.section(":", 1, 1);
131+
}
127132
}
128133
//Title
129134
QDomNodeList titleList = featureTypeElem.elementsByTagNameNS(WFS_NAMESPACE, "Title");

src/providers/wfs/qgswfsdata.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,6 @@ void QgsWFSData::characters(const XML_Char* chars, int len)
341341
QgsWFSData::parseMode theParseMode = mParseModeStack.top();
342342
if(theParseMode == QgsWFSData::attribute || theParseMode == QgsWFSData::coordinate)
343343
{
344-
//mStringCash = QString::fromUtf8(chars, len);
345344
mStringCash.append(QString::fromUtf8(chars, len));
346345
}
347346
}

src/providers/wms/qgswmsprovider.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ QImage* QgsWmsProvider::draw(QgsRect const & viewExtent, int pixelWidth, int pi
445445

446446
url += "SERVICE=WMS";
447447
url += "&";
448-
url += "VERSION=1.1.0";
448+
url += "VERSION=1.1.1";
449449
url += "&";
450450
url += "REQUEST=GetMap";
451451
url += "&";
@@ -465,11 +465,13 @@ QImage* QgsWmsProvider::draw(QgsRect const & viewExtent, int pixelWidth, int pi
465465
url += "&";
466466
url += "TRANSPARENT=TRUE";
467467

468+
//qWarning(url);
469+
468470
// cache some details for if the user wants to do an identifyAsHtml() later
469471
mGetFeatureInfoUrlBase = baseUrl;
470472
mGetFeatureInfoUrlBase += "SERVICE=WMS";
471473
mGetFeatureInfoUrlBase += "&";
472-
mGetFeatureInfoUrlBase += "VERSION=1.1.0";
474+
mGetFeatureInfoUrlBase += "VERSION=1.1.1";
473475
mGetFeatureInfoUrlBase += "&";
474476
mGetFeatureInfoUrlBase += "REQUEST=GetFeatureInfo";
475477
mGetFeatureInfoUrlBase += "&";

0 commit comments

Comments
 (0)