Skip to content

Commit 4fd2a1a

Browse files
nyalldawsonnyalldawson
committed
Fix unit test data
1 parent 4eeac1c commit 4fd2a1a

File tree

4 files changed

+63
-64
lines changed

4 files changed

+63
-64
lines changed

‎python/plugins/processing/tests/testdata/expected/extract_by_extent.gfs

100755100644
Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
<GeometryType>3</GeometryType>
77
<SRSName>EPSG:4326</SRSName>
88
<DatasetSpecificInfo>
9-
<FeatureCount>3</FeatureCount>
9+
<FeatureCount>2</FeatureCount>
1010
<ExtentXMin>-1.00000</ExtentXMin>
11-
<ExtentXMax>10.00000</ExtentXMax>
11+
<ExtentXMax>6.00000</ExtentXMax>
1212
<ExtentYMin>-3.00000</ExtentYMin>
1313
<ExtentYMax>3.00000</ExtentYMax>
1414
</DatasetSpecificInfo>
@@ -26,8 +26,7 @@
2626
<PropertyDefn>
2727
<Name>floatval</Name>
2828
<ElementPath>floatval</ElementPath>
29-
<Type>String</Type>
30-
<Width>18</Width>
29+
<Type>Real</Type>
3130
</PropertyDefn>
3231
</GMLFeatureClass>
3332
</GMLFeatureClassList>

‎python/plugins/processing/tests/testdata/expected/extract_by_extent.gml

100755100644
Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
2-
<ogr:FeatureCollection
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation=""
5-
xmlns:ogr="http://ogr.maptools.org/"
6-
xmlns:gml="http://www.opengis.net/gml">
7-
<gml:boundedBy>
8-
<gml:Box>
9-
<gml:coord><gml:X>-1</gml:X><gml:Y>-3</gml:Y></gml:coord>
10-
<gml:coord><gml:X>6</gml:X><gml:Y>3</gml:Y></gml:coord>
11-
</gml:Box>
12-
</gml:boundedBy>
13-
14-
<gml:featureMember>
15-
<ogr:extract_by_extent fid="polys.0">
16-
<ogr:geometryProperty><gml:Polygon srsName="EPSG:4326"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>-1,-1 -1,3 3,3 3,2 2,2 2,-1 -1,-1</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometryProperty>
17-
<ogr:name>aaaaa</ogr:name>
18-
<ogr:intval>33</ogr:intval>
19-
<ogr:floatval>44.123456</ogr:floatval>
20-
</ogr:extract_by_extent>
21-
</gml:featureMember>
22-
<gml:featureMember>
23-
<ogr:extract_by_extent fid="polys.5">
24-
<ogr:geometryProperty><gml:Polygon srsName="EPSG:4326"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>3,2 6,1 6,-3 2,-1 2,2 3,2</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometryProperty>
25-
<ogr:name>elim</ogr:name>
26-
<ogr:intval>2</ogr:intval>
27-
<ogr:floatval>3.33</ogr:floatval>
28-
</ogr:extract_by_extent>
29-
</gml:featureMember>
30-
</ogr:FeatureCollection>
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<ogr:FeatureCollection
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation=""
5+
xmlns:ogr="http://ogr.maptools.org/"
6+
xmlns:gml="http://www.opengis.net/gml">
7+
<gml:boundedBy>
8+
<gml:Box>
9+
<gml:coord><gml:X>-1</gml:X><gml:Y>-3</gml:Y></gml:coord>
10+
<gml:coord><gml:X>6</gml:X><gml:Y>3</gml:Y></gml:coord>
11+
</gml:Box>
12+
</gml:boundedBy>
13+
14+
<gml:featureMember>
15+
<ogr:extract_by_extent fid="polys.0">
16+
<ogr:geometryProperty><gml:Polygon srsName="EPSG:4326"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>-1,-1 -1,3 3,3 3,2 2,2 2,-1 -1,-1</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometryProperty>
17+
<ogr:name>aaaaa</ogr:name>
18+
<ogr:intval>33</ogr:intval>
19+
<ogr:floatval>44.123456</ogr:floatval>
20+
</ogr:extract_by_extent>
21+
</gml:featureMember>
22+
<gml:featureMember>
23+
<ogr:extract_by_extent fid="polys.5">
24+
<ogr:geometryProperty><gml:Polygon srsName="EPSG:4326"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>3,2 6,1 6,-3 2,-1 2,2 3,2</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometryProperty>
25+
<ogr:name>elim</ogr:name>
26+
<ogr:intval>2</ogr:intval>
27+
<ogr:floatval>3.33</ogr:floatval>
28+
</ogr:extract_by_extent>
29+
</gml:featureMember>
30+
</ogr:FeatureCollection>

‎python/plugins/processing/tests/testdata/expected/extract_by_extent_clip.gfs

100755100644
File mode changed.

‎python/plugins/processing/tests/testdata/expected/extract_by_extent_clip.gml

100755100644
Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
2-
<ogr:FeatureCollection
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation=""
5-
xmlns:ogr="http://ogr.maptools.org/"
6-
xmlns:gml="http://www.opengis.net/gml">
7-
<gml:boundedBy>
8-
<gml:Box>
9-
<gml:coord><gml:X>-1</gml:X><gml:Y>-2.3875</gml:Y></gml:coord>
10-
<gml:coord><gml:X>4.775</gml:X><gml:Y>3</gml:Y></gml:coord>
11-
</gml:Box>
12-
</gml:boundedBy>
13-
14-
<gml:featureMember>
15-
<ogr:extract_by_extent_clip fid="polys.0">
16-
<ogr:geometryProperty><gml:MultiPolygon srsName="EPSG:4326"><gml:polygonMember><gml:Polygon><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>-1,-1 -1,3 3,3 3,2 2,2 2,-1 -1,-1</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></gml:polygonMember></gml:MultiPolygon></ogr:geometryProperty>
17-
<ogr:name>aaaaa</ogr:name>
18-
<ogr:intval>33</ogr:intval>
19-
<ogr:floatval>44.123456</ogr:floatval>
20-
</ogr:extract_by_extent_clip>
21-
</gml:featureMember>
22-
<gml:featureMember>
23-
<ogr:extract_by_extent_clip fid="polys.5">
24-
<ogr:geometryProperty><gml:MultiPolygon srsName="EPSG:4326"><gml:polygonMember><gml:Polygon><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>3,2 4.775,1.40833333333333 4.775,-2.3875 2,-1 2,2 3,2</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></gml:polygonMember></gml:MultiPolygon></ogr:geometryProperty>
25-
<ogr:name>elim</ogr:name>
26-
<ogr:intval>2</ogr:intval>
27-
<ogr:floatval>3.33</ogr:floatval>
28-
</ogr:extract_by_extent_clip>
29-
</gml:featureMember>
30-
</ogr:FeatureCollection>
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<ogr:FeatureCollection
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation=""
5+
xmlns:ogr="http://ogr.maptools.org/"
6+
xmlns:gml="http://www.opengis.net/gml">
7+
<gml:boundedBy>
8+
<gml:Box>
9+
<gml:coord><gml:X>-1</gml:X><gml:Y>-2.3875</gml:Y></gml:coord>
10+
<gml:coord><gml:X>4.775</gml:X><gml:Y>3</gml:Y></gml:coord>
11+
</gml:Box>
12+
</gml:boundedBy>
13+
14+
<gml:featureMember>
15+
<ogr:extract_by_extent_clip fid="polys.0">
16+
<ogr:geometryProperty><gml:MultiPolygon srsName="EPSG:4326"><gml:polygonMember><gml:Polygon><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>-1,-1 -1,3 3,3 3,2 2,2 2,-1 -1,-1</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></gml:polygonMember></gml:MultiPolygon></ogr:geometryProperty>
17+
<ogr:name>aaaaa</ogr:name>
18+
<ogr:intval>33</ogr:intval>
19+
<ogr:floatval>44.123456</ogr:floatval>
20+
</ogr:extract_by_extent_clip>
21+
</gml:featureMember>
22+
<gml:featureMember>
23+
<ogr:extract_by_extent_clip fid="polys.5">
24+
<ogr:geometryProperty><gml:MultiPolygon srsName="EPSG:4326"><gml:polygonMember><gml:Polygon><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>3,2 4.775,1.40833333333333 4.775,-2.3875 2,-1 2,2 3,2</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></gml:polygonMember></gml:MultiPolygon></ogr:geometryProperty>
25+
<ogr:name>elim</ogr:name>
26+
<ogr:intval>2</ogr:intval>
27+
<ogr:floatval>3.33</ogr:floatval>
28+
</ogr:extract_by_extent_clip>
29+
</gml:featureMember>
30+
</ogr:FeatureCollection>

0 commit comments

Comments
 (0)