Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #7481 from pblottiere/server_wfs_spatial_operator
[server] Fixes spatial operator in WFS 1.1.0 GetCapabilities doc
  • Loading branch information
pblottiere committed Jul 26, 2018
2 parents 466992e + 3141bb5 commit b1a16bd
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 13 deletions.
3 changes: 1 addition & 2 deletions src/server/services/wfs/qgswfsgetcapabilities.cpp
Expand Up @@ -111,8 +111,7 @@ namespace QgsWfs
for ( const QString &spatialOperator : spatialOperators )
{
QDomElement spatialOperatorElem = doc.createElement( QStringLiteral( "ogc:SpatialOperator" ) );
QDomText spatialOperatorText = doc.createTextNode( spatialOperator );
spatialOperatorElem.appendChild( spatialOperatorText );
spatialOperatorElem.setAttribute( QStringLiteral( "name" ), spatialOperator );
spatialOperatorsElem.appendChild( spatialOperatorElem );
}
spatialCapabilitiesElement.appendChild( spatialOperatorsElem );
Expand Down
22 changes: 11 additions & 11 deletions tests/testdata/qgis_server/wfs_getcapabilities.txt
Expand Up @@ -113,17 +113,17 @@ Content-Type: text/xml; charset=utf-8
<ogc:GeometryOperand>gml:Envelope</ogc:GeometryOperand>
</ogc:GeometryOperands>
<ogc:SpatialOperators>
<ogc:SpatialOperator>Equals</ogc:SpatialOperator>
<ogc:SpatialOperator>Disjoint</ogc:SpatialOperator>
<ogc:SpatialOperator>Touches</ogc:SpatialOperator>
<ogc:SpatialOperator>Within</ogc:SpatialOperator>
<ogc:SpatialOperator>Overlaps</ogc:SpatialOperator>
<ogc:SpatialOperator>Crosses</ogc:SpatialOperator>
<ogc:SpatialOperator>Intersects</ogc:SpatialOperator>
<ogc:SpatialOperator>Contains</ogc:SpatialOperator>
<ogc:SpatialOperator>DWithin</ogc:SpatialOperator>
<ogc:SpatialOperator>Beyond</ogc:SpatialOperator>
<ogc:SpatialOperator>BBOX</ogc:SpatialOperator>
<ogc:SpatialOperator name="Equals"/>
<ogc:SpatialOperator name="Disjoint"/>
<ogc:SpatialOperator name="Touches"/>
<ogc:SpatialOperator name="Within"/>
<ogc:SpatialOperator name="Overlaps"/>
<ogc:SpatialOperator name="Crosses"/>
<ogc:SpatialOperator name="Intersects"/>
<ogc:SpatialOperator name="Contains"/>
<ogc:SpatialOperator name="DWithin"/>
<ogc:SpatialOperator name="Beyond"/>
<ogc:SpatialOperator name="BBOX"/>
</ogc:SpatialOperators>
</ogc:Spatial_Capabilities>
<ogc:Scalar_Capabilities>
Expand Down

0 comments on commit b1a16bd

Please sign in to comment.