fix #29630 spatialindex for NaN points

PeterPetrik · PeterPetrik · commit c2042a2ee3dd · 2019-05-30T09:30:04.000+02:00
diff --git a/src/core/qgspointlocator.cpp b/src/core/qgspointlocator.cpp
@@ -668,13 +668,17 @@ bool QgsPointLocator::rebuildIndex( int maxFeaturesToIndex )
       }
     }
 
-    SpatialIndex::Region r( rect2region( f.geometry().boundingBox() ) );
-    dataList << new RTree::Data( 0, nullptr, r, f.id() );
+    const QgsRectangle bbox = f.geometry().boundingBox();
+    if ( bbox.isFinite() )
+    {
+      SpatialIndex::Region r( rect2region( bbox ) );
+      dataList << new RTree::Data( 0, nullptr, r, f.id() );
 
-    if ( mGeoms.contains( f.id() ) )
-      delete mGeoms.take( f.id() );
-    mGeoms[f.id()] = new QgsGeometry( f.geometry() );
-    ++indexedCount;
+      if ( mGeoms.contains( f.id() ) )
+        delete mGeoms.take( f.id() );
+      mGeoms[f.id()] = new QgsGeometry( f.geometry() );
+      ++indexedCount;
+    }
 
     if ( maxFeaturesToIndex != -1 && indexedCount > maxFeaturesToIndex )
     {
@@ -777,8 +781,8 @@ void QgsPointLocator::onFeatureAdded( QgsFeatureId fid )
       }
     }
 
-    QgsRectangle bbox = f.geometry().boundingBox();
-    if ( !bbox.isNull() )
+    const QgsRectangle bbox = f.geometry().boundingBox();
+    if ( bbox.isFinite() )
     {
       SpatialIndex::Region r( rect2region( bbox ) );
       mRTree->insertData( 0, nullptr, r, f.id() );
diff --git a/src/core/qgsspatialindex.cpp b/src/core/qgsspatialindex.cpp
@@ -379,6 +379,10 @@ bool QgsSpatialIndex::featureInfo( const QgsFeature &f, QgsRectangle &rect, QgsF
 
   id = f.id();
   rect = f.geometry().boundingBox();
+
+  if ( !rect.isFinite() )
+    return false;
+
   return true;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -668,13 +668,17 @@ bool QgsPointLocator::rebuildIndex( int maxFeaturesToIndex )`
`668`	`668`	`}`
`669`	`669`	`}`
`670`	`670`
`671`		`- SpatialIndex::Region r( rect2region( f.geometry().boundingBox() ) );`
`672`		`- dataList << new RTree::Data( 0, nullptr, r, f.id() );`
	`671`	`+ const QgsRectangle bbox = f.geometry().boundingBox();`
	`672`	`+ if ( bbox.isFinite() )`
	`673`	`+ {`
	`674`	`+ SpatialIndex::Region r( rect2region( bbox ) );`
	`675`	`+ dataList << new RTree::Data( 0, nullptr, r, f.id() );`
`673`	`676`
`674`		`- if ( mGeoms.contains( f.id() ) )`
`675`		`- delete mGeoms.take( f.id() );`
`676`		`- mGeoms[f.id()] = new QgsGeometry( f.geometry() );`
`677`		`- ++indexedCount;`
	`677`	`+ if ( mGeoms.contains( f.id() ) )`
	`678`	`+ delete mGeoms.take( f.id() );`
	`679`	`+ mGeoms[f.id()] = new QgsGeometry( f.geometry() );`
	`680`	`+ ++indexedCount;`
	`681`	`+ }`
`678`	`682`
`679`	`683`	`if ( maxFeaturesToIndex != -1 && indexedCount > maxFeaturesToIndex )`
`680`	`684`	`{`
`@@ -777,8 +781,8 @@ void QgsPointLocator::onFeatureAdded( QgsFeatureId fid )`
`777`	`781`	`}`
`778`	`782`	`}`
`779`	`783`
`780`		`- QgsRectangle bbox = f.geometry().boundingBox();`
`781`		`- if ( !bbox.isNull() )`
	`784`	`+ const QgsRectangle bbox = f.geometry().boundingBox();`
	`785`	`+ if ( bbox.isFinite() )`
`782`	`786`	`{`
`783`	`787`	`SpatialIndex::Region r( rect2region( bbox ) );`
`784`	`788`	`mRTree->insertData( 0, nullptr, r, f.id() );`
Original file line number	Diff line number	Diff line change
`@@ -379,6 +379,10 @@ bool QgsSpatialIndex::featureInfo( const QgsFeature &f, QgsRectangle &rect, QgsF`
`379`	`379`
`380`	`380`	`id = f.id();`
`381`	`381`	`rect = f.geometry().boundingBox();`
	`382`	`+`
	`383`	`+ if ( !rect.isFinite() )`
	`384`	`+ return false;`
	`385`	`+`
`382`	`386`	`return true;`
`383`	`387`	`}`
`384`	`388`