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

mhugent · mhugent · commit fbdbddb20914 · 2007-05-13T14:05:54.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@6944 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/plugins/wfs/qgswfssourceselect.cpp b/src/plugins/wfs/qgswfssourceselect.cpp
@@ -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");
diff --git a/src/providers/wfs/qgswfsdata.cpp b/src/providers/wfs/qgswfsdata.cpp
@@ -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));
   } 
 }
diff --git a/src/providers/wms/qgswmsprovider.cpp b/src/providers/wms/qgswmsprovider.cpp
@@ -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 += "&";
@@ -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 += "&";

Original file line number	Diff line number	Diff line change
`@@ -124,6 +124,11 @@ int QgsWFSSourceSelect::getCapabilitiesGET(const QString& uri, std::list<QString`
`124`	`124`	`if(nameList.length() > 0)`
`125`	`125`	`{`
`126`	`126`	`tname = nameList.at(0).toElement().text();`
	`127`	`+ //strip away namespace prefixes`
	`128`	`+ if(tname.contains(":"))`
	`129`	`+ {`
	`130`	`+ tname = tname.section(":", 1, 1);`
	`131`	`+ }`
`127`	`132`	`}`
`128`	`133`	`//Title`
`129`	`134`	`QDomNodeList titleList = featureTypeElem.elementsByTagNameNS(WFS_NAMESPACE, "Title");`
Original file line number	Diff line number	Diff line change
`@@ -341,7 +341,6 @@ void QgsWFSData::characters(const XML_Char* chars, int len)`
`341`	`341`	`QgsWFSData::parseMode theParseMode = mParseModeStack.top();`
`342`	`342`	`if(theParseMode == QgsWFSData::attribute \|\| theParseMode == QgsWFSData::coordinate)`
`343`	`343`	`{`
`344`		`- //mStringCash = QString::fromUtf8(chars, len);`
`345`	`344`	`mStringCash.append(QString::fromUtf8(chars, len));`
`346`	`345`	`}`
`347`	`346`	`}`