[postgres] Fix detection of 2.5D layer types

Author: Hugo Mercier

src/core/qgsdatasourceuri.cpp

@@ -543,7 +543,7 @@ QString QgsDataSourceURI::uri( bool expandAuthConfig ) const
   if ( mWkbType != QGis::WKBUnknown && mWkbType != QGis::WKBNoGeometry )
   {
     theUri += " type=";
-    theUri += QgsWKBTypes::displayString( QgsWKBTypes::flatType(( QgsWKBTypes::Type( mWkbType ) ) ) );
+    theUri += QgsWKBTypes::displayString( QgsWKBTypes::Type( mWkbType ) );
   }
 
   if ( mSelectAtIdDisabled )

src/providers/postgres/qgspostgresconn.cpp

@@ -523,6 +523,10 @@ bool QgsPostgresConn::getTableInfo( bool searchGeometryColumnsOnly, bool searchP
       layerProperty.tableName = tableName;
       layerProperty.geometryColName = column;
       layerProperty.geometryColType = columnType;
+      if ( dim == 3 && !type.endsWith( 'M' ) )
+        type += "Z";
+      else if ( dim == 4 )
+        type += "ZM";
       layerProperty.types = QList<QGis::WkbType>() << ( QgsPostgresConn::wkbTypeFromPostgis( type ) );
       layerProperty.srids = QList<int>() << srid;
       layerProperty.sql = "";

src/providers/postgres/qgspostgresprovider.cpp

@@ -2955,6 +2955,12 @@ bool QgsPostgresProvider::getGeometryDetails()
     if ( result.PQntuples() == 1 )
     {
       detectedType = result.PQgetvalue( 0, 0 );
+      QString dim = result.PQgetvalue( 0, 2 );
+      if ( dim == "3" && !detectedType.endsWith( 'M' ) )
+        detectedType += "Z";
+      else if ( dim == "4" )
+        detectedType += "ZM";
+
       detectedSrid = result.PQgetvalue( 0, 1 );
       mSpatialColType = sctGeometry;
     }