import vector layer: do not change attribute map of the source feature,

brushtyler · brushtyler · commit 64d1c02f69ac · 2012-07-28T00:08:33.000+02:00
do not copy values of un-mapped attributes forward to the destination layer:

avoid features with dirty attribute maps being added to the buffer
diff --git a/src/core/qgsvectorlayerimport.cpp b/src/core/qgsvectorlayerimport.cpp
@@ -120,23 +120,21 @@ bool QgsVectorLayerImport::addFeature( QgsFeature& feat )
 {
   const QgsAttributeMap &attrs = feat.attributeMap();
 
-  QgsAttributeMap newAttrs;
+  QgsFeature newFeat;
+  newFeat.setGeometry( *feat.geometry() );
+
   for ( QgsAttributeMap::const_iterator it = attrs.begin(); it != attrs.end(); it++ )
   {
+    // add only mapped attributes (un-mapped ones are not present in the
+    // destination layer)
     if ( mOldToNewAttrIdx.contains( it.key() ) )
     {
       QgsDebugMsgLevel( QString( "moving field from pos %1 to %2" ).arg( it.key() ).arg( mOldToNewAttrIdx.value( it.key() ) ), 3 );
-      newAttrs.insert( mOldToNewAttrIdx.value( it.key() ), *it );
-    }
-    else
-    {
-      QgsDebugMsgLevel( QString( "added attr pos %1" ).arg( it.key() ), 3 );
-      newAttrs.insert( it.key(), *it );
+      newFeat.addAttribute( mOldToNewAttrIdx.value( it.key() ), *it );
     }
   }
-  feat.setAttributeMap( newAttrs );
 
-  mFeatureBuffer.append( feat );
+  mFeatureBuffer.append( newFeat );
 
   if ( mFeatureBuffer.count() >= FEATURE_BUFFER_SIZE )
   {

Original file line number	Diff line number	Diff line change
`@@ -120,23 +120,21 @@ bool QgsVectorLayerImport::addFeature( QgsFeature& feat )`
`120`	`120`	`{`
`121`	`121`	`const QgsAttributeMap &attrs = feat.attributeMap();`
`122`	`122`
`123`		`- QgsAttributeMap newAttrs;`
	`123`	`+ QgsFeature newFeat;`
	`124`	`+ newFeat.setGeometry( *feat.geometry() );`
	`125`	`+`
`124`	`126`	`for ( QgsAttributeMap::const_iterator it = attrs.begin(); it != attrs.end(); it++ )`
`125`	`127`	`{`
	`128`	`+ // add only mapped attributes (un-mapped ones are not present in the`
	`129`	`+ // destination layer)`
`126`	`130`	`if ( mOldToNewAttrIdx.contains( it.key() ) )`
`127`	`131`	`{`
`128`	`132`	`QgsDebugMsgLevel( QString( "moving field from pos %1 to %2" ).arg( it.key() ).arg( mOldToNewAttrIdx.value( it.key() ) ), 3 );`
`129`		`- newAttrs.insert( mOldToNewAttrIdx.value( it.key() ), *it );`
`130`		`- }`
`131`		`- else`
`132`		`- {`
`133`		`- QgsDebugMsgLevel( QString( "added attr pos %1" ).arg( it.key() ), 3 );`
`134`		`- newAttrs.insert( it.key(), *it );`
	`133`	`+ newFeat.addAttribute( mOldToNewAttrIdx.value( it.key() ), *it );`
`135`	`134`	`}`
`136`	`135`	`}`
`137`		`- feat.setAttributeMap( newAttrs );`
`138`	`136`
`139`		`- mFeatureBuffer.append( feat );`
	`137`	`+ mFeatureBuffer.append( newFeat );`
`140`	`138`
`141`	`139`	`if ( mFeatureBuffer.count() >= FEATURE_BUFFER_SIZE )`
`142`	`140`	`{`