avoid CRS in the tooltip when the layer is not spatial

Gustry · nyalldawson · commit d90348df403f · 2018-08-08T14:26:51.000+10:00
diff --git a/src/core/layertree/qgslayertreemodel.cpp b/src/core/layertree/qgslayertreemodel.cpp
@@ -287,7 +287,7 @@ QVariant QgsLayerTreeModel::data( const QModelIndex &index, int role ) const
 
         title = "<b>" + title.toHtmlEscaped() + "</b>";
 
-        if ( layer->crs().isValid() )
+        if ( layer->isSpatial() && layer->crs().isValid() )
         {
           if ( QgsVectorLayer *vl = qobject_cast<QgsVectorLayer *>( layer ) )
             title += tr( " (%1 - %2)" ).arg( QgsWkbTypes::displayString( vl->wkbType() ), layer->crs().authid() ).toHtmlEscaped();
diff --git a/src/core/qgsmaplayermodel.cpp b/src/core/qgsmaplayermodel.cpp
@@ -290,7 +290,7 @@ QVariant QgsMapLayerModel::data( const QModelIndex &index, int role ) const
         if ( title.isEmpty() )
           title = layer->name();
         title = "<b>" + title + "</b>";
-        if ( layer->crs().isValid() )
+        if ( layer->isSpatial() && layer->crs().isValid() )
         {
           if ( QgsVectorLayer *vl = qobject_cast<QgsVectorLayer *>( layer ) )
             title = tr( "%1 (%2 - %3)" ).arg( title, QgsWkbTypes::displayString( vl->wkbType() ), layer->crs().authid() );

Original file line number	Diff line number	Diff line change
`@@ -287,7 +287,7 @@ QVariant QgsLayerTreeModel::data( const QModelIndex &index, int role ) const`
`287`	`287`
`288`	`288`	`title = "<b>" + title.toHtmlEscaped() + "</b>";`
`289`	`289`
`290`		`- if ( layer->crs().isValid() )`
	`290`	`+ if ( layer->isSpatial() && layer->crs().isValid() )`
`291`	`291`	`{`
`292`	`292`	`if ( QgsVectorLayer vl = qobject_cast<QgsVectorLayer >( layer ) )`
`293`	`293`	`title += tr( " (%1 - %2)" ).arg( QgsWkbTypes::displayString( vl->wkbType() ), layer->crs().authid() ).toHtmlEscaped();`
Original file line number	Diff line number	Diff line change
`@@ -290,7 +290,7 @@ QVariant QgsMapLayerModel::data( const QModelIndex &index, int role ) const`
`290`	`290`	`if ( title.isEmpty() )`
`291`	`291`	`title = layer->name();`
`292`	`292`	`title = "<b>" + title + "</b>";`
`293`		`- if ( layer->crs().isValid() )`
	`293`	`+ if ( layer->isSpatial() && layer->crs().isValid() )`
`294`	`294`	`{`
`295`	`295`	`if ( QgsVectorLayer vl = qobject_cast<QgsVectorLayer >( layer ) )`
`296`	`296`	`title = tr( "%1 (%2 - %3)" ).arg( title, QgsWkbTypes::displayString( vl->wkbType() ), layer->crs().authid() );`