[ArcGIS REST] fix fallback feature id value (followup to f32791e)

nirvn · web-flow · commit 060b3e3a54b7 · 2017-11-23T12:27:12.000+07:00
diff --git a/src/providers/arcgisrest/qgsafsshareddata.cpp b/src/providers/arcgisrest/qgsafsshareddata.cpp
@@ -86,7 +86,7 @@ bool QgsAfsSharedData::getFeature( QgsFeatureId id, QgsFeature &f, bool fetchGeo
   {
     QVariantMap featureData = featuresData[i].toMap();
     QgsFeature feature;
-    int objectId = startId + i;
+    int featureId = startId + i;
 
     // Set attributes
     if ( !fetchAttribIdx.isEmpty() )
@@ -99,14 +99,14 @@ bool QgsAfsSharedData::getFeature( QgsFeatureId id, QgsFeature &f, bool fetchGeo
         attributes[idx] = attributesData[mFields.at( idx ).name()];
         if ( mFields.at( idx ).name() == QStringLiteral( "OBJECTID" ) )
         {
-          objectId = attributesData[mFields.at( idx ).name()].toInt();
+          featureId = startId + objectIds.indexOf( attributesData[mFields.at( idx ).name()].toInt() );
         }
       }
       feature.setAttributes( attributes );
     }
 
     // Set FID
-    feature.setId( startId + objectIds.indexOf( objectId ) );
+    feature.setId( featureId );
 
     // Set geometry
     if ( fetchGeometry )

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ bool QgsAfsSharedData::getFeature( QgsFeatureId id, QgsFeature &f, bool fetchGeo`
`86`	`86`	`{`
`87`	`87`	`QVariantMap featureData = featuresData[i].toMap();`
`88`	`88`	`QgsFeature feature;`
`89`		`- int objectId = startId + i;`
	`89`	`+ int featureId = startId + i;`
`90`	`90`
`91`	`91`	`// Set attributes`
`92`	`92`	`if ( !fetchAttribIdx.isEmpty() )`
`@@ -99,14 +99,14 @@ bool QgsAfsSharedData::getFeature( QgsFeatureId id, QgsFeature &f, bool fetchGeo`
`99`	`99`	`attributes[idx] = attributesData[mFields.at( idx ).name()];`
`100`	`100`	`if ( mFields.at( idx ).name() == QStringLiteral( "OBJECTID" ) )`
`101`	`101`	`{`
`102`		`- objectId = attributesData[mFields.at( idx ).name()].toInt();`
	`102`	`+ featureId = startId + objectIds.indexOf( attributesData[mFields.at( idx ).name()].toInt() );`
`103`	`103`	`}`
`104`	`104`	`}`
`105`	`105`	`feature.setAttributes( attributes );`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`// Set FID`
`109`		`- feature.setId( startId + objectIds.indexOf( objectId ) );`
	`109`	`+ feature.setId( featureId );`
`110`	`110`
`111`	`111`	`// Set geometry`
`112`	`112`	`if ( fetchGeometry )`