From 45fa67dd69d05ab8fb3c9624954ca6ccca0c795c Mon Sep 17 00:00:00 2001 From: rldhont Date: Tue, 9 Feb 2016 17:50:13 +0100 Subject: [PATCH] [BUGFIX][QGIS Server] WFS Service Capability OnlineResource WFS Service Capability OnlineResource is not the same as in WMS. --- src/server/qgsserverprojectparser.cpp | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/server/qgsserverprojectparser.cpp b/src/server/qgsserverprojectparser.cpp index c974901074bc..6139be76f342 100644 --- a/src/server/qgsserverprojectparser.cpp +++ b/src/server/qgsserverprojectparser.cpp @@ -460,16 +460,23 @@ void QgsServerProjectParser::serviceCapabilities( QDomElement& parentElement, QD //OnlineResource element is mandatory according to the WMS specification QDomElement wmsOnlineResourceElem = propertiesElement.firstChildElement( "WMSOnlineResource" ); - QDomElement onlineResourceElem = doc.createElement( "OnlineResource" ); - onlineResourceElem.setAttribute( "xmlns:xlink", "http://www.w3.org/1999/xlink" ); - onlineResourceElem.setAttribute( "xlink:type", "simple" ); if ( !wmsOnlineResourceElem.isNull() ) { - onlineResourceElem.setAttribute( "xlink:href", wmsOnlineResourceElem.text() ); + QDomElement onlineResourceElem = doc.createElement( "OnlineResource" ); + if ( service.compare( "WFS", Qt::CaseInsensitive ) == 0 ) + { + QDomText onlineResourceText = doc.createTextNode( wmsOnlineResourceElem.text() ); + onlineResourceElem.appendChild( onlineResourceText ); + } + else + { + onlineResourceElem.setAttribute( "xmlns:xlink", "http://www.w3.org/1999/xlink" ); + onlineResourceElem.setAttribute( "xlink:type", "simple" ); + onlineResourceElem.setAttribute( "xlink:href", wmsOnlineResourceElem.text() ); + } + serviceElem.appendChild( onlineResourceElem ); } - serviceElem.appendChild( onlineResourceElem ); - if ( service.compare( "WMS", Qt::CaseInsensitive ) == 0 ) //no contact information in WFS 1.0 and WCS 1.0 { //Contact information