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

Fixed selection bug that resulted in selection of more features than those

Browse Source 
under the selection rectangle. Selection of features from a multipart polygon
layer is still unacceptably slow.


git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@2606 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
gsherman 2005-01-09 17:23:05 +00:00
parent 672627f33b
commit 7661e81582
1 changed files with 4 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
providers/ogr/qgsshapefileprovider.cpp
View File

@ -283,115 +283,43 @@ QgsFeature *QgsShapeFileProvider::getNextFeature(bool fetchAttributes)
QgsFeature *f = 0; QgsFeature *f = 0;
if(valid){ if(valid){
//std::cerr << "getting next feature\n";
// skip features without geometry
OGRFeature *fet; OGRFeature *fet;
//TODO Following ifndef can be removed once WIN32 GEOS support
// is fixed
#ifndef NOWIN32GEOSXXX
// create the geos geometry factory
// std::cerr << "Creating the GEOS geometry factory\n";
// geos::GeometryFactory *gf = new geos::GeometryFactory();
// assert(gf!=0);
// create the reader
// std::cerr << "Creating the wktReader\n";
// geos::WKTReader *wktReader = new geos::WKTReader(gf);
// assert(wktReader !=0);
#endif
OGRGeometry *geom; OGRGeometry *geom;
// std::cerr << "Starting read of features\n";
while ((fet = ogrLayer->GetNextFeature()) != NULL) { while ((fet = ogrLayer->GetNextFeature()) != NULL) {
if (fet->GetGeometryRef()) if (fet->GetGeometryRef())
{ {
#ifdef QGISDEBUG
qWarning("Testing a geometry for intersection with geos");
#endif
if(mUseIntersect) if(mUseIntersect)
{ {
//TODO Following ifndef can be removed once WIN32 GEOS support
// is fixed
#ifndef NOWIN32GEOSXXX
// Test this geometry to see if it should be
// returned. This dies big time using the GDAL GEOS
// functionality so we implement our own logic using
// the geos library. The select functions has already
// narrowed the selection to those features with the MBR
// of the selection rectangle.
//
// get the feature geometry and create a geos geometry from it
// std::cerr << "Using geos intersect to filter features\n";
geom = fet->GetGeometryRef(); geom = fet->GetGeometryRef();
char *wkt = new char[2 * geom->WkbSize()]; char *wkt = new char[2 * geom->WkbSize()];
#ifdef QGISDEBUG
qWarning("before exportToWkt");
#endif
geom->exportToWkt(&wkt); geom->exportToWkt(&wkt);
#ifdef QGISDEBUG
qWarning("after exportToWkt");
#endif
//std::cerr << "Passing " << wkt << " to goes\n";
// std::cerr << "Creating geos geometry from wkt\n";
#ifdef QGISDEBUG
qWarning("before readWkt");
#endif
geos::Geometry *geosGeom = wktReader->read(wkt); geos::Geometry *geosGeom = wktReader->read(wkt);
#ifdef QGISDEBUG
qWarning("after readWkt");
#endif
assert(geosGeom != 0); assert(geosGeom != 0);
// std::cerr << "Geometry type of geos object is : " << geosGeom->getGeometryType() << std::endl; std::cerr << "Geometry type of geos object is : " << geosGeom->getGeometryType() << std::endl;
// get the selection rectangle and create a geos geometry from it // get the selection rectangle and create a geos geometry from it
char *sWkt = new char[2 * mSelectionRectangle->WkbSize()]; char *sWkt = new char[2 * mSelectionRectangle->WkbSize()];
mSelectionRectangle->exportToWkt(&sWkt); mSelectionRectangle->exportToWkt(&sWkt);
// std::cerr << "Passing " << sWkt << " to goes\n"; std::cerr << "Passing " << sWkt << " to goes\n";
geos::Geometry *geosRect = wktReader->read(sWkt); geos::Geometry *geosRect = wktReader->read(sWkt);
assert(geosRect != 0); assert(geosRect != 0);
// std::cerr << "About to apply intersects function\n"; std::cerr << "About to apply intersects function\n";
// test the geometry // test the geometry
#ifdef QGISDEBUG
// std::cerr << "Testing intersection using geos\n";
#endif
#ifdef QGISDEBUG
qWarning("before geos intersection test");
#endif
if(geosGeom->intersects(geosRect)) if(geosGeom->intersects(geosRect))
#ifdef QGISDEBUG
qWarning("after geos intersection test");
#endif
//if(geom->Overlaps(mSelectionRectangle))
{ {
// std::cerr << "Intersection found\n"; std::cerr << "Intersection found\n";
break; break;
#ifdef QGISDEBUG
qWarning("intersection test finished");
#endif
} }
// std::cerr << "Deleting objects used in geos intersect\n";
#ifndef WIN32
//XXX For some reason deleting these on win32 causes segfault //XXX For some reason deleting these on win32 causes segfault
//XXX Someday I'll figure out why... //XXX Someday I'll figure out why...
//delete[] wkt; //delete[] wkt;
//delete[] sWkt; //delete[] sWkt;
#endif
// delete geosGeom;
//delete geosRect;
#endif
} }
else else
{ {
break; break;
} }
#ifdef QGISDEBUG
qWarning("intersection test finished");
#endif
} }
} }
//TODO Following ifndef can be removed once WIN32 GEOS support
// is fixed
#ifndef NOWIN32GEOSXXX
// std::cerr << "Deleting geometry factory and wktReader\n";
#endif
if(fet){ if(fet){
geom = fet->GetGeometryRef(); geom = fet->GetGeometryRef();