sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-27 00:33:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7481 from pblottiere/server_wfs_spatial_operator

Browse Source 
[server] Fixes spatial operator in WFS 1.1.0 GetCapabilities doc
This commit is contained in:
Blottiere Paul 2018-07-26 09:29:41 +01:00 committed by GitHub
commit b1a16bdc15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/server/services/wfs/qgswfsgetcapabilities.cpp
View File

@ -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 );

22
tests/testdata/qgis_server/wfs_getcapabilities.txt vendored
View File

@ -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>