sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a crash occuring with identify tool which was caused by GEOS throwing TopologyException.

Browse Source 
This exception might be thrown when GEOS has problems with calculating intersection.


git-svn-id: http://svn.osgeo.org/qgis/trunk@6071 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
wonder 2006-11-10 21:36:37 +00:00
parent da8d308b1a
commit 60f7822a6e
2 changed files with 34 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/core/qgsgeometry.cpp
View File

@ -2076,9 +2076,17 @@ bool QgsGeometry::intersects(QgsRect* r) const
rectwkt+="))"; rectwkt+="))";
geos::Geometry *geosRect = wktReader->read( qstrdup(rectwkt) ); geos::Geometry *geosRect = wktReader->read( qstrdup(rectwkt) );
if(geosGeom->intersects(geosRect)) try // geos might throw exception on error
{ {
returnval=true; if(geosGeom->intersects(geosRect))
{
returnval=true;
}
}
catch (geos::TopologyException* e)
{
QString error = e->toString().c_str();
QgsLogger::warning("GEOS: " + error);
} }
delete geosGeom; delete geosGeom;
@ -2121,9 +2129,17 @@ bool QgsGeometry::fast_intersects(const QgsRect* r) const
geos::WKTReader *wktReader = new geos::WKTReader(gf); geos::WKTReader *wktReader = new geos::WKTReader(gf);
geos::Geometry *geosRect = wktReader->read( qstrdup(rectwkt) ); geos::Geometry *geosRect = wktReader->read( qstrdup(rectwkt) );
if(geosGeom->intersects(geosRect)) try // geos might throw exception on error
{ {
returnval=true; if(geosGeom->intersects(geosRect))
{
returnval=true;
}
}
catch (geos::TopologyException* e)
{
QString error = e->toString().c_str();
QgsLogger::warning("GEOS: " + error);
} }
delete geosGeom; delete geosGeom;

15
src/providers/ogr/qgsogrprovider.cpp
View File

@ -423,7 +423,20 @@ QgsFeature *QgsOgrProvider::getNextFeature(bool fetchAttributes)
mSelectionRectangle->exportToWkt(&sWkt); mSelectionRectangle->exportToWkt(&sWkt);
geos::Geometry *geosRect = wktReader->read(sWkt); geos::Geometry *geosRect = wktReader->read(sWkt);
assert(geosRect != 0); assert(geosRect != 0);
if(geosGeom->intersects(geosRect)) bool intersection = false;
try // geos might throw exception on error
{
if(geosGeom->intersects(geosRect))
intersection = true;
}
catch (geos::TopologyException* e)
{
QString error = e->toString().c_str();
QgsLogger::warning("GEOS: " + error);
}
if (intersection)
{ {
QgsDebugMsg("intersection found"); QgsDebugMsg("intersection found");
delete[] sWkt; delete[] sWkt;