Fix identify menu highlight only works with simple geometry types

nyalldawson · nyalldawson · commit 5b3f10a53176 · 2016-10-03T15:15:12.000+10:00
Fix #15625
diff --git a/src/gui/qgshighlight.cpp b/src/gui/qgshighlight.cpp
@@ -282,65 +282,62 @@ void QgsHighlight::paint( QPainter* p )
     p->setPen( mPen );
     p->setBrush( mBrush );
 
-    switch ( mGeometry->wkbType() )
+    switch ( mGeometry->type() )
     {
-      case QgsWkbTypes::Point:
-      case QgsWkbTypes::Point25D:
+      case QgsWkbTypes::PointGeometry:
       {
-        paintPoint( p, mGeometry->asPoint() );
-      }
-      break;
-
-      case QgsWkbTypes::MultiPoint:
-      case QgsWkbTypes::MultiPoint25D:
-      {
-        QgsMultiPoint m = mGeometry->asMultiPoint();
-        for ( int i = 0; i < m.size(); i++ )
+        if ( !mGeometry->isMultipart() )
         {
-          paintPoint( p, m[i] );
+          paintPoint( p, mGeometry->asPoint() );
+        }
+        else
+        {
+          QgsMultiPoint m = mGeometry->asMultiPoint();
+          for ( int i = 0; i < m.size(); i++ )
+          {
+            paintPoint( p, m[i] );
+          }
         }
       }
       break;
 
-      case QgsWkbTypes::LineString:
-      case QgsWkbTypes::LineString25D:
-      {
-        paintLine( p, mGeometry->asPolyline() );
-      }
-      break;
-
-      case QgsWkbTypes::MultiLineString:
-      case QgsWkbTypes::MultiLineString25D:
+      case QgsWkbTypes::LineGeometry:
       {
-        QgsMultiPolyline m = mGeometry->asMultiPolyline();
-
-        for ( int i = 0; i < m.size(); i++ )
+        if ( !mGeometry->isMultipart() )
         {
-          paintLine( p, m[i] );
+          paintLine( p, mGeometry->asPolyline() );
         }
-      }
-      break;
+        else
+        {
+          QgsMultiPolyline m = mGeometry->asMultiPolyline();
 
-      case QgsWkbTypes::Polygon:
-      case QgsWkbTypes::Polygon25D:
-      {
-        paintPolygon( p, mGeometry->asPolygon() );
+          for ( int i = 0; i < m.size(); i++ )
+          {
+            paintLine( p, m[i] );
+          }
+        }
+        break;
       }
-      break;
 
-      case QgsWkbTypes::MultiPolygon:
-      case QgsWkbTypes::MultiPolygon25D:
+      case QgsWkbTypes::PolygonGeometry:
       {
-        QgsMultiPolygon m = mGeometry->asMultiPolygon();
-        for ( int i = 0; i < m.size(); i++ )
+        if ( !mGeometry->isMultipart() )
+        {
+          paintPolygon( p, mGeometry->asPolygon() );
+        }
+        else
         {
-          paintPolygon( p, m[i] );
+          QgsMultiPolygon m = mGeometry->asMultiPolygon();
+          for ( int i = 0; i < m.size(); i++ )
+          {
+            paintPolygon( p, m[i] );
+          }
         }
+        break;
       }
-      break;
 
-      case QgsWkbTypes::Unknown:
-      default:
+      case QgsWkbTypes::UnknownGeometry:
+      case QgsWkbTypes::NullGeometry:
         return;
     }
   }
