Fix QgsVectorLayer::updateFeature cannot add geometry to feature

with no existing geometry Fixes #17678
qgis · Jan 4, 2018 · 71cdb8c · 71cdb8c
1 parent 5ecb560
commit 71cdb8c
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -985,7 +985,7 @@ bool QgsVectorLayer::updateFeature( const QgsFeature &updatedFeature, bool skipD
     bool hasChanged = false;
     bool hasError = false;
 
-    if ( updatedFeature.hasGeometry() && currentFeature.hasGeometry() && !updatedFeature.geometry().isGeosEqual( currentFeature.geometry() ) )
+    if ( ( updatedFeature.hasGeometry() || currentFeature.hasGeometry() ) && !updatedFeature.geometry().isGeosEqual( currentFeature.geometry() ) )
     {
       if ( changeGeometry( updatedFeature.id(), updatedFeature.geometry(), true ) )
       {

diff --git a/tests/src/python/test_qgsvectorlayer.py b/tests/src/python/test_qgsvectorlayer.py
@@ -746,6 +746,29 @@ def testUpdateFeature(self):
         self.assertEqual(new_feature.attributes(), ['new',321])
         self.assertEqual(new_feature.geometry().asPoint(), QgsPointXY(-200, -200))
 
+        # add feature with no geometry
+        f6 = QgsFeature()
+        f6.setAttributes(["test6", 555])
+        self.assertTrue(layer.dataProvider().addFeatures([f6]))
+        features = [f for f in layer.getFeatures()]
+
+        # update feature with no geometry -> have geometry
+        f = features[-1]
+        f.setGeometry(QgsGeometry.fromPointXY(QgsPointXY(-350, -250)))
+        self.assertTrue(layer.updateFeature(f))
+        new_feature = next(layer.getFeatures(QgsFeatureRequest(f.id())))
+        self.assertEqual(new_feature.attributes(), ['test6', 555])
+        self.assertTrue(new_feature.hasGeometry())
+        self.assertEqual(new_feature.geometry().asPoint(), QgsPointXY(-350, -250))
+
+        # update feature from geometry -> no geometry
+        f = features[1]
+        f.clearGeometry()
+        self.assertTrue(layer.updateFeature(f))
+        new_feature = next(layer.getFeatures(QgsFeatureRequest(f.id())))
+        self.assertEqual(new_feature.attributes(), ['test2', 457])
+        self.assertFalse(new_feature.hasGeometry())
+
     # ADD ATTRIBUTE
 
     def test_AddAttribute(self):