Skip to content

Commit

Permalink
Fix processing tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@nyalldawson
nyalldawson committed Nov 7, 2016
1 parent 143c18d commit d783c73
Show file tree
Hide file tree
Showing 22 changed files with 107 additions and 302 deletions.
4 changes: 2 additions & 2 deletions python/plugins/processing/tests/testdata/expected/clip_lines_by_multipolygon.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
</gml:featureMember>
<gml:featureMember>
<ogr:clip_lines_by_multipolygon fid="lines.3">
<ogr:geometryProperty><gml:LineString srsName="EPSG:4326"><gml:coordinates>4,1 3,1</gml:coordinates></gml:LineString></ogr:geometryProperty>
<ogr:geometryProperty><gml:MultiLineString srsName="EPSG:4326"><gml:lineStringMember><gml:LineString><gml:coordinates>4,1 3,1</gml:coordinates></gml:LineString></gml:lineStringMember></gml:MultiLineString></ogr:geometryProperty>
</ogr:clip_lines_by_multipolygon>
</gml:featureMember>
<gml:featureMember>
<ogr:clip_lines_by_multipolygon fid="lines.0">
<ogr:geometryProperty><gml:LineString srsName="EPSG:4326"><gml:coordinates>7,2 8,2</gml:coordinates></gml:LineString></ogr:geometryProperty>
<ogr:geometryProperty><gml:MultiLineString srsName="EPSG:4326"><gml:lineStringMember><gml:LineString><gml:coordinates>7,2 8,2</gml:coordinates></gml:LineString></gml:lineStringMember></gml:MultiLineString></ogr:geometryProperty>
</ogr:clip_lines_by_multipolygon>
</gml:featureMember>
<gml:featureMember>
Expand Down
23 changes: 0 additions & 23 deletions python/plugins/processing/tests/testdata/expected/clip_lines_by_multipolygon.xsd
View file

This file was deleted.

2 changes: 2 additions & 0 deletions python/plugins/processing/tests/testdata/expected/clip_lines_by_polygon.gfs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
<GMLFeatureClass>
<Name>clip_lines_by_polygon</Name>
<ElementPath>clip_lines_by_polygon</ElementPath>
<!--MULTILINESTRING-->
<GeometryType>5</GeometryType>
<SRSName>EPSG:4326</SRSName>
<DatasetSpecificInfo>
<FeatureCount>2</FeatureCount>
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/tests/testdata/expected/clip_lines_by_polygon.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<gml:featureMember>
<ogr:clip_lines_by_polygon fid="lines2.0">
<ogr:geometryProperty><gml:LineString srsName="EPSG:4326"><gml:coordinates>0.776536312849161,2.179050279329609 4.049720670391062,1.334357541899442 5.70391061452514,-1.991620111731844 8.572346368715085,-2.220391061452514 8.565567160553801,-3.0</gml:coordinates></gml:LineString></ogr:geometryProperty>
<ogr:geometryProperty><gml:MultiLineString srsName="EPSG:4326"><gml:lineStringMember><gml:LineString><gml:coordinates>0.776536312849161,2.179050279329609 4.049720670391062,1.334357541899442 5.70391061452514,-1.991620111731844 8.572346368715085,-2.220391061452514 8.565567160553801,-3.0</gml:coordinates></gml:LineString></gml:lineStringMember></gml:MultiLineString></ogr:geometryProperty>
</ogr:clip_lines_by_polygon>
</gml:featureMember>
<gml:featureMember>
Expand Down
23 changes: 0 additions & 23 deletions python/plugins/processing/tests/testdata/expected/clip_lines_by_polygon.xsd
View file

This file was deleted.

1 change: 1 addition & 0 deletions python/plugins/processing/tests/testdata/expected/clip_multipolygons_by_polygons.gfs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<GMLFeatureClass>
<Name>clip_multipolygons_by_polygons</Name>
<ElementPath>clip_multipolygons_by_polygons</ElementPath>
<!--MULTIPOLYGON-->
<GeometryType>6</GeometryType>
<SRSName>EPSG:4326</SRSName>
<DatasetSpecificInfo>
Expand Down
43 changes: 0 additions & 43 deletions python/plugins/processing/tests/testdata/expected/clip_multipolygons_by_polygons.xsd
View file

This file was deleted.

3 changes: 2 additions & 1 deletion python/plugins/processing/tests/testdata/expected/clip_points_by_multipolygons.gfs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
<GMLFeatureClass>
<Name>clip_points_by_multipolygons</Name>
<ElementPath>clip_points_by_multipolygons</ElementPath>
<GeometryType>1</GeometryType>
<!--MULTIPOINT-->
<GeometryType>4</GeometryType>
<SRSName>EPSG:4326</SRSName>
<DatasetSpecificInfo>
<FeatureCount>6</FeatureCount>
Expand Down
12 changes: 6 additions & 6 deletions python/plugins/processing/tests/testdata/expected/clip_points_by_multipolygons.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,32 +13,32 @@

<gml:featureMember>
<ogr:clip_points_by_multipolygons fid="points.1">
<ogr:geometryProperty><gml:Point srsName="EPSG:4326"><gml:coordinates>3,3</gml:coordinates></gml:Point></ogr:geometryProperty>
<ogr:geometryProperty><gml:MultiPoint srsName="EPSG:4326"><gml:pointMember><gml:Point><gml:coordinates>3,3</gml:coordinates></gml:Point></gml:pointMember></gml:MultiPoint></ogr:geometryProperty>
</ogr:clip_points_by_multipolygons>
</gml:featureMember>
<gml:featureMember>
<ogr:clip_points_by_multipolygons fid="points.2">
<ogr:geometryProperty><gml:Point srsName="EPSG:4326"><gml:coordinates>2,2</gml:coordinates></gml:Point></ogr:geometryProperty>
<ogr:geometryProperty><gml:MultiPoint srsName="EPSG:4326"><gml:pointMember><gml:Point><gml:coordinates>2,2</gml:coordinates></gml:Point></gml:pointMember></gml:MultiPoint></ogr:geometryProperty>
</ogr:clip_points_by_multipolygons>
</gml:featureMember>
<gml:featureMember>
<ogr:clip_points_by_multipolygons fid="points.4">
<ogr:geometryProperty><gml:Point srsName="EPSG:4326"><gml:coordinates>4,1</gml:coordinates></gml:Point></ogr:geometryProperty>
<ogr:geometryProperty><gml:MultiPoint srsName="EPSG:4326"><gml:pointMember><gml:Point><gml:coordinates>4,1</gml:coordinates></gml:Point></gml:pointMember></gml:MultiPoint></ogr:geometryProperty>
</ogr:clip_points_by_multipolygons>
</gml:featureMember>
<gml:featureMember>
<ogr:clip_points_by_multipolygons fid="points.6">
<ogr:geometryProperty><gml:Point srsName="EPSG:4326"><gml:coordinates>8,-1</gml:coordinates></gml:Point></ogr:geometryProperty>
<ogr:geometryProperty><gml:MultiPoint srsName="EPSG:4326"><gml:pointMember><gml:Point><gml:coordinates>8,-1</gml:coordinates></gml:Point></gml:pointMember></gml:MultiPoint></ogr:geometryProperty>
</ogr:clip_points_by_multipolygons>
</gml:featureMember>
<gml:featureMember>
<ogr:clip_points_by_multipolygons fid="points.7">
<ogr:geometryProperty><gml:Point srsName="EPSG:4326"><gml:coordinates>7,-1</gml:coordinates></gml:Point></ogr:geometryProperty>
<ogr:geometryProperty><gml:MultiPoint srsName="EPSG:4326"><gml:pointMember><gml:Point><gml:coordinates>7,-1</gml:coordinates></gml:Point></gml:pointMember></gml:MultiPoint></ogr:geometryProperty>
</ogr:clip_points_by_multipolygons>
</gml:featureMember>
<gml:featureMember>
<ogr:clip_points_by_multipolygons fid="points.0">
<ogr:geometryProperty><gml:Point srsName="EPSG:4326"><gml:coordinates>1,1</gml:coordinates></gml:Point></ogr:geometryProperty>
<ogr:geometryProperty><gml:MultiPoint srsName="EPSG:4326"><gml:pointMember><gml:Point><gml:coordinates>1,1</gml:coordinates></gml:Point></gml:pointMember></gml:MultiPoint></ogr:geometryProperty>
</ogr:clip_points_by_multipolygons>
</gml:featureMember>
</ogr:FeatureCollection>
23 changes: 0 additions & 23 deletions python/plugins/processing/tests/testdata/expected/clip_points_by_multipolygons.xsd
View file

This file was deleted.

3 changes: 2 additions & 1 deletion python/plugins/processing/tests/testdata/expected/clip_points_by_polygons.gfs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
<GMLFeatureClass>
<Name>clip_points_by_polygons</Name>
<ElementPath>clip_points_by_polygons</ElementPath>
<GeometryType>1</GeometryType>
<!--MULTIPOINT-->
<GeometryType>4</GeometryType>
<SRSName>EPSG:4326</SRSName>
<DatasetSpecificInfo>
<FeatureCount>6</FeatureCount>
Expand Down
12 changes: 6 additions & 6 deletions python/plugins/processing/tests/testdata/expected/clip_points_by_polygons.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,32 +13,32 @@

<gml:featureMember>
<ogr:clip_points_by_polygons fid="points.0">
<ogr:geometryProperty><gml:Point srsName="EPSG:4326"><gml:coordinates>1,1</gml:coordinates></gml:Point></ogr:geometryProperty>
<ogr:geometryProperty><gml:MultiPoint srsName="EPSG:4326"><gml:pointMember><gml:Point><gml:coordinates>1,1</gml:coordinates></gml:Point></gml:pointMember></gml:MultiPoint></ogr:geometryProperty>
</ogr:clip_points_by_polygons>
</gml:featureMember>
<gml:featureMember>
<ogr:clip_points_by_polygons fid="points.1">
<ogr:geometryProperty><gml:Point srsName="EPSG:4326"><gml:coordinates>3,3</gml:coordinates></gml:Point></ogr:geometryProperty>
<ogr:geometryProperty><gml:MultiPoint srsName="EPSG:4326"><gml:pointMember><gml:Point><gml:coordinates>3,3</gml:coordinates></gml:Point></gml:pointMember></gml:MultiPoint></ogr:geometryProperty>
</ogr:clip_points_by_polygons>
</gml:featureMember>
<gml:featureMember>
<ogr:clip_points_by_polygons fid="points.2">
<ogr:geometryProperty><gml:Point srsName="EPSG:4326"><gml:coordinates>2,2</gml:coordinates></gml:Point></ogr:geometryProperty>
<ogr:geometryProperty><gml:MultiPoint srsName="EPSG:4326"><gml:pointMember><gml:Point><gml:coordinates>2,2</gml:coordinates></gml:Point></gml:pointMember></gml:MultiPoint></ogr:geometryProperty>
</ogr:clip_points_by_polygons>
</gml:featureMember>
<gml:featureMember>
<ogr:clip_points_by_polygons fid="points.8">
<ogr:geometryProperty><gml:Point srsName="EPSG:4326"><gml:coordinates>0,-1</gml:coordinates></gml:Point></ogr:geometryProperty>
<ogr:geometryProperty><gml:MultiPoint srsName="EPSG:4326"><gml:pointMember><gml:Point><gml:coordinates>0,-1</gml:coordinates></gml:Point></gml:pointMember></gml:MultiPoint></ogr:geometryProperty>
</ogr:clip_points_by_polygons>
</gml:featureMember>
<gml:featureMember>
<ogr:clip_points_by_polygons fid="points.7">
<ogr:geometryProperty><gml:Point srsName="EPSG:4326"><gml:coordinates>7,-1</gml:coordinates></gml:Point></ogr:geometryProperty>
<ogr:geometryProperty><gml:MultiPoint srsName="EPSG:4326"><gml:pointMember><gml:Point><gml:coordinates>7,-1</gml:coordinates></gml:Point></gml:pointMember></gml:MultiPoint></ogr:geometryProperty>
</ogr:clip_points_by_polygons>
</gml:featureMember>
<gml:featureMember>
<ogr:clip_points_by_polygons fid="points.4">
<ogr:geometryProperty><gml:Point srsName="EPSG:4326"><gml:coordinates>4,1</gml:coordinates></gml:Point></ogr:geometryProperty>
<ogr:geometryProperty><gml:MultiPoint srsName="EPSG:4326"><gml:pointMember><gml:Point><gml:coordinates>4,1</gml:coordinates></gml:Point></gml:pointMember></gml:MultiPoint></ogr:geometryProperty>
</ogr:clip_points_by_polygons>
</gml:featureMember>
</ogr:FeatureCollection>
23 changes: 0 additions & 23 deletions python/plugins/processing/tests/testdata/expected/clip_points_by_polygons.xsd
View file

This file was deleted.

3 changes: 2 additions & 1 deletion python/plugins/processing/tests/testdata/expected/clip_polys_by_multipolygon.gfs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
<GMLFeatureClass>
<Name>clip_polys_by_multipolygon</Name>
<ElementPath>clip_polys_by_multipolygon</ElementPath>
<GeometryType>3</GeometryType>
<!--MULTIPOLYGON-->
<GeometryType>6</GeometryType>
<SRSName>EPSG:4326</SRSName>
<DatasetSpecificInfo>
<FeatureCount>3</FeatureCount>
Expand Down
6 changes: 3 additions & 3 deletions python/plugins/processing/tests/testdata/expected/clip_polys_by_multipolygon.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,23 @@

<gml:featureMember>
<ogr:clip_polys_by_multipolygon fid="polys.0">
<ogr:geometryProperty><gml:Polygon srsName="EPSG:4326"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>0,0 0,1 1,1 1,0 0,0</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometryProperty>
<ogr:geometryProperty><gml:MultiPolygon srsName="EPSG:4326"><gml:polygonMember><gml:Polygon><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>0,0 0,1 1,1 1,0 0,0</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></gml:polygonMember></gml:MultiPolygon></ogr:geometryProperty>
<ogr:name>aaaaa</ogr:name>
<ogr:intval>33</ogr:intval>
<ogr:floatval>44.123456</ogr:floatval>
</ogr:clip_polys_by_multipolygon>
</gml:featureMember>
<gml:featureMember>
<ogr:clip_polys_by_multipolygon fid="polys.5">
<ogr:geometryProperty><gml:Polygon srsName="EPSG:4326"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>2,1 2,2 3,2 4.0,1.666666666666667 4,1 2,1</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometryProperty>
<ogr:geometryProperty><gml:MultiPolygon srsName="EPSG:4326"><gml:polygonMember><gml:Polygon><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>2,1 2,2 3,2 4.0,1.666666666666667 4,1 2,1</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></gml:polygonMember></gml:MultiPolygon></ogr:geometryProperty>
<ogr:name>elim</ogr:name>
<ogr:intval>2</ogr:intval>
<ogr:floatval>3.33</ogr:floatval>
</ogr:clip_polys_by_multipolygon>
</gml:featureMember>
<gml:featureMember>
<ogr:clip_polys_by_multipolygon fid="polys.3">
<ogr:geometryProperty><gml:Polygon srsName="EPSG:4326"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>7,1 8,1 8,0 7,0 7,1</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometryProperty>
<ogr:geometryProperty><gml:MultiPolygon srsName="EPSG:4326"><gml:polygonMember><gml:Polygon><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>7,1 8,1 8,0 7,0 7,1</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></gml:polygonMember></gml:MultiPolygon></ogr:geometryProperty>
<ogr:name>ASDF</ogr:name>
<ogr:intval>0</ogr:intval>
</ogr:clip_polys_by_multipolygon>
Expand Down
Loading

0 comments on commit d783c73

Please sign in to comment.