Make QgsGeos::prepareGeometry and QgsGeos::cacheGeos idempotent

Rather than re-preparing or re-converting geometries on every call. The "geometryChanged" method will reset the caches.
qgis · Sep 20, 2021 · 30a56ac · 30a56ac
1 parent 8051c3f
commit 30a56ac
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/src/core/geometry/qgsgeos.cpp b/src/core/geometry/qgsgeos.cpp
@@ -212,7 +212,11 @@ void QgsGeos::geometryChanged()
 
 void QgsGeos::prepareGeometry()
 {
-  mGeosPrepared.reset();
+  if ( mGeosPrepared )
+  {
+    // Already prepared
+    return;
+  }
   if ( mGeos )
   {
     mGeosPrepared.reset( GEOSPrepare_r( geosinit()->ctxt, mGeos.get() ) );
@@ -221,6 +225,11 @@ void QgsGeos::prepareGeometry()
 
 void QgsGeos::cacheGeos() const
 {
+  if ( mGeos )
+  {
+    // Already cached
+    return;
+  }
   if ( !mGeometry )
   {
     return;