Merge pull request #7224 from rldhont/server-wms-getfeatureinfo-raster-gml-no-data

rldhont · web-flow · commit 514d036b30cc · 2018-06-14T10:05:46.000+02:00
[Server] WMS GetFeatureInfo Raster GML: do not add attribute for no data
diff --git a/src/server/qgswmsserver.cpp b/src/server/qgswmsserver.cpp
@@ -2582,12 +2582,7 @@ int QgsWMSServer::featureInfoFromRasterLayer( QgsRasterLayer* layer,
     int index = 0;
     Q_FOREACH ( int bandNo, values.keys() )
     {
-      if ( values.value( bandNo ).isNull() )
-      {
-        fields.append( QgsField( layer->bandName( bandNo ), QVariant::String ) );
-        feature.setAttribute( index++, "no data" );
-      }
-      else
+      if ( !values.value( bandNo ).isNull() )
       {
         QVariant value( values.value( bandNo ) );
         fields.append( QgsField( layer->bandName( bandNo ), QVariant::Double ) );

Original file line number	Diff line number	Diff line change
`@@ -2582,12 +2582,7 @@ int QgsWMSServer::featureInfoFromRasterLayer( QgsRasterLayer* layer,`
`2582`	`2582`	`int index = 0;`
`2583`	`2583`	`Q_FOREACH ( int bandNo, values.keys() )`
`2584`	`2584`	`{`
`2585`		`- if ( values.value( bandNo ).isNull() )`
`2586`		`- {`
`2587`		`- fields.append( QgsField( layer->bandName( bandNo ), QVariant::String ) );`
`2588`		`- feature.setAttribute( index++, "no data" );`
`2589`		`- }`
`2590`		`- else`
	`2585`	`+ if ( !values.value( bandNo ).isNull() )`
`2591`	`2586`	`{`
`2592`	`2587`	`QVariant value( values.value( bandNo ) );`
`2593`	`2588`	`fields.append( QgsField( layer->bandName( bandNo ), QVariant::Double ) );`