Postgres simplification does not work with curved types

qgis · May 27, 2016 · 0aec8e9892e7b7c20b036d635dfcb56e96f01318 · 0aec8e9
1 parent 7e9a0a7
commit 0aec8e9892e7b7c20b036d635dfcb56e96f01318
Unified Split

Showing with 5 additions and 3 deletions.

+5 −3 src/providers/postgres/qgspostgresfeatureiterator.cpp
diff --git a/src/providers/postgres/qgspostgresfeatureiterator.cpp b/src/providers/postgres/qgspostgresfeatureiterator.cpp
@@ -486,11 +486,13 @@ bool QgsPostgresFeatureIterator::declareCursor( const QString& whereClause, long
                    geom );
     }
 
+    QGis::WkbType usedGeomType = mSource->mRequestedGeomType != QGis::WKBUnknown
+                                 ? mSource->mRequestedGeomType : mSource->mDetectedGeomType;
+
     if ( !mRequest.simplifyMethod().forceLocalOptimization() &&
          mRequest.simplifyMethod().methodType() != QgsSimplifyMethod::NoSimplification &&
-         QGis::flatType( QGis::singleType( mSource->mRequestedGeomType != QGis::WKBUnknown
-                                           ? mSource->mRequestedGeomType
-                                           : mSource->mDetectedGeomType ) ) != QGis::WKBPoint )
+         QGis::flatType( QGis::singleType( usedGeomType ) ) != QGis::WKBPoint &&
+         !QgsWKBTypes::isCurvedType( QGis::fromOldWkbType( usedGeomType ) ) )
     {
       // PostGIS simplification method to use
       QString simplifyPostgisMethod;