WMS identify format preference order: Html,Feature,Text

Author: blazek

src/app/qgsidentifyresultsdialog.cpp

@@ -440,15 +440,14 @@ void QgsIdentifyResultsDialog::addFeature( QgsRasterLayer *layer,
 
     QComboBox *formatCombo = new QComboBox();
 
-    // Add all supported formats, best first. Note that all providers should support
-    // IdentifyFormatHtml and IdentifyFormatText because other formats may be
-    // converted to them
+    // Add all supported formats, best first. HTML is considered the best because
+    // it usually holds most informations.
     int capabilities = layer->dataProvider()->capabilities();
     QList<QgsRasterDataProvider::IdentifyFormat> formats;
-    formats << QgsRasterDataProvider::IdentifyFormatFeature
-    << QgsRasterDataProvider::IdentifyFormatValue
-    << QgsRasterDataProvider::IdentifyFormatHtml
-    << QgsRasterDataProvider::IdentifyFormatText;
+    formats << QgsRasterDataProvider::IdentifyFormatHtml
+    << QgsRasterDataProvider::IdentifyFormatFeature
+    << QgsRasterDataProvider::IdentifyFormatText
+    << QgsRasterDataProvider::IdentifyFormatValue;
     foreach ( QgsRasterDataProvider::IdentifyFormat f, formats )
     {
       if ( !( QgsRasterDataProvider::identifyFormatToCapability( f ) & capabilities ) ) continue;

src/core/raster/qgsrasterlayer.cpp

@@ -1709,22 +1709,23 @@ void QgsRasterLayer::setDataProvider( QString const & provider )
   // Set default identify format - use the richest format available
   int capabilities = mDataProvider->capabilities();
   QgsRasterDataProvider::IdentifyFormat identifyFormat = QgsRasterDataProvider::IdentifyFormatUndefined;
-  if ( capabilities & QgsRasterInterface::IdentifyFeature )
+  if ( capabilities & QgsRasterInterface::IdentifyHtml )
   {
-    identifyFormat = QgsRasterDataProvider::IdentifyFormatFeature;
-  }
-  else if ( capabilities & QgsRasterInterface::IdentifyValue )
-  {
-    identifyFormat = QgsRasterDataProvider::IdentifyFormatValue;
+    // HTML is usually richest
+    identifyFormat = QgsRasterDataProvider::IdentifyFormatHtml;
   }
-  else if ( capabilities & QgsRasterInterface::IdentifyHtml )
+  else if ( capabilities & QgsRasterInterface::IdentifyFeature )
   {
-    identifyFormat = QgsRasterDataProvider::IdentifyFormatHtml;
+    identifyFormat = QgsRasterDataProvider::IdentifyFormatFeature;
   }
   else if ( capabilities & QgsRasterInterface::IdentifyText )
   {
     identifyFormat = QgsRasterDataProvider::IdentifyFormatText;
   }
+  else if ( capabilities & QgsRasterInterface::IdentifyValue )
+  {
+    identifyFormat = QgsRasterDataProvider::IdentifyFormatValue;
+  }
   setCustomProperty( "identify/format", QgsRasterDataProvider::identifyFormatName( identifyFormat ) );
 
   // Store timestamp