WFS: fix taking into account of wfs_use_default_extent_for_getfeature. Logic added in 7.0.3 was inverted...

Author: rouault

Diff for: mapogcfilter.c

@@ -673,7 +673,7 @@ int FLTLayerApplyPlainFilterToLayer(FilterEncodingNode *psNode, mapObj *map,
 
     pszUseDefaultExtent = msOWSLookupMetadata(&(lp->metadata), "F",
                                               "use_default_extent_for_getfeature");
-    if( pszUseDefaultExtent && CSLTestBoolean(pszUseDefaultExtent) &&
+    if( pszUseDefaultExtent && !CSLTestBoolean(pszUseDefaultExtent) &&
         lp->connectiontype == MS_OGR )
     {
         const rectObj rectInvalid = MS_INIT_INVALID_RECT;

Diff for: mapogr.cpp

@@ -2429,13 +2429,15 @@ static int msOGRFileWhichShapes(layerObj *layer, rectObj rect, msOGRFileInfo *ps
                 OGR_L_SetSpatialFilter( psInfo->hLayer, hSpatialFilterPolygon );
                 OGR_G_DestroyGeometry( hSpatialFilterPolygon );
             }
+
+            if (layer->debug >= MS_DEBUGLEVEL_VVV)
+            {
+                msDebug("msOGRFileWhichShapes: Setting spatial filter to %.15g %.15g %.15g %.15g\n", rect.minx, rect.miny, rect.maxx, rect.maxy );
+            }
         }
 
         psInfo->rect = rect;
 
-        if (layer->debug >= MS_DEBUGLEVEL_VVV)
-            msDebug("msOGRFileWhichShapes: Setting spatial filter to %.15g %.15g %.15g %.15g\n", rect.minx, rect.miny, rect.maxx, rect.maxy );
-
         /* ------------------------------------------------------------------
          * Apply an attribute filter if we have one prefixed with a WHERE
          * keyword in the filter string.  Otherwise, ensure the attribute

Diff for: mapwfs.c

@@ -2153,7 +2153,7 @@ static int msWFSRunBasicGetFeature(mapObj* map,
 
     pszUseDefaultExtent = msOWSLookupMetadata(&(lp->metadata), "F",
                                               "use_default_extent_for_getfeature");
-    if( pszUseDefaultExtent && CSLTestBoolean(pszUseDefaultExtent) &&
+    if( pszUseDefaultExtent && !CSLTestBoolean(pszUseDefaultExtent) &&
         lp->connectiontype == MS_OGR )
     {
         const rectObj rectInvalid = MS_INIT_INVALID_RECT;