Applied patch provided by Adrien to fix problem where attributes where not copied for modified features

mhugent · mhugent · commit 6b5d9d6523c6 · 2008-06-09T17:12:09.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@8634 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -1273,10 +1273,30 @@ int QgsVectorLayer::featuresInRectangle(const QgsRect& searchRect, QList<QgsFeat
 	    }
 	  if(fetchAttributes)
 	    {
-	      QgsFeature tmpFeature;
-	      mDataProvider->getFeatureAtId(changedIt.key(), tmpFeature, false, mDataProvider->allAttributesList());
-	      newFeature.setAttributeMap(tmpFeature.attributeMap());
-	      
+	      if(changedIt.key()<0)
+		{
+		  //The feature is in mAddedFeature's list because its id<0
+		  bool findMyFeature = false;
+		  for (QgsFeatureList::iterator iter = mAddedFeatures.begin(); iter != mAddedFeatures.end(); ++iter)
+		    {
+		      if(iter->featureId()==changedIt.key())
+			{
+			   findMyFeature = true;
+			   newFeature.setAttributeMap(iter->attributeMap());
+			   break;
+			}
+		    }
+		  if(!findMyFeature)
+		    {
+		      QgsLogger::warning("No attribute for the feature");
+		    }
+		}
+	      else
+		{
+		  QgsFeature tmpFeature;
+		  mDataProvider->getFeatureAtId(changedIt.key(), tmpFeature, false, mDataProvider->allAttributesList());
+		  newFeature.setAttributeMap(tmpFeature.attributeMap());
+		}
 	    }
 	  features.push_back(newFeature);
 	}
