sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-17 00:09:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use _r GEOS API in geometry import test

Browse Source
This commit is contained in:
Martin Dobias 2014-09-14 16:41:23 +07:00
parent e4ab3f2aea
commit aafbc4ed5f
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tests/src/core/testqgsgeometryimport.cpp
View File

@ -114,10 +114,12 @@ void TestQgsGeometryImport::pointGeos()
QFETCH( double, x ); QFETCH( double, x );
QFETCH( double, y ); QFETCH( double, y );
GEOSCoordSequence *coord = GEOSCoordSeq_create( 1, 2 ); GEOSContextHandle_t geosctxt = QgsGeometry::getGEOSHandler();
GEOSCoordSeq_setX( coord, 0, x );
GEOSCoordSeq_setY( coord, 0, y ); GEOSCoordSequence *coord = GEOSCoordSeq_create_r( geosctxt, 1, 2 );
GEOSGeometry* geosPt = GEOSGeom_createPoint( coord ); GEOSCoordSeq_setX_r( geosctxt, coord, 0, x );
GEOSCoordSeq_setY_r( geosctxt, coord, 0, y );
GEOSGeometry* geosPt = GEOSGeom_createPoint_r( geosctxt, coord );
QgsGeometry geom; QgsGeometry geom;
geom.fromGeos( geosPt ); geom.fromGeos( geosPt );
@ -197,15 +199,17 @@ void TestQgsGeometryImport::linestringGeos()
{ {
QFETCH( QVariantList, line ); QFETCH( QVariantList, line );
GEOSContextHandle_t geosctxt = QgsGeometry::getGEOSHandler();
//create geos coord sequence first //create geos coord sequence first
GEOSCoordSequence *coord = GEOSCoordSeq_create( line.count(), 2 ); GEOSCoordSequence *coord = GEOSCoordSeq_create_r( geosctxt, line.count(), 2 );
for ( int i = 0; i < line.count(); i++ ) for ( int i = 0; i < line.count(); i++ )
{ {
QPointF pt = line.at( i ).toPointF(); QPointF pt = line.at( i ).toPointF();
GEOSCoordSeq_setX( coord, i, pt.x() ); GEOSCoordSeq_setX_r( geosctxt, coord, i, pt.x() );
GEOSCoordSeq_setY( coord, i, pt.y() ); GEOSCoordSeq_setY_r( geosctxt, coord, i, pt.y() );
} }
GEOSGeometry* geosLine = GEOSGeom_createLineString( coord ); GEOSGeometry* geosLine = GEOSGeom_createLineString_r( geosctxt, coord );
QgsGeometry geom; QgsGeometry geom;
geom.fromGeos( geosLine ); geom.fromGeos( geosLine );
QVERIFY( geom.wkbType() == QGis::WKBLineString ); QVERIFY( geom.wkbType() == QGis::WKBLineString );