sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-04 00:30:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

[Server] WFS Service: force Geometry to Multi in GML to be compliant with XML schema provided by DescribeFeatureType

Browse Source
This commit is contained in:
rldhont 2019-10-12 00:46:38 +02:00
parent fa82f8690c
commit 424e5001d8
1 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/server/services/wfs/qgswfsgetfeature.cpp
View File

@ -35,6 +35,7 @@
#include "qgsogcutils.h"
#include "qgsjsonutils.h"
#include "qgsexpressioncontextutils.h"
#include "qgswkbtypes.h"
#include "qgswfsgetfeature.h"
@ -58,6 +59,8 @@ namespace QgsWfs
const QString &geometryName;
const QgsCoordinateReferenceSystem &outputCrs;
bool forceGeomToMulti;
};
QString createFeatureGeoJSON( const QgsFeature &feature, const createFeatureParams &params, const QgsAttributeList &pkAttributes );
@ -364,6 +367,8 @@ namespace QgsWfs
outputCrs = QgsCoordinateReferenceSystem::fromOgcWmsCrs( query.srsName );
}
bool forceGeomToMulti = QgsWkbTypes::isMultiType( vlayer->wkbType() );
if ( !featureRequest.filterRect().isEmpty() )
{
QgsCoordinateTransform transform( outputCrs, vlayer->crs(), project );
@ -403,7 +408,8 @@ namespace QgsWfs
typeName,
withGeom,
geometryName,
outputCrs
outputCrs,
forceGeomToMulti
};
while ( fit.nextFeature( feature ) && ( aRequest.maxFeatures == -1 || sentFeatures < aRequest.maxFeatures ) )
{
@ -1313,10 +1319,19 @@ namespace QgsWfs
}
else
{
const QgsAbstractGeometry *abstractGeom = geom.constGet();
if ( abstractGeom )
if ( params.forceGeomToMulti && ! QgsWkbTypes::isMultiType( geom.wkbType() ) )
{
gmlElem = abstractGeom->asGml2( doc, prec, "http://www.opengis.net/gml" );
QgsGeometry multiGeom = geom;
multiGeom.convertToMultiType();
gmlElem = QgsOgcUtils::geometryToGML( multiGeom, doc, prec );
}
else
{
const QgsAbstractGeometry *abstractGeom = geom.constGet();
if ( abstractGeom )
{
gmlElem = abstractGeom->asGml2( doc, prec, "http://www.opengis.net/gml" );
}
}
}
@ -1415,10 +1430,19 @@ namespace QgsWfs
}
else
{
const QgsAbstractGeometry *abstractGeom = geom.constGet();
if ( abstractGeom )
if ( params.forceGeomToMulti && ! QgsWkbTypes::isMultiType( geom.wkbType() ) )
{
gmlElem = abstractGeom->asGml3( doc, prec, "http://www.opengis.net/gml" );
QgsGeometry multiGeom = geom;
multiGeom.convertToMultiType();
gmlElem = QgsOgcUtils::geometryToGML( multiGeom, doc, QStringLiteral( "GML3" ), prec );
}
else
{
const QgsAbstractGeometry *abstractGeom = geom.constGet();
if ( abstractGeom )
{
gmlElem = abstractGeom->asGml3( doc, prec, "http://www.opengis.net/gml" );
}
}
}