Huge speedup when labels are set to "boundary" obstacle mode

Because GEOS prepared predicates are "stubbed out" for many relation types, such as overlaps and touches, we can get a HUGE speedup by reworking the obstacle boundary check to utilise an intersects and within check instead (with the same results)
qgis · Dec 4, 2019 · b736bf9 · b736bf9
1 parent 4268504
commit b736bf9
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/core/pal/labelposition.cpp b/src/core/pal/labelposition.cpp
@@ -558,8 +558,8 @@ bool LabelPosition::crossesBoundary( PointSet *polygon ) const
   GEOSContextHandle_t geosctxt = QgsGeos::getGEOSHandler();
   try
   {
-    if ( GEOSPreparedOverlaps_r( geosctxt, polygon->preparedGeom(), mGeos ) == 1
-         || GEOSPreparedTouches_r( geosctxt, polygon->preparedGeom(), mGeos ) == 1 )
+    if ( GEOSPreparedIntersects_r( geosctxt, polygon->preparedGeom(), mGeos ) == 1
+         && GEOSPreparedContains_r( geosctxt, polygon->preparedGeom(), mGeos ) != 1 )
     {
       return true;
     }