#8725-R: New vector provider capability for topological simplification

qgis · Jan 15, 2014 · f37b056 · f37b056
1 parent 3b6ed3b
commit f37b056
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/src/core/qgsvectordataprovider.cpp b/src/core/qgsvectordataprovider.cpp
@@ -200,6 +200,12 @@ QString QgsVectorDataProvider::capabilitiesString() const
     QgsDebugMsg( "Capability: Simplify Geometries before fetch the feature" );
   }
 
+  if ( abilities & QgsVectorDataProvider::SimplifyGeometriesWithTopologicalValidation )
+  {
+    abilitiesList += tr( "Simplify Geometries with topological validation" );
+    QgsDebugMsg( "Capability: Simplify Geometries before fetch the feature ensuring that the result is a valid geometry" );
+  }
+
   return abilitiesList.join( ", " );
 
 }

diff --git a/src/core/qgsvectordataprovider.h b/src/core/qgsvectordataprovider.h
@@ -88,6 +88,8 @@ class CORE_EXPORT QgsVectorDataProvider : public QgsDataProvider
       SelectEncoding =               1 << 13,
       /** supports simplification of geometries on provider side according to a distance tolerance */
       SimplifyGeometries =           1 << 14,
+      /** supports topological simplification of geometries on provider side according to a distance tolerance */
+      SimplifyGeometriesWithTopologicalValidation = 1 << 15,
     };
 
     /** bitmask of all provider's editing capabilities */

diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp
@@ -1495,7 +1495,7 @@ int QgsOgrProvider::capabilities() const
     }
 
     // supports geometry simplification on provider side
-    ability |= QgsVectorDataProvider::SimplifyGeometries;
+    ability |= ( QgsVectorDataProvider::SimplifyGeometries | QgsVectorDataProvider::SimplifyGeometriesWithTopologicalValidation );
   }
 
   return ability;

diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -994,7 +994,7 @@ bool QgsPostgresProvider::hasSufficientPermsAndCapabilities()
   }
 
   // supports geometry simplification on provider side
-  mEnabledCapabilities |= QgsVectorDataProvider::SimplifyGeometries;
+  mEnabledCapabilities |= ( QgsVectorDataProvider::SimplifyGeometries | QgsVectorDataProvider::SimplifyGeometriesWithTopologicalValidation );
 
   return true;
 }