Skip to content
Permalink
Browse files

Merge pull request #1201 from marcel-dancak/master

Fixed bug #9584
  • Loading branch information
mhugent committed Feb 20, 2014
2 parents 35791aa + 325697d commit 32fc7210884cb27c0e967f8996cdabd707685e6b
Showing with 3 additions and 8 deletions.
  1. +3 −8 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

0 comments on commit 32fc721

Please sign in to comment.
You can’t perform that action at this time.