Fix vertextool's geometry cache invalidation

Hugo Mercier · Hugo Mercier · commit 0b29ed68cb2c · 2018-12-20T15:20:10.000+01:00
The cache must be invalidated when the layer is deleted and also on dataChanged.
diff --git a/src/app/vertextool/qgsvertextool.cpp b/src/app/vertextool/qgsvertextool.cpp
@@ -984,7 +984,8 @@ QgsGeometry QgsVertexTool::cachedGeometry( const QgsVectorLayer *layer, QgsFeatu
   {
     connect( layer, &QgsVectorLayer::geometryChanged, this, &QgsVertexTool::onCachedGeometryChanged );
     connect( layer, &QgsVectorLayer::featureDeleted, this, &QgsVertexTool::onCachedGeometryDeleted );
-    // TODO: also clear cache when layer is deleted
+    connect( layer, &QgsVectorLayer::willBeDeleted, this, &QgsVertexTool::clearGeometryCache );
+    connect( layer, &QgsVectorLayer::dataChanged, this, &QgsVertexTool::clearGeometryCache );
   }
 
   QHash<QgsFeatureId, QgsGeometry> &layerCache = mCache[layer];
@@ -1003,6 +1004,12 @@ QgsGeometry QgsVertexTool::cachedGeometryForVertex( const Vertex &vertex )
   return cachedGeometry( vertex.layer, vertex.fid );
 }
 
+void QgsVertexTool::clearGeometryCache()
+{
+  const QgsVectorLayer *layer = qobject_cast<const QgsVectorLayer *>( sender() );
+  mCache.remove( layer );
+}
+
 void QgsVertexTool::onCachedGeometryChanged( QgsFeatureId fid, const QgsGeometry &geom )
 {
   QgsVectorLayer *layer = qobject_cast<QgsVectorLayer *>( sender() );
diff --git a/src/app/vertextool/qgsvertextool.h b/src/app/vertextool/qgsvertextool.h
@@ -97,6 +97,8 @@ class APP_EXPORT QgsVertexTool : public QgsMapToolAdvancedDigitizing
 
     void onCachedGeometryDeleted( QgsFeatureId fid );
 
+    void clearGeometryCache();
+
     void showVertexEditor();  //#spellok
 
     void deleteVertexEditorSelection();

Original file line number	Diff line number	Diff line change
`@@ -984,7 +984,8 @@ QgsGeometry QgsVertexTool::cachedGeometry( const QgsVectorLayer *layer, QgsFeatu`
`984`	`984`	`{`
`985`	`985`	`connect( layer, &QgsVectorLayer::geometryChanged, this, &QgsVertexTool::onCachedGeometryChanged );`
`986`	`986`	`connect( layer, &QgsVectorLayer::featureDeleted, this, &QgsVertexTool::onCachedGeometryDeleted );`
`987`		`- // TODO: also clear cache when layer is deleted`
	`987`	`+ connect( layer, &QgsVectorLayer::willBeDeleted, this, &QgsVertexTool::clearGeometryCache );`
	`988`	`+ connect( layer, &QgsVectorLayer::dataChanged, this, &QgsVertexTool::clearGeometryCache );`
`988`	`989`	`}`
`989`	`990`
`990`	`991`	`QHash<QgsFeatureId, QgsGeometry> &layerCache = mCache[layer];`
`@@ -1003,6 +1004,12 @@ QgsGeometry QgsVertexTool::cachedGeometryForVertex( const Vertex &vertex )`
`1003`	`1004`	`return cachedGeometry( vertex.layer, vertex.fid );`
`1004`	`1005`	`}`
`1005`	`1006`
	`1007`	`+void QgsVertexTool::clearGeometryCache()`
	`1008`	`+{`
	`1009`	`+ const QgsVectorLayer layer = qobject_cast<const QgsVectorLayer >( sender() );`
	`1010`	`+ mCache.remove( layer );`
	`1011`	`+}`
	`1012`	`+`
`1006`	`1013`	`void QgsVertexTool::onCachedGeometryChanged( QgsFeatureId fid, const QgsGeometry &geom )`
`1007`	`1014`	`{`
`1008`	`1015`	`QgsVectorLayer layer = qobject_cast<QgsVectorLayer >( sender() );`