Skip to content

Commit

Permalink
Changed WMS version to 1.1.1, since the difference between 1.1.0 and …
Browse files Browse the repository at this point in the history
…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
  • Loading branch information
mhugent committed May 13, 2007
1 parent d7a9cf1 commit bdef557
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
5 changes: 5 additions & 0 deletions src/plugins/wfs/qgswfssourceselect.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,11 @@ int QgsWFSSourceSelect::getCapabilitiesGET(const QString& uri, std::list<QString
if(nameList.length() > 0)
{
tname = nameList.at(0).toElement().text();
//strip away namespace prefixes
if(tname.contains(":"))
{
tname = tname.section(":", 1, 1);
}
}
//Title
QDomNodeList titleList = featureTypeElem.elementsByTagNameNS(WFS_NAMESPACE, "Title");
Expand Down
1 change: 0 additions & 1 deletion src/providers/wfs/qgswfsdata.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,6 @@ void QgsWFSData::characters(const XML_Char* chars, int len)
QgsWFSData::parseMode theParseMode = mParseModeStack.top();
if(theParseMode == QgsWFSData::attribute || theParseMode == QgsWFSData::coordinate)
{
//mStringCash = QString::fromUtf8(chars, len);
mStringCash.append(QString::fromUtf8(chars, len));
}
}
Expand Down
6 changes: 4 additions & 2 deletions src/providers/wms/qgswmsprovider.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ QImage* QgsWmsProvider::draw(QgsRect const & viewExtent, int pixelWidth, int pi

url += "SERVICE=WMS";
url += "&";
url += "VERSION=1.1.0";
url += "VERSION=1.1.1";
url += "&";
url += "REQUEST=GetMap";
url += "&";
Expand All @@ -465,11 +465,13 @@ QImage* QgsWmsProvider::draw(QgsRect const & viewExtent, int pixelWidth, int pi
url += "&";
url += "TRANSPARENT=TRUE";

//qWarning(url);

// cache some details for if the user wants to do an identifyAsHtml() later
mGetFeatureInfoUrlBase = baseUrl;
mGetFeatureInfoUrlBase += "SERVICE=WMS";
mGetFeatureInfoUrlBase += "&";
mGetFeatureInfoUrlBase += "VERSION=1.1.0";
mGetFeatureInfoUrlBase += "VERSION=1.1.1";
mGetFeatureInfoUrlBase += "&";
mGetFeatureInfoUrlBase += "REQUEST=GetFeatureInfo";
mGetFeatureInfoUrlBase += "&";
Expand Down

0 comments on commit bdef557

Please sign in to comment.