Fix WMS identify when using "Feature" format and the layer has named CRS

qgis · Oct 3, 2016 · 9ef91ea · 9ef91ea
1 parent 29d2bef
commit 9ef91ea
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/providers/wms/qgswmsprovider.cpp b/src/providers/wms/qgswmsprovider.cpp
@@ -2977,7 +2977,7 @@ QgsRasterIdentifyResult QgsWmsProvider::identify( const QgsPoint & thePoint, Qgs
             QString crsType = result.property( "crs" ).property( "type" ).toString();
             QString crsText;
             if ( crsType == "name" )
-              crsText = result.property( "crs" ).property( "name" ).toString();
+              crsText = result.property( "crs" ).property( "properties" ).property( "name" ).toString();
             else if ( crsType == "EPSG" )
               crsText = QString( "%1:%2" ).arg( crsType, result.property( "crs" ).property( "properties" ).property( "code" ).toString() );
             else
@@ -3072,6 +3072,7 @@ QgsRasterIdentifyResult QgsWmsProvider::identify( const QgsPoint & thePoint, Qgs
         catch ( const QString &err )
         {
           QgsDebugMsg( QString( "JSON error: %1\nResult: %2" ).arg( err, QString::fromUtf8( mIdentifyResultBodies.value( jsonPart ) ) ) );
+          results.insert( results.size(), err );  // string returned for format type "feature" means error
         }
 
         delete coordinateTransform;