Fix incorrect layer type icons for some geopackage layers (e.g. curve types)

nyalldawson · nyalldawson · commit 2ee0bc87ca5c · 2018-02-09T20:28:04.000+11:00
diff --git a/src/providers/ogr/qgsogrdataitems.cpp b/src/providers/ogr/qgsogrdataitems.cpp
@@ -139,6 +139,21 @@ QgsLayerItem::LayerType QgsOgrLayerItem::layerTypeFromDb( const QString &geometr
   {
     return QgsLayerItem::LayerType::Raster;
   }
+
+  // fallback - try parsing as a WKT type string
+  switch ( QgsWkbTypes::geometryType( QgsWkbTypes::parseType( geometryType ) ) )
+  {
+    case QgsWkbTypes::PointGeometry:
+      return QgsLayerItem::LayerType::Point;
+    case QgsWkbTypes::LineGeometry:
+      return QgsLayerItem::LayerType::Line;
+    case QgsWkbTypes::PolygonGeometry:
+      return QgsLayerItem::LayerType::Polygon;
+    case QgsWkbTypes::UnknownGeometry:
+    case QgsWkbTypes::NullGeometry:
+      break;
+  }
+
   return QgsLayerItem::LayerType::TableLayer;
 }
 
