OGRLayer::FilterGeometry is selecting more features than expected when the filter geometry is an envelope

[Even Rouault]

This is due to the following code which assumes that if the filter is an envelope, we don't have further tests to do. The current code keeps features that should be discarded

/* -------------------------------------------------------------------- */
/*      Fallback to full intersect test (using GEOS) if we still        */
/*      don't know for sure.                                            */
/* -------------------------------------------------------------------- */
    if( m_bFilterIsEnvelope )
        return TRUE;
    else
    {
        if( OGRGeometryFactory::haveGEOS() )
            return m_poFilterGeom->Intersects( poGeometry );
        else
            return TRUE;
    }

Current state of ogr_shape_9 test is a consequence of this wrong test.

###############################################################################
# Test that we don't return a polygon if we are "inside" but non-overlapping.
# For now we actually do return this shape, but eventually we won't.

def ogr_shape_9():

[Even Rouault]

Fixed in trunk in r14828 and in r14829.

[Even Rouault]

Fixed in branches/1.5 in r14830.

[Even Rouault]

Small change in ogr_shape_9 test whose result now depend on whether GDAL has GEOS support or not. r14832 and r14833