Remove python bindings for QgsGeos, move createGeometryEngine() from edit utils to QgsGeometry class

mhugent · mhugent · commit 7b31f8a02f47 · 2015-06-25T10:45:53.000+02:00
diff --git a/python/core/core.sip b/python/core/core.sip
@@ -283,7 +283,6 @@
 %Include geometry/qgscurvev2.sip
 %Include geometry/qgsgeometrycollectionv2.sip
 %Include geometry/qgsgeometryengine.sip
-%Include geometry/qgsgeos.sip
 %Include geometry/qgslinestringv2.sip
 %Include geometry/qgsmulticurvev2.sip
 %Include geometry/qgsmultilinestringv2.sip
diff --git a/python/core/geometry/qgsgeometry.sip b/python/core/geometry/qgsgeometry.sip
@@ -680,5 +680,9 @@ class QgsGeometry
     QgsPolygon smoothPolygon( const QgsPolygon &polygon, const unsigned int iterations = 1, const double offset = 0.25 ) const;
     /**Smooths a polyline using the Chaikin algorithm*/
     QgsPolyline smoothLine( const QgsPolyline &polyline, const unsigned int iterations = 1, const double offset = 0.25 ) const;
+
+    /** Creates and returns a new geometry engine*/
+    static QgsGeometryEngine* createGeometryEngine( const QgsAbstractGeometryV2* geometry );
+
 }; // class QgsGeometry
 
diff --git a/python/core/geometry/qgsgeos.sip b/python/core/geometry/qgsgeos.sip
diff --git a/src/core/geometry/qgsgeometry.cpp b/src/core/geometry/qgsgeometry.cpp
@@ -2230,6 +2230,11 @@ QgsGeometry* QgsGeometry::convertToPolygon( bool destMultipart ) const
   }
 }
 
+QgsGeometryEngine* QgsGeometry::createGeometryEngine( const QgsAbstractGeometryV2* geometry )
+{
+  return new QgsGeos( geometry );
+}
+
 QDataStream& operator<<( QDataStream& out, const QgsGeometry& geometry )
 {
   QByteArray byteArray = QByteArray::fromRawData(( char * )geometry.asWkb(), geometry.wkbSize() ); // does not copy data and does not take ownership
diff --git a/src/core/geometry/qgsgeometry.h b/src/core/geometry/qgsgeometry.h
@@ -723,6 +723,10 @@ class CORE_EXPORT QgsGeometry
     /**Smooths a polyline using the Chaikin algorithm*/
     QgsPolyline smoothLine( const QgsPolyline &polyline, const unsigned int iterations = 1, const double offset = 0.25 ) const;
 
+    /** Creates and returns a new geometry engine
+     */
+    static QgsGeometryEngine* createGeometryEngine( const QgsAbstractGeometryV2* geometry );
+
   private:
 
     QgsGeometryPrivate* d; //implicitely shared data pointer
diff --git a/src/core/geometry/qgsgeometryeditutils.cpp b/src/core/geometry/qgsgeometryeditutils.cpp
@@ -62,7 +62,7 @@ int QgsGeometryEditUtils::addRing( QgsAbstractGeometryV2* geom, QgsCurveV2* ring
     delete ring; return 3;
   }
 
-  QScopedPointer<QgsGeometryEngine> ringGeom( createGeometryEngine( ring ) );
+  QScopedPointer<QgsGeometryEngine> ringGeom( QgsGeometry::createGeometryEngine( ring ) );
   ringGeom->prepareGeometry();
 
   //for each polygon, test if inside outer ring and no intersection with other interior ring
@@ -215,7 +215,7 @@ bool QgsGeometryEditUtils::deletePart( QgsAbstractGeometryV2* geom, int partNum
 
 QgsAbstractGeometryV2* QgsGeometryEditUtils::avoidIntersections( const QgsAbstractGeometryV2& geom, QMap<QgsVectorLayer*, QSet<QgsFeatureId> > ignoreFeatures )
 {
-  QScopedPointer<QgsGeometryEngine> geomEngine( createGeometryEngine( &geom ) );
+  QScopedPointer<QgsGeometryEngine> geomEngine( QgsGeometry::createGeometryEngine( &geom ) );
   if ( geomEngine.isNull() )
   {
     return 0;
@@ -285,8 +285,3 @@ QgsAbstractGeometryV2* QgsGeometryEditUtils::avoidIntersections( const QgsAbstra
   delete combinedGeometries;
   return diffGeom;
 }
-
-QgsGeometryEngine* QgsGeometryEditUtils::createGeometryEngine( const QgsAbstractGeometryV2* geometry )
-{
-  return new QgsGeos( geometry );
-}
diff --git a/src/core/geometry/qgsgeometryeditutils.h b/src/core/geometry/qgsgeometryeditutils.h
@@ -57,10 +57,6 @@ class QgsGeometryEditUtils
      * @param ignoreFeatures map of layer to feature id of features to ignore
      */
     static QgsAbstractGeometryV2* avoidIntersections( const QgsAbstractGeometryV2& geom, QMap<QgsVectorLayer*, QSet<QgsFeatureId> > ignoreFeatures = ( QMap<QgsVectorLayer*, QSet<QgsFeatureId> >() ) );
-
-    /** Creates and returns a new geometry engine
-     */
-    static QgsGeometryEngine* createGeometryEngine( const QgsAbstractGeometryV2* geometry );
 };
 
 #endif // QGSGEOMETRYEDITUTILS_H

-Original file line number
+Diff line change
     QgsPolygon smoothPolygon( const QgsPolygon &polygon, const unsigned int iterations = 1, const double offset = 0.25 ) const;
     /**Smooths a polyline using the Chaikin algorithm*/
     QgsPolyline smoothLine( const QgsPolyline &polyline, const unsigned int iterations = 1, const double offset = 0.25 ) const;
++
 +    /** Creates and returns a new geometry engine*/
 +    static QgsGeometryEngine* createGeometryEngine( const QgsAbstractGeometryV2* geometry );Collapse commentComment on line R685
m-kuhn commented on Jun 25, 2015 
m-kuhn
on Jun 25, 2015
Member
@mhugent Looks good, but should there not be a /Factory/ annotation?
mhugent replied on Jun 25, 2015 
mhugent
on Jun 25, 2015
ContributorAuthor
Right, the factory annotation is needed. Thanks for the hint.
Code has comments. Press enter to view.
++
 }; // class QgsGeometry
Original file line number	Diff line number	Diff line change
`@@ -2230,6 +2230,11 @@ QgsGeometry* QgsGeometry::convertToPolygon( bool destMultipart ) const`
`2230`	`2230`	`}`
`2231`	`2231`	`}`
`2232`	`2232`
	`2233`	`+QgsGeometryEngine* QgsGeometry::createGeometryEngine( const QgsAbstractGeometryV2* geometry )`
	`2234`	`+{`
	`2235`	`+ return new QgsGeos( geometry );`
	`2236`	`+}`
	`2237`	`+`
`2233`	`2238`	`QDataStream& operator<<( QDataStream& out, const QgsGeometry& geometry )`
`2234`	`2239`	`{`
`2235`	`2240`	`QByteArray byteArray = QByteArray::fromRawData(( char * )geometry.asWkb(), geometry.wkbSize() ); // does not copy data and does not take ownership`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ int QgsGeometryEditUtils::addRing( QgsAbstractGeometryV2* geom, QgsCurveV2* ring`
`62`	`62`	`delete ring; return 3;`
`63`	`63`	`}`
`64`	`64`
`65`		`- QScopedPointer<QgsGeometryEngine> ringGeom( createGeometryEngine( ring ) );`
	`65`	`+ QScopedPointer<QgsGeometryEngine> ringGeom( QgsGeometry::createGeometryEngine( ring ) );`
`66`	`66`	`ringGeom->prepareGeometry();`
`67`	`67`
`68`	`68`	`//for each polygon, test if inside outer ring and no intersection with other interior ring`
`@@ -215,7 +215,7 @@ bool QgsGeometryEditUtils::deletePart( QgsAbstractGeometryV2* geom, int partNum`
`215`	`215`
`216`	`216`	`QgsAbstractGeometryV2* QgsGeometryEditUtils::avoidIntersections( const QgsAbstractGeometryV2& geom, QMap<QgsVectorLayer*, QSet<QgsFeatureId> > ignoreFeatures )`
`217`	`217`	`{`
`218`		`- QScopedPointer<QgsGeometryEngine> geomEngine( createGeometryEngine( &geom ) );`
	`218`	`+ QScopedPointer<QgsGeometryEngine> geomEngine( QgsGeometry::createGeometryEngine( &geom ) );`
`219`	`219`	`if ( geomEngine.isNull() )`
`220`	`220`	`{`
`221`	`221`	`return 0;`
`@@ -285,8 +285,3 @@ QgsAbstractGeometryV2* QgsGeometryEditUtils::avoidIntersections( const QgsAbstra`
`285`	`285`	`delete combinedGeometries;`
`286`	`286`	`return diffGeom;`
`287`	`287`	`}`
`288`		`-`
`289`		`-QgsGeometryEngine* QgsGeometryEditUtils::createGeometryEngine( const QgsAbstractGeometryV2* geometry )`
`290`		`-{`
`291`		`- return new QgsGeos( geometry );`
`292`		`-}`