Skip to content

Commit

Permalink
[Bugfix][Server] WMS GetFeatureInfo provides bounding box when config…
Browse files Browse the repository at this point in the history 
…ured

Some providers always retrieve geometry even if the NoGeometry flags is used in request. So in WMS GetFeatureInfo the bounding box even if it as not been configured.

The `WIT_GEOMETRY` parameter has been introduced to force getting the geometry. The project can contain a parameter to add wkt geometry in the WMS GetFeatureInfo response: `wmsFeatureInfoAddWktGeometry`

To provide something more homogeneous:
* The wkt geometry is only provided if the project has been configured to provide wkt geometry and the request contains WITH_GEOMETRY.
* The bounding box is provided if the project has been configured to provide wkt geometry
* The bounding box is not provided if the project has not been configured to provide wkt geometry
  • Loading branch information
@rldhont
rldhont committed Feb 28, 2020
1 parent 0a9bbd7 commit 1402d0d
Show file tree
Hide file tree
Showing 10 changed files with 20 additions and 4 deletions.
12 changes: 8 additions & 4 deletions src/server/services/wms/qgswmsrenderer.cpp
View file
Expand Up @@ -1424,7 +1424,7 @@ namespace QgsWms
bool segmentizeWktGeometry = QgsServerProjectUtils::wmsFeatureInfoSegmentizeWktGeometry( *mProject );
const QSet<QString> &excludedAttributes = layer->excludeAttributesWms();

bool hasGeometry = addWktGeometry || featureBBox || layerFilterGeom;
bool hasGeometry = QgsServerProjectUtils::wmsFeatureInfoAddWktGeometry( *mProject ) || addWktGeometry || featureBBox || layerFilterGeom;
fReq.setFlags( ( ( hasGeometry ) ? QgsFeatureRequest::NoFlags : QgsFeatureRequest::NoGeometry ) | QgsFeatureRequest::ExactIntersect );

if ( ! searchRect.isEmpty() )
Expand Down Expand Up @@ -1582,7 +1582,8 @@ namespace QgsWms
}

//append feature bounding box to feature info xml
if ( layer->wkbType() != QgsWkbTypes::NoGeometry && hasGeometry )
if ( QgsServerProjectUtils::wmsFeatureInfoAddWktGeometry( *mProject ) &&
layer->wkbType() != QgsWkbTypes::NoGeometry && hasGeometry )
{
QDomElement bBoxElem = infoDocument.createElement( QStringLiteral( "BoundingBox" ) );
bBoxElem.setAttribute( version == QLatin1String( "1.1.1" ) ? "SRS" : "CRS", outputCrs.authid() );
Expand Down Expand Up @@ -2314,8 +2315,11 @@ namespace QgsWms
expressionContext << QgsExpressionContextUtils::layerScope( layer );
expressionContext.setFeature( *feat );

// always add bounding box info if feature contains geometry
if ( !geom.isNull() && geom.type() != QgsWkbTypes::UnknownGeometry && geom.type() != QgsWkbTypes::NullGeometry )
// always add bounding box info if feature contains geometry and has been
// explicitly configured in the project
if ( QgsServerProjectUtils::wmsFeatureInfoAddWktGeometry( *mProject ) &&
!geom.isNull() && geom.type() != QgsWkbTypes::UnknownGeometry &&
geom.type() != QgsWkbTypes::NullGeometry )
{
QgsRectangle box = feat->geometry().boundingBox();
if ( transform.isValid() )
Expand Down
1 change: 1 addition & 0 deletions tests/testdata/qgis_server/wms_getfeatureinfo-group_name-notqueryable.txt
View file
Expand Up @@ -7,6 +7,7 @@ Content-Type: text/xml; charset=utf-8
<Attribute value="3" name="id"/>
<Attribute value="three" name="name"/>
<Attribute value="three èé↓" name="utf8nameè"/>
<BoundingBox maxy="5606011.4565" maxx="913204.9128" miny="5606011.4565" CRS="EPSG:3857" minx="913204.9128"/>
</Feature>
</Layer>
</GetFeatureInfoResponse>
1 change: 1 addition & 0 deletions tests/testdata/qgis_server/wms_getfeatureinfo-text-xml.txt
View file
Expand Up @@ -7,6 +7,7 @@ Content-Type: text/xml; charset=utf-8
<Attribute value="3" name="id"/>
<Attribute value="three" name="name"/>
<Attribute value="three èé↓" name="utf8nameè"/>
<BoundingBox maxy="5606011.4565" maxx="913204.9128" miny="5606011.4565" CRS="EPSG:3857" minx="913204.9128"/>
</Feature>
</Layer>
</GetFeatureInfoResponse>
1 change: 1 addition & 0 deletions tests/testdata/qgis_server/wms_getfeatureinfo-thousands-text-xml.txt
View file
Expand Up @@ -9,6 +9,7 @@ Content-Type: text/xml; charset=utf-8
<Attribute value="three èé↓" name="utf8nameè"/>
<Attribute value="123456" name="long_int"/>
<Attribute value="123456.8900" name="long_float"/>
<BoundingBox maxy="5606011.4565" maxx="913204.9128" miny="5606011.4565" CRS="EPSG:3857" minx="913204.9128"/>
</Feature>
</Layer>
</GetFeatureInfoResponse>
3 changes: 3 additions & 0 deletions tests/testdata/qgis_server/wms_getfeatureinfo-values0-text-xml.txt
View file
Expand Up @@ -7,16 +7,19 @@ Content-Type: text/xml; charset=utf-8
<Attribute value="1" name="id"/>
<Attribute value="one" name="name"/>
<Attribute value="First Value" name="utf8nameè"/>
<BoundingBox maxy="5606025.2373" maxx="913209.0358" miny="5606025.2373" CRS="EPSG:3857" minx="913209.0358"/>
</Feature>
<Feature id="2">
<Attribute value="2" name="id"/>
<Attribute value="two" name="name"/>
<Attribute value="Second Value" name="utf8nameè"/>
<BoundingBox maxy="5606017.8743" maxx="913214.6741" miny="5606017.8743" CRS="EPSG:3857" minx="913214.6741"/>
</Feature>
<Feature id="3">
<Attribute value="3" name="id"/>
<Attribute value="three" name="name"/>
<Attribute value="Third èé↓" name="utf8nameè"/>
<BoundingBox maxy="5606011.4565" maxx="913204.9128" miny="5606011.4565" CRS="EPSG:3857" minx="913204.9128"/>
</Feature>
</Layer>
</GetFeatureInfoResponse>
1 change: 1 addition & 0 deletions tests/testdata/qgis_server/wms_getfeatureinfo_line_tolerance_20_text_xml.txt
View file
Expand Up @@ -5,6 +5,7 @@ Content-Type: text/xml; charset=utf-8
<Layer name="ls2d">
<Feature id="1">
<Attribute value="1" name="id"/>
<BoundingBox maxy="111325.1429" maxx="111319.4908" miny="-0" CRS="EPSG:3857" minx="0"/>
</Feature>
</Layer>
</GetFeatureInfoResponse>
1 change: 1 addition & 0 deletions tests/testdata/qgis_server/wms_getfeatureinfo_notvisible.txt
View file
Expand Up @@ -7,6 +7,7 @@ Content-Type: text/xml; charset=utf-8
<Attribute value="3" name="id"/>
<Attribute value="three" name="name"/>
<Attribute value="three èé↓" name="utf8nameè"/>
<BoundingBox maxy="44.9014" maxx="8.2035" miny="44.9014" CRS="EPSG:4326" minx="8.2035"/>
</Feature>
</Layer>
</GetFeatureInfoResponse>
1 change: 1 addition & 0 deletions tests/testdata/qgis_server/wms_getfeatureinfo_point_tolerance_0_text_xml.txt
View file
Expand Up @@ -6,6 +6,7 @@ Content-Type: text/xml; charset=utf-8
<Feature id="2">
<Attribute value="2" name="id"/>
<Attribute value="" name="location"/>
<BoundingBox maxy="5606017.8743" maxx="913214.6741" miny="5606017.8743" CRS="EPSG:3857" minx="913214.6741"/>
</Feature>
</Layer>
</GetFeatureInfoResponse>
2 changes: 2 additions & 0 deletions tests/testdata/qgis_server/wms_getfeatureinfo_point_tolerance_20_text_xml.txt
View file
Expand Up @@ -6,10 +6,12 @@ Content-Type: text/xml; charset=utf-8
<Feature id="1">
<Attribute value="1" name="id"/>
<Attribute value="Id no. 1 value, Id no. 2 value, Id número 3 value" name="location"/>
<BoundingBox maxy="5606025.2373" maxx="913209.0358" miny="5606025.2373" CRS="EPSG:3857" minx="913209.0358"/>
</Feature>
<Feature id="2">
<Attribute value="2" name="id"/>
<Attribute value="" name="location"/>
<BoundingBox maxy="5606017.8743" maxx="913214.6741" miny="5606017.8743" CRS="EPSG:3857" minx="913214.6741"/>
</Feature>
</Layer>
</GetFeatureInfoResponse>
1 change: 1 addition & 0 deletions tests/testdata/qgis_server/wms_getfeatureinfo_polygon_tolerance_20_text_xml.txt
View file
Expand Up @@ -5,6 +5,7 @@ Content-Type: text/xml; charset=utf-8
<Layer name="p2d">
<Feature id="1">
<Attribute value="1" name="id"/>
<BoundingBox maxy="111325.1429" maxx="111319.4908" miny="-0" CRS="EPSG:3857" minx="0"/>
</Feature>
</Layer>
</GetFeatureInfoResponse>

0 comments on commit 1402d0d

Please sign in to comment.