Skip to content

Commit

Permalink
manually apply PR 6124
Browse files Browse the repository at this point in the history
  • Loading branch information
jmckenna committed Jul 31, 2020
1 parent 5959551 commit d4facd1
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion mapogr.cpp
Expand Up @@ -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 )
{
Expand Down

0 comments on commit d4facd1

Please sign in to comment.