GEOS context accessor for PAL

wonder-sk · wonder-sk · commit 0b72fc8283c5 · 2014-09-14T17:34:31.000+07:00
diff --git a/src/core/pal/feature.cpp b/src/core/pal/feature.cpp
@@ -39,7 +39,6 @@
 #endif
 
 #include <qglobal.h>
-#include <qgsgeometry.h>
 
 #include <cmath>
 #include <cstring>
@@ -110,7 +109,7 @@ namespace pal
 
     if ( ownsGeom )
     {
-      GEOSGeom_destroy_r( QgsGeometry::getGEOSHandler(), the_geom );
+      GEOSGeom_destroy_r( geosContext(), the_geom );
       the_geom = NULL;
     }
   }
@@ -124,7 +123,7 @@ namespace pal
     int i, j;
 
     const GEOSCoordSequence *coordSeq;
-    GEOSContextHandle_t geosctxt = QgsGeometry::getGEOSHandler();
+    GEOSContextHandle_t geosctxt = geosContext();
 
     type = GEOSGeomTypeId_r( geosctxt, geom );
 
@@ -1399,7 +1398,7 @@ namespace pal
 
   void FeaturePart::addSizePenalty( int nbp, LabelPosition** lPos, double bbx[4], double bby[4] )
   {
-    GEOSContextHandle_t ctxt = QgsGeometry::getGEOSHandler();
+    GEOSContextHandle_t ctxt = geosContext();
     int geomType = GEOSGeomTypeId_r( ctxt, the_geom );
 
     double sizeCost = 0;
@@ -1439,12 +1438,12 @@ namespace pal
 
   bool FeaturePart::isConnected( FeaturePart* p2 )
   {
-    return ( GEOSTouches_r( QgsGeometry::getGEOSHandler(), the_geom, p2->the_geom ) == 1 );
+    return ( GEOSTouches_r( geosContext(), the_geom, p2->the_geom ) == 1 );
   }
 
   bool FeaturePart::mergeWithFeaturePart( FeaturePart* other )
   {
-    GEOSContextHandle_t ctxt = QgsGeometry::getGEOSHandler();
+    GEOSContextHandle_t ctxt = geosContext();
     GEOSGeometry* g1 = GEOSGeom_clone_r( ctxt, the_geom );
     GEOSGeometry* g2 = GEOSGeom_clone_r( ctxt, other->the_geom );
     GEOSGeometry* geoms[2] = { g1, g2 };
diff --git a/src/core/pal/layer.cpp b/src/core/pal/layer.cpp
@@ -41,8 +41,6 @@
 #include <cmath>
 #include <vector>
 
-#include <qgsgeometry.h>
-
 #include <pal/pal.h>
 #include <pal/layer.h>
 #include <pal/palexception.h>
@@ -287,7 +285,7 @@ namespace pal
       throw InternalException::UnknownGeometry();
     }
 
-    GEOSContextHandle_t geosctxt = QgsGeometry::getGEOSHandler();
+    GEOSContextHandle_t geosctxt = geosContext();
 
     while ( simpleGeometries->size() > 0 )
     {
@@ -496,7 +494,7 @@ namespace pal
 
   void Layer::chopFeaturesAtRepeatDistance( )
   {
-    GEOSContextHandle_t geosctxt = QgsGeometry::getGEOSHandler();
+    GEOSContextHandle_t geosctxt = geosContext();
     LinkedList<FeaturePart*> * newFeatureParts = new LinkedList<FeaturePart*>( ptrFeaturePartCompare );
     while ( FeaturePart* fpart = featureParts->pop_front() )
     {
diff --git a/src/core/pal/pal.cpp b/src/core/pal/pal.cpp
@@ -63,6 +63,8 @@
 #include "simplemutex.h"
 #include "util.h"
 
+#include <qgsgeometry.h> // for GEOS context
+
 namespace pal
 {
 
@@ -80,6 +82,11 @@ namespace pal
     vfprintf( stdout, fmt, list );
   }
 
+  GEOSContextHandle_t geosContext()
+  {
+    return QgsGeometry::getGEOSHandler();
+  }
+
   Pal::Pal()
   {
     // do not init and exit GEOS - we do it inside QGIS
diff --git a/src/core/pal/pal.h b/src/core/pal/pal.h
@@ -38,6 +38,7 @@
 #include <QList>
 #include <iostream>
 #include <ctime>
+#include <geos_c.h>
 
 // TODO ${MAJOR} ${MINOR} etc instead of 0.2
 
@@ -51,6 +52,8 @@
 
 namespace pal
 {
+  /** Get GEOS context handle to be used in all GEOS library calls with reentrant API */
+  GEOSContextHandle_t geosContext();
 
   template <class Type> class LinkedList;
 
diff --git a/src/core/pal/pointset.cpp b/src/core/pal/pointset.cpp
@@ -39,7 +39,6 @@
 #endif
 
 #include <qglobal.h>
-#include <qgsgeometry.h>
 
 #include "pointset.h"
 #include "util.h"
@@ -989,7 +988,7 @@ namespace pal
     // check if centroid inside in polygon
     if ( forceInside && !isPointInPolygon( nbPoints, x, y, px, py ) )
     {
-      GEOSContextHandle_t geosctxt = QgsGeometry::getGEOSHandler();
+      GEOSContextHandle_t geosctxt = geosContext();
       GEOSCoordSequence *coord = GEOSCoordSeq_create_r( geosctxt, nbPoints, 2 );
 
       for ( int i = 0; i < nbPoints; ++i )
diff --git a/src/core/pal/util.cpp b/src/core/pal/util.cpp
@@ -42,8 +42,6 @@
 #include <cstdarg>
 #include <ctime>
 
-#include "qgsgeometry.h"
-
 #include <pal/layer.h>
 
 #include "internalexception.h"
@@ -213,7 +211,7 @@ namespace pal
     while ( queue->size() > 0 )
     {
       geom = queue->pop_front();
-      GEOSContextHandle_t geosctxt = QgsGeometry::getGEOSHandler();
+      GEOSContextHandle_t geosctxt = geosContext();
       switch ( GEOSGeomTypeId_r( geosctxt, geom ) )
       {
           //case geos::geom::GEOS_MULTIPOINT:
diff --git a/src/core/qgsgeometry.h b/src/core/qgsgeometry.h
@@ -83,7 +83,10 @@ class CORE_EXPORT QgsGeometry
     //! Destructor
     ~QgsGeometry();
 
-    /** return GEOS context handle */
+    /** return GEOS context handle
+     * @note added in 2.6
+     * @note not available in Python
+     */
     static GEOSContextHandle_t getGEOSHandler();
 
     /** static method that creates geometry from Wkt */

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,6 @@`
`39`	`39`	`#endif`
`40`	`40`
`41`	`41`	`#include <qglobal.h>`
`42`		`-#include <qgsgeometry.h>`
`43`	`42`
`44`	`43`	`#include <cmath>`
`45`	`44`	`#include <cstring>`
`@@ -110,7 +109,7 @@ namespace pal`
`110`	`109`
`111`	`110`	`if ( ownsGeom )`
`112`	`111`	`{`
`113`		`- GEOSGeom_destroy_r( QgsGeometry::getGEOSHandler(), the_geom );`
	`112`	`+ GEOSGeom_destroy_r( geosContext(), the_geom );`
`114`	`113`	`the_geom = NULL;`
`115`	`114`	`}`
`116`	`115`	`}`
`@@ -124,7 +123,7 @@ namespace pal`
`124`	`123`	`int i, j;`
`125`	`124`
`126`	`125`	`const GEOSCoordSequence *coordSeq;`
`127`		`- GEOSContextHandle_t geosctxt = QgsGeometry::getGEOSHandler();`
	`126`	`+ GEOSContextHandle_t geosctxt = geosContext();`
`128`	`127`
`129`	`128`	`type = GEOSGeomTypeId_r( geosctxt, geom );`
`130`	`129`
`@@ -1399,7 +1398,7 @@ namespace pal`
`1399`	`1398`
`1400`	`1399`	`void FeaturePart::addSizePenalty( int nbp, LabelPosition** lPos, double bbx[4], double bby[4] )`
`1401`	`1400`	`{`
`1402`		`- GEOSContextHandle_t ctxt = QgsGeometry::getGEOSHandler();`
	`1401`	`+ GEOSContextHandle_t ctxt = geosContext();`
`1403`	`1402`	`int geomType = GEOSGeomTypeId_r( ctxt, the_geom );`
`1404`	`1403`
`1405`	`1404`	`double sizeCost = 0;`
`@@ -1439,12 +1438,12 @@ namespace pal`
`1439`	`1438`
`1440`	`1439`	`bool FeaturePart::isConnected( FeaturePart* p2 )`
`1441`	`1440`	`{`
`1442`		`- return ( GEOSTouches_r( QgsGeometry::getGEOSHandler(), the_geom, p2->the_geom ) == 1 );`
	`1441`	`+ return ( GEOSTouches_r( geosContext(), the_geom, p2->the_geom ) == 1 );`
`1443`	`1442`	`}`
`1444`	`1443`
`1445`	`1444`	`bool FeaturePart::mergeWithFeaturePart( FeaturePart* other )`
`1446`	`1445`	`{`
`1447`		`- GEOSContextHandle_t ctxt = QgsGeometry::getGEOSHandler();`
	`1446`	`+ GEOSContextHandle_t ctxt = geosContext();`
`1448`	`1447`	`GEOSGeometry* g1 = GEOSGeom_clone_r( ctxt, the_geom );`
`1449`	`1448`	`GEOSGeometry* g2 = GEOSGeom_clone_r( ctxt, other->the_geom );`
`1450`	`1449`	`GEOSGeometry* geoms[2] = { g1, g2 };`
Original file line number	Diff line number	Diff line change
`@@ -41,8 +41,6 @@`
`41`	`41`	`#include <cmath>`
`42`	`42`	`#include <vector>`
`43`	`43`
`44`		`-#include <qgsgeometry.h>`
`45`		`-`
`46`	`44`	`#include <pal/pal.h>`
`47`	`45`	`#include <pal/layer.h>`
`48`	`46`	`#include <pal/palexception.h>`
`@@ -287,7 +285,7 @@ namespace pal`
`287`	`285`	`throw InternalException::UnknownGeometry();`
`288`	`286`	`}`
`289`	`287`
`290`		`- GEOSContextHandle_t geosctxt = QgsGeometry::getGEOSHandler();`
	`288`	`+ GEOSContextHandle_t geosctxt = geosContext();`
`291`	`289`
`292`	`290`	`while ( simpleGeometries->size() > 0 )`
`293`	`291`	`{`
`@@ -496,7 +494,7 @@ namespace pal`
`496`	`494`
`497`	`495`	`void Layer::chopFeaturesAtRepeatDistance( )`
`498`	`496`	`{`
`499`		`- GEOSContextHandle_t geosctxt = QgsGeometry::getGEOSHandler();`
	`497`	`+ GEOSContextHandle_t geosctxt = geosContext();`
`500`	`498`	`LinkedList<FeaturePart> newFeatureParts = new LinkedList<FeaturePart*>( ptrFeaturePartCompare );`
`501`	`499`	`while ( FeaturePart* fpart = featureParts->pop_front() )`
`502`	`500`	`{`
Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,8 @@`
`63`	`63`	`#include "simplemutex.h"`
`64`	`64`	`#include "util.h"`
`65`	`65`
	`66`	`+#include <qgsgeometry.h> // for GEOS context`
	`67`	`+`
`66`	`68`	`namespace pal`
`67`	`69`	`{`
`68`	`70`
`@@ -80,6 +82,11 @@ namespace pal`
`80`	`82`	`vfprintf( stdout, fmt, list );`
`81`	`83`	`}`
`82`	`84`
	`85`	`+ GEOSContextHandle_t geosContext()`
	`86`	`+ {`
	`87`	`+ return QgsGeometry::getGEOSHandler();`
	`88`	`+ }`
	`89`	`+`
`83`	`90`	`Pal::Pal()`
`84`	`91`	`{`
`85`	`92`	`// do not init and exit GEOS - we do it inside QGIS`