Refresh feature after update

qgis · Sep 6, 2018 · c55196c · c55196c
1 parent 3557228
commit c55196c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/src/analysis/vector/geometry_checker/qgsfeaturepool.cpp b/src/analysis/vector/geometry_checker/qgsfeaturepool.cpp
@@ -89,13 +89,15 @@ void QgsFeaturePool::insertFeature( const QgsFeature &feature )
   mIndex.insertFeature( feature );
 }
 
-void QgsFeaturePool::changeFeature( const QgsFeature &feature )
+void QgsFeaturePool::refreshCache( const QgsFeature &feature )
 {
   QgsReadWriteLocker locker( mIndexLock, QgsReadWriteLocker::Write );
   mFeatureCache.remove( feature.id() );
-  mFeatureCache.insert( feature.id(), new QgsFeature( feature ) );
   mIndex.deleteFeature( feature );
-  mIndex.insertFeature( feature );
+  locker.unlock();
+
+  QgsFeature tempFeature;
+  get( feature.id(), tempFeature );
 }
 
 void QgsFeaturePool::removeFeature( const QgsFeatureId featureId )

diff --git a/src/analysis/vector/geometry_checker/qgsfeaturepool.h b/src/analysis/vector/geometry_checker/qgsfeaturepool.h
@@ -117,7 +117,7 @@ class ANALYSIS_EXPORT QgsFeaturePool
      * Changes a feature in the cache and the spatial index.
      * To be used by implementations of ``updateFeature``.
      */
-    void changeFeature( const QgsFeature &feature );
+    void refreshCache( const QgsFeature &feature );
 
     /**
      * Removes a feature from the cache and the spatial index.

diff --git a/src/analysis/vector/geometry_checker/qgsvectordataproviderfeaturepool.cpp b/src/analysis/vector/geometry_checker/qgsvectordataproviderfeaturepool.cpp
@@ -110,7 +110,6 @@ void QgsVectorDataProviderFeaturePool::updateFeature( QgsFeature &feature )
   }
   changedAttributesMap.insert( feature.id(), attribMap );
 
-  removeFeature( origFeature.id() );
   runOnMainThread( [this, geometryMap, changedAttributesMap]()
   {
     QgsVectorLayer *lyr = layer();
@@ -121,7 +120,7 @@ void QgsVectorDataProviderFeaturePool::updateFeature( QgsFeature &feature )
     }
   } );
 
-  insertFeature( feature );
+  refreshCache( feature );
 }
 
 void QgsVectorDataProviderFeaturePool::deleteFeature( QgsFeatureId fid )