OAPIF: avoid TestCapability(OLCFastFeatureCount) to cause a network a…

…ccess, as well as SetAttributeFilter(NULL)
gjanvier · Oct 7, 2019 · 503585c · 503585c
1 parent de3e736
commit 503585c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/autotest/ogr/ogr_oapif.py b/autotest/ogr/ogr_oapif.py
@@ -652,8 +652,9 @@ def test_ogr_opaif_get_feature_count_from_numberMatched():
                 {'Content-Type': 'application/geo+json'},
                 '{ "type": "FeatureCollection", "features": [], "numberMatched": 1234 }')
     with webserver.install_http_handler(handler):
-        assert lyr.TestCapability(ogr.OLCFastFeatureCount) == 1
+        assert lyr.TestCapability(ogr.OLCFastFeatureCount) == 0 # Cannot know yet
         assert lyr.GetFeatureCount() == 1234
+        assert lyr.TestCapability(ogr.OLCFastFeatureCount) == 1
 
 
 ###############################################################################
@@ -674,6 +675,7 @@ def test_ogr_opaif_attribute_filter():
     with webserver.install_http_handler(handler):
         ds = ogr.Open('OAPIF:http://localhost:%d/oapif' % gdaltest.webserver_port)
     lyr = ds.GetLayer(0)
+    lyr.SetAttributeFilter(None) # should not cause network request
 
     handler = webserver.SequentialHandler()
     handler.add('GET', '/oapif/collections/foo/items?limit=10', 200,

diff --git a/gdal/ogr/ogrsf_frmts/wfs/ogroapifdriver.cpp b/gdal/ogr/ogrsf_frmts/wfs/ogroapifdriver.cpp
@@ -1627,6 +1627,9 @@ void OGROAPIFLayer::GetQueriableAttributes()
 OGRErr OGROAPIFLayer::SetAttributeFilter( const char *pszQuery )
 
 {
+    if( m_poAttrQuery == nullptr && pszQuery == nullptr )
+        return OGRERR_NONE;
+
     if( !m_bFeatureDefnEstablished )
         EstablishFeatureDefn();
 
@@ -1669,7 +1672,6 @@ int OGROAPIFLayer::TestCapability(const char* pszCap)
 {
     if( EQUAL(pszCap, OLCFastFeatureCount) )
     {
-        GetLayerDefn();
         return m_nTotalFeatureCount >= 0 &&
                m_poFilterGeom == nullptr && m_poAttrQuery == nullptr;
     }