manually apply PR 6124

jmckenna · jmckenna · commit d4facd1f2c27 · 2020-07-31T11:56:16.000-03:00
diff --git a/mapogr.cpp b/mapogr.cpp
@@ -3447,7 +3447,11 @@ static int  msOGRExtractTopSpatialFilter( msOGRFileInfo *info,
                                           pSpatialFilterNode);
   }
 
-  if( (expr->m_nToken == MS_TOKEN_COMPARISON_INTERSECTS || expr->m_nToken == MS_TOKEN_COMPARISON_CONTAINS ) &&
+  if( (expr->m_nToken == MS_TOKEN_COMPARISON_INTERSECTS ||
+      expr->m_nToken == MS_TOKEN_COMPARISON_OVERLAPS ||
+      expr->m_nToken == MS_TOKEN_COMPARISON_CROSSES ||
+      expr->m_nToken == MS_TOKEN_COMPARISON_WITHIN ||
+      expr->m_nToken == MS_TOKEN_COMPARISON_CONTAINS) &&
       expr->m_aoChildren.size() == 2 &&
       expr->m_aoChildren[1]->m_nToken == MS_TOKEN_LITERAL_SHAPE )
   {

Original file line number	Diff line number	Diff line change
`@@ -3447,7 +3447,11 @@ static int msOGRExtractTopSpatialFilter( msOGRFileInfo *info,`
`3447`	`3447`	`pSpatialFilterNode);`
`3448`	`3448`	`}`
`3449`	`3449`
`3450`		`- if( (expr->m_nToken == MS_TOKEN_COMPARISON_INTERSECTS \|\| expr->m_nToken == MS_TOKEN_COMPARISON_CONTAINS ) &&`
	`3450`	`+ if( (expr->m_nToken == MS_TOKEN_COMPARISON_INTERSECTS \|\|`
	`3451`	`+ expr->m_nToken == MS_TOKEN_COMPARISON_OVERLAPS \|\|`
	`3452`	`+ expr->m_nToken == MS_TOKEN_COMPARISON_CROSSES \|\|`
	`3453`	`+ expr->m_nToken == MS_TOKEN_COMPARISON_WITHIN \|\|`
	`3454`	`+ expr->m_nToken == MS_TOKEN_COMPARISON_CONTAINS) &&`
`3451`	`3455`	`expr->m_aoChildren.size() == 2 &&`
`3452`	`3456`	`expr->m_aoChildren[1]->m_nToken == MS_TOKEN_LITERAL_SHAPE )`
`3453`	`3457`	`{`