[OGR] fix feature count issue for OSM datasets (fixes #16402) (#4322)

nirvn · web-flow · commit 25d9936df8ab · 2017-04-06T16:04:48.000+07:00
diff --git a/python/core/qgsvectordataprovider.sip b/python/core/qgsvectordataprovider.sip
@@ -57,6 +57,17 @@ class QgsVectorDataProvider : QgsDataProvider
     /** Bitmask of all provider's editing capabilities */
     static const int EditingCapabilities;
 
+    /**
+     * Enumeration of feature count states
+     */
+    enum FeatureCountState
+    {
+      //! Feature count not yet computed
+      Uncounted = -2,
+      //! Provider returned an unknown feature count
+      UnknownCount = -1,
+    };
+
     /**
      * Constructor of the vector provider
      * @param uri  uniform resource locator (URI) for a dataset
diff --git a/src/core/qgsvectordataprovider.h b/src/core/qgsvectordataprovider.h
@@ -112,6 +112,17 @@ class CORE_EXPORT QgsVectorDataProvider : public QgsDataProvider
                                            ChangeAttributeValues | ChangeGeometries | AddAttributes | DeleteAttributes |
                                            RenameAttributes;
 
+    /**
+     * Enumeration of feature count states
+     */
+    enum FeatureCountState
+    {
+      //! Feature count not yet computed
+      Uncounted = -2,
+      //! Provider returned an unknown feature count
+      UnknownCount = -1,
+    };
+
     /**
      * Constructor of the vector provider
      * \param uri  uniform resource locator (URI) for a dataset
diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp
@@ -378,7 +378,7 @@ QgsOgrProvider::QgsOgrProvider( QString const &uri )
   , ogrDriver( nullptr )
   , mValid( false )
   , mOGRGeomType( wkbUnknown )
-  , mFeaturesCounted( -1 )
+  , mFeaturesCounted( QgsVectorDataProvider::Uncounted )
   , mWriteAccess( false )
   , mWriteAccessPossible( false )
   , mDynamicWriteAccess( false )
@@ -450,7 +450,7 @@ bool QgsOgrProvider::setSubsetString( const QString &theSQL, bool updateFeatureC
   if ( !ogrDataSource )
     return false;
 
-  if ( theSQL == mSubsetString && mFeaturesCounted >= 0 )
+  if ( theSQL == mSubsetString && mFeaturesCounted != QgsVectorDataProvider::Uncounted )
     return true;
 
   OGRLayerH prevLayer = ogrLayer;
@@ -3300,7 +3300,7 @@ void QgsOgrProvider::recalculateFeatureCount()
 {
   if ( !ogrLayer )
   {
-    mFeaturesCounted = 0;
+    mFeaturesCounted = QgsVectorDataProvider::Uncounted;
     return;
   }
 
@@ -3316,6 +3316,10 @@ void QgsOgrProvider::recalculateFeatureCount()
   if ( mOgrGeometryTypeFilter == wkbUnknown )
   {
     mFeaturesCounted = OGR_L_GetFeatureCount( ogrLayer, true );
+    if ( mFeaturesCounted == -1 )
+    {
+      mFeaturesCounted = QgsVectorDataProvider::UnknownCount;
+    }
   }
   else
   {

Original file line number	Diff line number	Diff line change
`@@ -378,7 +378,7 @@ QgsOgrProvider::QgsOgrProvider( QString const &uri )`
`378`	`378`	`, ogrDriver( nullptr )`
`379`	`379`	`, mValid( false )`
`380`	`380`	`, mOGRGeomType( wkbUnknown )`
`381`		`- , mFeaturesCounted( -1 )`
	`381`	`+ , mFeaturesCounted( QgsVectorDataProvider::Uncounted )`
`382`	`382`	`, mWriteAccess( false )`
`383`	`383`	`, mWriteAccessPossible( false )`
`384`	`384`	`, mDynamicWriteAccess( false )`
`@@ -450,7 +450,7 @@ bool QgsOgrProvider::setSubsetString( const QString &theSQL, bool updateFeatureC`
`450`	`450`	`if ( !ogrDataSource )`
`451`	`451`	`return false;`
`452`	`452`
`453`		`- if ( theSQL == mSubsetString && mFeaturesCounted >= 0 )`
	`453`	`+ if ( theSQL == mSubsetString && mFeaturesCounted != QgsVectorDataProvider::Uncounted )`
`454`	`454`	`return true;`
`455`	`455`
`456`	`456`	`OGRLayerH prevLayer = ogrLayer;`
`@@ -3300,7 +3300,7 @@ void QgsOgrProvider::recalculateFeatureCount()`
`3300`	`3300`	`{`
`3301`	`3301`	`if ( !ogrLayer )`
`3302`	`3302`	`{`
`3303`		`- mFeaturesCounted = 0;`
	`3303`	`+ mFeaturesCounted = QgsVectorDataProvider::Uncounted;`
`3304`	`3304`	`return;`
`3305`	`3305`	`}`
`3306`	`3306`
`@@ -3316,6 +3316,10 @@ void QgsOgrProvider::recalculateFeatureCount()`
`3316`	`3316`	`if ( mOgrGeometryTypeFilter == wkbUnknown )`
`3317`	`3317`	`{`
`3318`	`3318`	`mFeaturesCounted = OGR_L_GetFeatureCount( ogrLayer, true );`
	`3319`	`+ if ( mFeaturesCounted == -1 )`
	`3320`	`+ {`
	`3321`	`+ mFeaturesCounted = QgsVectorDataProvider::UnknownCount;`
	`3322`	`+ }`
`3319`	`3323`	`}`
`3320`	`3324`	`else`
`3321`	`3325`	`{`