Merge pull request #5912 from mapserver/backport-5911-to-branch-7-4

[Backport branch-7-4] Added check for Contains to force a Join on the rtree table for large…
MapServer · Nov 3, 2019 · ac3fd1e · ac3fd1e
2 parents 1538df8 + 40fd76f
commit ac3fd1e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/mapogr.cpp b/mapogr.cpp
@@ -3469,7 +3469,7 @@ static int  msOGRExtractTopSpatialFilter( msOGRFileInfo *info,
                                           pSpatialFilterNode);
   }
 
-  if( expr->m_nToken == MS_TOKEN_COMPARISON_INTERSECTS &&
+  if( (expr->m_nToken == MS_TOKEN_COMPARISON_INTERSECTS || expr->m_nToken == MS_TOKEN_COMPARISON_CONTAINS ) &&
       expr->m_aoChildren.size() == 2 &&
       expr->m_aoChildren[1]->m_nToken == MS_TOKEN_LITERAL_SHAPE )
   {