Merge pull request #9879 from elpaso/bugfix-21735-gfi-json

elpaso · web-flow · commit ffaa64ee1a30 · 2019-04-27T18:25:09.000+02:00
Fix identify for WMS client with json format
diff --git a/src/app/qgsidentifyresultsdialog.cpp b/src/app/qgsidentifyresultsdialog.cpp
@@ -781,6 +781,8 @@ QString QgsIdentifyResultsDialog::representValue( QgsVectorLayer *vlayer, const
   return fieldFormatter->representValue( vlayer, idx, setup.config(), cache, value );
 }
 
+
+// Raster variant of addFeature
 void QgsIdentifyResultsDialog::addFeature( QgsRasterLayer *layer,
     const QString &label,
     const QMap<QString, QString> &attributes,
@@ -856,19 +858,71 @@ void QgsIdentifyResultsDialog::addFeature( QgsRasterLayer *layer,
       if ( i >= fields.count() )
         continue;
 
-      const auto value { attrs.at( i ).toString() };
-      QTreeWidgetItem *attrItem = new QTreeWidgetItem( QStringList() << QString::number( i ) << value );
-      attrItem->setData( 0, Qt::DisplayRole, fields.at( i ).name() );
-      attrItem->setData( 1, Qt::DisplayRole, attrs.at( i ) );
+      // We have no vector layer here (can't use the formatters), let's guess the format from the QVariant type
+      const auto value { attrs.at( i ) };
+      auto formattedValue { value.toString() };
+      bool isString = false;
+      if ( value.isValid( ) )
+      {
+        if ( value.type() == QVariant::Double )
+        {
+          bool ok;
+          double val( value.toDouble( &ok ) );
+          if ( ok )
+          {
+            // Precision is not set, let's guess it from the
+            // standard conversion to string
+            const auto strVal { value.toString() };
+            int dotPosition { strVal.indexOf( '.' ) };
+            int precision;
+            if ( dotPosition < 0 )
+            {
+              precision = 0;
+            }
+            else
+            {
+              precision = strVal.length() - dotPosition - 1;
+            }
+            formattedValue = QLocale().toString( val, 'f', precision );
+          }
+        }
+        else if ( value.type() == QVariant::Int )
+        {
+          bool ok;
+          double val( value.toInt( &ok ) );
+          if ( ok )
+          {
+            formattedValue =  QLocale().toString( val, 'f', 0 );
+          }
+        }
+        else if ( value.type() == QVariant::LongLong )
+        {
+          bool ok;
+          double val( value.toLongLong( &ok ) );
+          if ( ok )
+          {
+            formattedValue =  QLocale().toString( val, 'f', 0 );
+          }
+        }
+        else
+        {
+          isString = true;
+        }
+      }
+      QTreeWidgetItem *attrItem = new QTreeWidgetItem( { fields.at( i ).name(), formattedValue } );
       featItem->addChild( attrItem );
-      bool foundLinks = false;
-      const auto links { QgsStringUtils::insertLinks( value, &foundLinks ) };
-      if ( foundLinks )
+      // If not numeric, convert links
+      if ( isString )
       {
-        auto valueLabel { qgis::make_unique<QLabel>( links ) };
-        attrItem->setText( 1, QString( ) );
-        valueLabel->setOpenExternalLinks( true );
-        lstResults->setItemWidget( attrItem, 1, valueLabel.release() );
+        bool foundLinks = false;
+        const auto links { QgsStringUtils::insertLinks( formattedValue, &foundLinks ) };
+        if ( foundLinks )
+        {
+          auto valueLabel { qgis::make_unique<QLabel>( links ) };
+          attrItem->setText( 1, QString( ) );
+          valueLabel->setOpenExternalLinks( true );
+          lstResults->setItemWidget( attrItem, 1, valueLabel.release() );
+        }
       }
     }
   }
diff --git a/src/providers/wms/qgswmsprovider.cpp b/src/providers/wms/qgswmsprovider.cpp
@@ -3089,7 +3089,7 @@ QgsRasterIdentifyResult QgsWmsProvider::identify( const QgsPointXY &point, QgsRa
             fieldIterator = properties.constBegin();
             for ( ; fieldIterator != properties.constEnd(); ++fieldIterator )
             {
-              feature.setAttribute( j++, fieldIterator.value().toString() );
+              feature.setAttribute( j++, fieldIterator.value().toVariant() );
             }
 
             QgsFeatureStore featureStore( fields, crs() );

Original file line number	Diff line number	Diff line change
`@@ -3089,7 +3089,7 @@ QgsRasterIdentifyResult QgsWmsProvider::identify( const QgsPointXY &point, QgsRa`
`3089`	`3089`	`fieldIterator = properties.constBegin();`
`3090`	`3090`	`for ( ; fieldIterator != properties.constEnd(); ++fieldIterator )`
`3091`	`3091`	`{`
`3092`		`- feature.setAttribute( j++, fieldIterator.value().toString() );`
	`3092`	`+ feature.setAttribute( j++, fieldIterator.value().toVariant() );`
`3093`	`3093`	`}`
`3094`	`3094`
`3095`	`3095`	`QgsFeatureStore featureStore( fields, crs() );`