Merge pull request #7950 from pblottiere/server_wfs_if_capabilities

pblottiere · web-flow · commit d64303fdda77 · 2018-09-19T11:18:56.000+02:00
[server] Fixes Filter_Capabilities element in WFS GetCapabilities document
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>

Original file line number	Diff line number	Diff line change
`@@ -153,6 +153,11 @@ namespace QgsWfs`
`153`	`153`	`}`
`154`	`154`	`scalarCapabilitiesElement.appendChild( comparisonOperatorsElem );`
`155`	`155`
	`156`	`+ QDomElement idCapabilitiesElement = doc.createElement( QStringLiteral( "ogc:Id_Capabilities" ) );`
	`157`	`+ QDomElement fidElem = doc.createElement( QStringLiteral( "ogc:FID" ) );`
	`158`	`+ idCapabilitiesElement.appendChild( fidElem );`
	`159`	`+ filterCapabilitiesElement.appendChild( idCapabilitiesElement );`
	`160`	`+`
`156`	`161`	`return doc;`
`157`	`162`
`158`	`163`	`}`