Merge pull request #7491 from pblottiere/server_wfs_service_version

[server] Adds ServiceTypeVersion element in WFS 1.1.0 GetCapabilities doc
qgis · Aug 1, 2018 · ada8933 · ada8933
2 parents bbc3330 + d3670de
commit ada8933
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/server/services/wfs/qgswfsgetcapabilities.cpp b/src/server/services/wfs/qgswfsgetcapabilities.cpp
@@ -187,8 +187,8 @@ namespace QgsWfs
     //Service type version
     QDomElement serviceTypeVersionElem = doc.createElement( QStringLiteral( "ows:ServiceTypeVersion" ) );
     QDomText serviceTypeVersionText = doc.createTextNode( "1.1.0" );
-    serviceTypeElem.appendChild( serviceTypeText );
-    serviceElem.appendChild( serviceTypeElem );
+    serviceTypeVersionElem.appendChild( serviceTypeVersionText );
+    serviceElem.appendChild( serviceTypeVersionElem );
 
     QDomElement feesElem = doc.createElement( QStringLiteral( "ows:Fees" ) );
     QDomText feesText = doc.createTextNode( "None" );

diff --git a/tests/testdata/qgis_server/wfs_getcapabilities.txt b/tests/testdata/qgis_server/wfs_getcapabilities.txt
@@ -6,6 +6,7 @@ Content-Type: text/xml; charset=utf-8
   <ows:Title>QGIS TestProject</ows:Title>
   <ows:Abstract><![CDATA[Some UTF8 text èòù]]></ows:Abstract>
   <ows:ServiceType>WFS</ows:ServiceType>
+  <ows:ServiceTypeVersion>1.1.0</ows:ServiceTypeVersion>
   <ows:Fees>None</ows:Fees>
   <ows:AccessConstraints>None</ows:AccessConstraints>
  </ows:ServiceIdentification>