Merge pull request #755 from ddanielvaz/fix-4189

alexbruy · alexbruy · commit b88b76b510d6 · 2013-08-08T02:17:19.000-07:00
Fix #4189
diff --git a/src/core/qgsgeometry.cpp b/src/core/qgsgeometry.cpp
@@ -143,7 +143,7 @@ static GEOSInit geosinit;
 #define GEOSIntersection(g0,g1) GEOSIntersection( (GEOSGeometry*) g0, (GEOSGeometry*)g1 )
 #define GEOSBuffer(g, d, s) GEOSBuffer( (GEOSGeometry*) g, d, s )
 #define GEOSArea(g, a) GEOSArea( (GEOSGeometry*) g, a )
-#define GEOSSimplify(g, t) GEOSSimplify( (GEOSGeometry*) g, t )
+#define GEOSTopologyPreserveSimplify(g, t) GEOSTopologyPreserveSimplify( (GEOSGeometry*) g, t )
 #define GEOSGetCentroid(g) GEOSGetCentroid( (GEOSGeometry*) g )
 
 #define GEOSCoordSeq_getSize(cs,n) GEOSCoordSeq_getSize( (GEOSCoordSequence *) cs, n )
@@ -6449,7 +6449,7 @@ QgsGeometry* QgsGeometry::simplify( double tolerance )
   }
   try
   {
-    return fromGeosGeom( GEOSSimplify( mGeos, tolerance ) );
+    return fromGeosGeom( GEOSTopologyPreserveSimplify( mGeos, tolerance ) );
   }
   CATCH_GEOS( 0 )
 }

Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ static GEOSInit geosinit;`
`143`	`143`	`#define GEOSIntersection(g0,g1) GEOSIntersection( (GEOSGeometry) g0, (GEOSGeometry)g1 )`
`144`	`144`	`#define GEOSBuffer(g, d, s) GEOSBuffer( (GEOSGeometry*) g, d, s )`
`145`	`145`	`#define GEOSArea(g, a) GEOSArea( (GEOSGeometry*) g, a )`
`146`		`-#define GEOSSimplify(g, t) GEOSSimplify( (GEOSGeometry*) g, t )`
	`146`	`+#define GEOSTopologyPreserveSimplify(g, t) GEOSTopologyPreserveSimplify( (GEOSGeometry*) g, t )`
`147`	`147`	`#define GEOSGetCentroid(g) GEOSGetCentroid( (GEOSGeometry*) g )`
`148`	`148`
`149`	`149`	`#define GEOSCoordSeq_getSize(cs,n) GEOSCoordSeq_getSize( (GEOSCoordSequence *) cs, n )`
`@@ -6449,7 +6449,7 @@ QgsGeometry* QgsGeometry::simplify( double tolerance )`
`6449`	`6449`	`}`
`6450`	`6450`	`try`
`6451`	`6451`	`{`
`6452`		`- return fromGeosGeom( GEOSSimplify( mGeos, tolerance ) );`
	`6452`	`+ return fromGeosGeom( GEOSTopologyPreserveSimplify( mGeos, tolerance ) );`
`6453`	`6453`	`}`
`6454`	`6454`	`CATCH_GEOS( 0 )`
`6455`	`6455`	`}`