Merge pull request #1102 from ahuarte47/Issue_8725R-ST_Simplify2

timlinux · timlinux · commit f4fc13402aad · 2014-01-23T07:05:17.000-08:00
Fix bug #8725R: no check simplification topology for point geometries in postgis provider
diff --git a/src/providers/postgres/qgspostgresfeatureiterator.cpp b/src/providers/postgres/qgspostgresfeatureiterator.cpp
@@ -605,7 +605,7 @@ bool QgsPostgresFeatureIterator::getFeature( QgsPostgresResult &queryResult, int
 
     // fix collapsed geometries by ST_Simplify() using the BBOX fetched from the current query
     const QgsSimplifyMethod& simplifyMethod = mRequest.simplifyMethod();
-    if ( mFetchGeometry && !simplifyMethod.forceLocalOptimization() && simplifyMethod.methodType() == QgsSimplifyMethod::OptimizeForRendering )
+    if ( mFetchGeometry && !simplifyMethod.forceLocalOptimization() && simplifyMethod.methodType() == QgsSimplifyMethod::OptimizeForRendering && QGis::flatType( QGis::singleType( P->geometryType() ) ) != QGis::WKBPoint )
     {
       QgsGeometry* geometry = feature.geometry();
 

Original file line number	Diff line number	Diff line change
`@@ -605,7 +605,7 @@ bool QgsPostgresFeatureIterator::getFeature( QgsPostgresResult &queryResult, int`
`605`	`605`
`606`	`606`	`// fix collapsed geometries by ST_Simplify() using the BBOX fetched from the current query`
`607`	`607`	`const QgsSimplifyMethod& simplifyMethod = mRequest.simplifyMethod();`
`608`		`- if ( mFetchGeometry && !simplifyMethod.forceLocalOptimization() && simplifyMethod.methodType() == QgsSimplifyMethod::OptimizeForRendering )`
	`608`	`+ if ( mFetchGeometry && !simplifyMethod.forceLocalOptimization() && simplifyMethod.methodType() == QgsSimplifyMethod::OptimizeForRendering && QGis::flatType( QGis::singleType( P->geometryType() ) ) != QGis::WKBPoint )`
`609`	`609`	`{`
`610`	`610`	`QgsGeometry* geometry = feature.geometry();`
`611`	`611`