Merge pull request #7950 from pblottiere/server_wfs_if_capabilities

[server] Fixes Filter_Capabilities element in WFS GetCapabilities document
qgis · Sep 19, 2018 · d64303f · d64303f
2 parents 420bcc9 + f65deeb
commit d64303f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/server/services/wfs/qgswfsgetcapabilities.cpp b/src/server/services/wfs/qgswfsgetcapabilities.cpp
@@ -153,6 +153,11 @@ namespace QgsWfs
     }
     scalarCapabilitiesElement.appendChild( comparisonOperatorsElem );
 
+    QDomElement idCapabilitiesElement = doc.createElement( QStringLiteral( "ogc:Id_Capabilities" ) );
+    QDomElement fidElem = doc.createElement( QStringLiteral( "ogc:FID" ) );
+    idCapabilitiesElement.appendChild( fidElem );
+    filterCapabilitiesElement.appendChild( idCapabilitiesElement );
+
     return doc;
 
   }

diff --git a/tests/testdata/qgis_server/wfs_getcapabilities.txt b/tests/testdata/qgis_server/wfs_getcapabilities.txt
@@ -139,5 +139,8 @@ Content-Type: text/xml; charset=utf-8
     <ogc:ComparisonOperator>Between</ogc:ComparisonOperator>
    </ogc:ComparisonOperators>
   </ogc:Scalar_Capabilities>
+  <ogc:Id_Capabilities>
+   <ogc:FID/>
+  </ogc:Id_Capabilities>
  </ogc:Filter_Capabilities>
 </WFS_Capabilities>