Use gml feature id also for non-gml output formats of WMS GetFeatureInfo

mhugent · mhugent · commit a3de8e2d12a9 · 2018-02-20T16:34:11.000+01:00
diff --git a/src/server/qgswmsserver.cpp b/src/server/qgswmsserver.cpp
@@ -2426,7 +2426,7 @@ int QgsWMSServer::featureInfoFromVectorLayer( QgsVectorLayer* layer,
     else
     {
       QDomElement featureElement = infoDocument.createElement( "Feature" );
-      featureElement.setAttribute( "id", FID_TO_STRING( feature.id() ) );
+      featureElement.setAttribute( "id", featureGmlId( &feature, layer->dataProvider()->pkAttributeIndexes() ) );
       layerElement.appendChild( featureElement );
 
       //read all attribute values from the feature

Original file line number	Diff line number	Diff line change
`@@ -2426,7 +2426,7 @@ int QgsWMSServer::featureInfoFromVectorLayer( QgsVectorLayer* layer,`
`2426`	`2426`	`else`
`2427`	`2427`	`{`
`2428`	`2428`	`QDomElement featureElement = infoDocument.createElement( "Feature" );`
`2429`		`- featureElement.setAttribute( "id", FID_TO_STRING( feature.id() ) );`
	`2429`	`+ featureElement.setAttribute( "id", featureGmlId( &feature, layer->dataProvider()->pkAttributeIndexes() ) );`
`2430`	`2430`	`layerElement.appendChild( featureElement );`
`2431`	`2431`
`2432`	`2432`	`//read all attribute values from the feature`