Skip to content

Commit 8f263b9

Browse files
author
timlinux
committed
Use rects for geometry tests rather than triangles
git-svn-id: http://svn.osgeo.org/qgis/trunk@8766 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent ea2f7ea commit 8f263b9

File tree

1 file changed

+28
-18
lines changed

1 file changed

+28
-18
lines changed

tests/src/core/testqgsgeometry.cpp

+28-18
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,18 @@ class TestQgsGeometry: public QObject
4343
void intersectionCheck();
4444
void unionCheck();
4545
private:
46-
QgsPoint mPoint1; /* +1 +A */
47-
QgsPoint mPoint2; /* / \ / \ */
48-
QgsPoint mPoint3; /* / X \ */
49-
QgsPoint mPointA; /* 2+---/-+3 \ */
50-
QgsPoint mPointB; /* B+-------+C */
51-
QgsPoint mPointC; /* */
52-
QgsPoint mPointD; /* +D */
46+
QgsPoint mPoint1;
47+
QgsPoint mPoint2;
48+
QgsPoint mPoint3;
49+
QgsPoint mPoint4;
50+
QgsPoint mPointA;
51+
QgsPoint mPointB;
52+
QgsPoint mPointC;
53+
QgsPoint mPointD;
54+
QgsPoint mPointW;
55+
QgsPoint mPointX;
56+
QgsPoint mPointY;
57+
QgsPoint mPointZ;
5358
QgsPolyline mPolylineA;
5459
QgsPolyline mPolylineB;
5560
QgsPolyline mPolylineC;
@@ -69,21 +74,26 @@ void TestQgsGeometry::init()
6974
//
7075
// Reset / reinitialise the geometries before each test is run
7176
//
72-
mPoint1 = QgsPoint(20.0,10.0); /* +1 +A */
73-
mPoint2 = QgsPoint(10.0,30.0); /* / \ / \ */
74-
mPoint3 = QgsPoint(30.0,30.0); /* / X \ */
75-
mPointA = QgsPoint(40.0,10.0); /* 2+---/-+3 \ */
76-
mPointB = QgsPoint(20.0,40.0); /* B+-------+C */
77-
mPointC = QgsPoint(50.0,40.0); /* */
78-
mPointD = QgsPoint(20.0,60.0); /* */
79-
80-
mPolylineA << mPoint1 << mPoint2 << mPoint3 << mPoint1;
77+
mPoint1 = QgsPoint(20.0,20.0);
78+
mPoint2 = QgsPoint(80.0,20.0);
79+
mPoint3 = QgsPoint(80.0,80.0);
80+
mPoint4 = QgsPoint(20.0,80.0);
81+
mPointA = QgsPoint(40.0,40.0);
82+
mPointB = QgsPoint(100.0,40.0);
83+
mPointC = QgsPoint(100.0,100.0);
84+
mPointD = QgsPoint(40.0,100.0);
85+
mPointW = QgsPoint(1000.0,1000.0);
86+
mPointX = QgsPoint(1040.0,1000.0);
87+
mPointY = QgsPoint(1040.0,1040.0);
88+
mPointZ = QgsPoint(1000.0,1040.0);
89+
90+
mPolylineA << mPoint1 << mPoint2 << mPoint3 << mPoint4 << mPoint1;
8191
mPolygonA << mPolylineA;
8292
//Polygon B intersects Polygon A
83-
mPolylineB << mPointA << mPointB << mPointC << mPointA;
93+
mPolylineB << mPointA << mPointB << mPointC << mPointD << mPointA;
8494
mPolygonB << mPolylineB;
8595
// Polygon C should intersect no other polys
86-
mPolylineC << mPointD << mPointB << mPointC << mPointD;
96+
mPolylineC << mPointW << mPointX << mPointY << mPointZ << mPointW;
8797
mPolygonC << mPolylineC;
8898

8999
//polygon: first item of the list is outer ring,

0 commit comments

Comments
 (0)