[OGR] Followup: Add orig_ogc_fid as last field to avoid changing field order

manisandro · manisandro · commit cf23d56aef0b · 2017-09-25T13:19:09.000+02:00
diff --git a/src/providers/ogr/qgsogrfeatureiterator.cpp b/src/providers/ogr/qgsogrfeatureiterator.cpp
@@ -346,7 +346,12 @@ bool QgsOgrFeatureIterator::readFeature( OGRFeatureH fet, QgsFeature &feature )
 {
   if ( mOrigFidAdded )
   {
-    feature.setId( OGR_F_GetFieldAsInteger64( fet, 0 ) );
+    OGRFeatureDefnH fdef = OGR_L_GetLayerDefn( ogrLayer );
+    int lastField = OGR_FD_GetFieldCount( fdef ) - 1;
+    if ( lastField >= 0 )
+      feature.setId( OGR_F_GetFieldAsInteger64( fet, lastField ) );
+    else
+      feature.setId( OGR_F_GetFID( fet ) );
   }
   else
   {

Original file line number	Diff line number	Diff line change
`@@ -346,7 +346,12 @@ bool QgsOgrFeatureIterator::readFeature( OGRFeatureH fet, QgsFeature &feature )`
`346`	`346`	`{`
`347`	`347`	`if ( mOrigFidAdded )`
`348`	`348`	`{`
`349`		`- feature.setId( OGR_F_GetFieldAsInteger64( fet, 0 ) );`
	`349`	`+ OGRFeatureDefnH fdef = OGR_L_GetLayerDefn( ogrLayer );`
	`350`	`+ int lastField = OGR_FD_GetFieldCount( fdef ) - 1;`
	`351`	`+ if ( lastField >= 0 )`
	`352`	`+ feature.setId( OGR_F_GetFieldAsInteger64( fet, lastField ) );`
	`353`	`+ else`
	`354`	`+ feature.setId( OGR_F_GetFID( fet ) );`
`350`	`355`	`}`
`351`	`356`	`else`
`352`	`357`	`{`