@@ -43,13 +43,18 @@ class TestQgsGeometry: public QObject
43
43
void intersectionCheck ();
44
44
void unionCheck ();
45
45
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 ;
53
58
QgsPolyline mPolylineA ;
54
59
QgsPolyline mPolylineB ;
55
60
QgsPolyline mPolylineC ;
@@ -69,21 +74,26 @@ void TestQgsGeometry::init()
69
74
//
70
75
// Reset / reinitialise the geometries before each test is run
71
76
//
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 ;
81
91
mPolygonA << mPolylineA ;
82
92
// Polygon B intersects Polygon A
83
- mPolylineB << mPointA << mPointB << mPointC << mPointA ;
93
+ mPolylineB << mPointA << mPointB << mPointC << mPointD << mPointA ;
84
94
mPolygonB << mPolylineB ;
85
95
// Polygon C should intersect no other polys
86
- mPolylineC << mPointD << mPointB << mPointC << mPointD ;
96
+ mPolylineC << mPointW << mPointX << mPointY << mPointZ << mPointW ;
87
97
mPolygonC << mPolylineC ;
88
98
89
99
// polygon: first item of the list is outer ring,
0 commit comments