Showing with 3 additions and 3 deletions.
  1. BIN ms-windows/Installer-Files/WelcomeFinishPage.bmp
  2. +3 −3 src/providers/postgres/qgspostgresconn.cpp
Binary file modified ms-windows/Installer-Files/WelcomeFinishPage.bmp
View file
Binary file not shown.
6 changes: 3 additions & 3 deletions src/providers/postgres/qgspostgresconn.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1357,7 +1357,7 @@ QGis::WkbType QgsPostgresConn::wkbTypeFromPostgis( QString type )
{
return QGis::WKBMultiPolygon;
}
else if ( type == "MULTIPOLYGONM" )
else if ( type == "MULTIPOLYGONM" || type == "TIN" || type == "POLYHEDRALSURFACE" )
{
return QGis::WKBMultiPolygon25D;
}
Expand All @@ -1369,9 +1369,9 @@ QGis::WkbType QgsPostgresConn::wkbTypeFromPostgis( QString type )

QGis::WkbType QgsPostgresConn::wkbTypeFromOgcWkbType( unsigned int wkbType )
{
// polyhedralsurface / TIN / triangle => Polygon
// polyhedralsurface / TIN / triangle => MultiPolygon
if ( wkbType % 100 >= 15 )
wkbType = wkbType / 1000 * 1000 + QGis::WKBPolygon;
wkbType = wkbType / 1000 * 1000 + QGis::WKBMultiPolygon;

switch ( wkbType / 1000 )
{
Expand Down