[qgis] 08/14: Add patch from upstream release_2.2 branch: 0001-postgres-provider-consider-TIN-and-POLYHEDRALSURFACE.patch

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository qgis.

commit a0a46d04da15d14dcac0b9e644457d4e30c9ce39
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Mar 1 14:41:13 2014 +0100

    Add patch from upstream release_2.2 branch: 0001-postgres-provider-consider-TIN-and-POLYHEDRALSURFACE.patch
---
 ...ovider-consider-TIN-and-POLYHEDRALSURFACE.patch | 35 ++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/debian/patches/0001-postgres-provider-consider-TIN-and-POLYHEDRALSURFACE.patch b/debian/patches/0001-postgres-provider-consider-TIN-and-POLYHEDRALSURFACE.patch
new file mode 100644
index 0000000..4256f10
--- /dev/null
+++ b/debian/patches/0001-postgres-provider-consider-TIN-and-POLYHEDRALSURFACE.patch
@@ -0,0 +1,35 @@
+From c3a281777b798e08a6430b428c52a4d396d9113c Mon Sep 17 00:00:00 2001
+From: "Juergen E. Fischer" <jef at norbit.de>
+Date: Wed, 26 Feb 2014 11:45:18 +0100
+Subject: postgres provider: consider TIN and POLYHEDRALSURFACE as
+ MULTIPOLYGONM (instead of POLYGONM) (fixes #9651)
+Bug: http://hub.qgis.org/issues/9651
+Origin: https://github.com/qgis/QGIS/commit/c3a281777b798e08a6430b428c52a4d396d9113c
+
+---
+ src/providers/postgres/qgspostgresconn.cpp |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/src/providers/postgres/qgspostgresconn.cpp
++++ b/src/providers/postgres/qgspostgresconn.cpp
+@@ -1357,7 +1357,7 @@ QGis::WkbType QgsPostgresConn::wkbTypeFr
+   {
+     return QGis::WKBMultiPolygon;
+   }
+-  else if ( type == "MULTIPOLYGONM" )
++  else if ( type == "MULTIPOLYGONM" || type == "TIN" || type == "POLYHEDRALSURFACE" )
+   {
+     return QGis::WKBMultiPolygon25D;
+   }
+@@ -1369,9 +1369,9 @@ QGis::WkbType QgsPostgresConn::wkbTypeFr
+ 
+ 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 )
+   {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qgis.git