Fix wfs features not adding to spatial index

nyalldawson · nyalldawson · commit 05c07f2bf7f7 · 2015-02-18T17:35:47.000+11:00
diff --git a/src/providers/wfs/qgswfsprovider.cpp b/src/providers/wfs/qgswfsprovider.cpp
@@ -1179,8 +1179,6 @@ int QgsWFSProvider::getFeaturesFromGML2( const QDomElement& wfsCollectionElement
   QDomNode currentAttributeChild;
   QDomElement currentAttributeElement;
   QgsFeature* f = 0;
-  unsigned char* wkb = 0;
-  int wkbSize = 0;
   mFeatureCount = 0;
 
   for ( int i = 0; i < featureTypeNodeList.size(); ++i )
@@ -1219,7 +1217,7 @@ int QgsWFSProvider::getFeaturesFromGML2( const QDomElement& wfsCollectionElement
       }
       currentAttributeChild = currentAttributeChild.nextSibling();
     }
-    if ( wkb && wkbSize > 0 )
+    if ( f->geometry() )
     {
       //insert bbox and pointer to feature into search tree
       mSpatialIndex->insertFeature( *f );

Original file line number	Diff line number	Diff line change
`@@ -1179,8 +1179,6 @@ int QgsWFSProvider::getFeaturesFromGML2( const QDomElement& wfsCollectionElement`
`1179`	`1179`	`QDomNode currentAttributeChild;`
`1180`	`1180`	`QDomElement currentAttributeElement;`
`1181`	`1181`	`QgsFeature* f = 0;`
`1182`		`- unsigned char* wkb = 0;`
`1183`		`- int wkbSize = 0;`
`1184`	`1182`	`mFeatureCount = 0;`
`1185`	`1183`
`1186`	`1184`	`for ( int i = 0; i < featureTypeNodeList.size(); ++i )`
`@@ -1219,7 +1217,7 @@ int QgsWFSProvider::getFeaturesFromGML2( const QDomElement& wfsCollectionElement`
`1219`	`1217`	`}`
`1220`	`1218`	`currentAttributeChild = currentAttributeChild.nextSibling();`
`1221`	`1219`	`}`
`1222`		`- if ( wkb && wkbSize > 0 )`
	`1220`	`+ if ( f->geometry() )`
`1223`	`1221`	`{`
`1224`	`1222`	`//insert bbox and pointer to feature into search tree`
`1225`	`1223`	`mSpatialIndex->insertFeature( *f );`