From 325697dd4b4a52909a243c96d44174600aebaf53 Mon Sep 17 00:00:00 2001 From: Marcel Dancak Date: Thu, 20 Feb 2014 13:22:48 +0100 Subject: [PATCH] fixed occurrence of gml:featureMember elements in GetFeatureInfo response in application/vnd.ogc.gml format --- src/mapserver/qgswmsserver.cpp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/mapserver/qgswmsserver.cpp b/src/mapserver/qgswmsserver.cpp index c429cdf6673..edfec0676d3 100644 --- a/src/mapserver/qgswmsserver.cpp +++ b/src/mapserver/qgswmsserver.cpp @@ -1475,13 +1475,6 @@ int QgsWMSServer::featureInfoFromVectorLayer( QgsVectorLayer* layer, break; } - // Creates the gml:featureMember only if we have at least one element - if ( infoFormat.startsWith( "application/vnd.ogc.gml" ) && featureCounter == 1 ) - { - QDomElement realLayerElement = infoDocument.createElement( "gml:featureMember"/*wfs:FeatureMember*/ ); - layerElement.appendChild( realLayerElement ); - layerElement = realLayerElement; - } QgsFeatureRendererV2* r2 = layer->rendererV2(); if ( !r2 ) @@ -1504,7 +1497,9 @@ int QgsWMSServer::featureInfoFromVectorLayer( QgsVectorLayer* layer, bool withGeom = layer->wkbType() != QGis::WKBNoGeometry; int version = infoFormat.startsWith( "application/vnd.ogc.gml/3" ) ? 3 : 2; QDomElement elem = createFeatureGML( &feature, infoDocument, layerCrs, layer->name(), withGeom, version ); - layerElement.appendChild( elem ); + QDomElement featureMemberElem = infoDocument.createElement( "gml:featureMember"/*wfs:FeatureMember*/ ); + featureMemberElem.appendChild( elem ); + layerElement.appendChild( featureMemberElem ); continue; } else