Skip to content

Commit

Permalink
Update expected test results
Browse files Browse the repository at this point in the history
  • Loading branch information
@nyalldawson
nyalldawson committed Oct 16, 2018
1 parent fbb916d commit bef8d6e
Show file tree
Hide file tree
Showing 15 changed files with 76 additions and 38 deletions.
Binary file modified python/plugins/processing/tests/testdata/custom/circular_strings.gpkg
View file
Binary file not shown.
18 changes: 12 additions & 6 deletions python/plugins/processing/tests/testdata/expected/gdal/buffer_lines.gml
View file

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion python/plugins/processing/tests/testdata/expected/gdal/buffer_lines.xsd
View file
Expand Up @@ -15,7 +15,8 @@
<xs:complexContent>
<xs:extension base="gml:AbstractFeatureType">
<xs:sequence>
<xs:element name="geometryProperty" type="gml:GeometryPropertyType" nillable="true" minOccurs="0" maxOccurs="1"/>
<xs:element name="geometry" type="gml:GeometryPropertyType" nillable="true" minOccurs="0" maxOccurs="1"/>
<xs:element name="GEOMETRY" type="gml:LineStringPropertyType" nillable="true" minOccurs="0" maxOccurs="1"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
Expand Down
3 changes: 2 additions & 1 deletion python/plugins/processing/tests/testdata/expected/gdal/buffer_lines_dissolve.gml
View file

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion python/plugins/processing/tests/testdata/expected/gdal/buffer_lines_dissolve.xsd
View file
Expand Up @@ -15,7 +15,8 @@
<xs:complexContent>
<xs:extension base="gml:AbstractFeatureType">
<xs:sequence>
<xs:element name="geometryProperty" type="gml:GeometryPropertyType" nillable="true" minOccurs="0" maxOccurs="1"/>
<xs:element name="geometry" type="gml:GeometryPropertyType" nillable="true" minOccurs="0" maxOccurs="1"/>
<xs:element name="GEOMETRY" type="gml:LineStringPropertyType" nillable="true" minOccurs="0" maxOccurs="1"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
Expand Down
15 changes: 10 additions & 5 deletions python/plugins/processing/tests/testdata/expected/gdal/buffer_polys.gml
View file

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion python/plugins/processing/tests/testdata/expected/gdal/buffer_polys.xsd
View file
Expand Up @@ -15,7 +15,8 @@
<xs:complexContent>
<xs:extension base="gml:AbstractFeatureType">
<xs:sequence>
<xs:element name="geometryProperty" type="gml:GeometryPropertyType" nillable="true" minOccurs="0" maxOccurs="1"/>
<xs:element name="geometry" type="gml:GeometryPropertyType" nillable="true" minOccurs="0" maxOccurs="1"/>
<xs:element name="GEOMETRY" type="gml:PolygonPropertyType" nillable="true" minOccurs="0" maxOccurs="1"/>
<xs:element name="name" nillable="true" minOccurs="0" maxOccurs="1">
<xs:simpleType>
<xs:restriction base="xs:string">
Expand Down
3 changes: 2 additions & 1 deletion python/plugins/processing/tests/testdata/expected/gdal/buffer_polys_dissolve.gml
View file

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion python/plugins/processing/tests/testdata/expected/gdal/buffer_polys_dissolve.xsd
View file
Expand Up @@ -15,7 +15,8 @@
<xs:complexContent>
<xs:extension base="gml:AbstractFeatureType">
<xs:sequence>
<xs:element name="geometryProperty" type="gml:GeometryPropertyType" nillable="true" minOccurs="0" maxOccurs="1"/>
<xs:element name="geometry" type="gml:GeometryPropertyType" nillable="true" minOccurs="0" maxOccurs="1"/>
<xs:element name="GEOMETRY" type="gml:PolygonPropertyType" nillable="true" minOccurs="0" maxOccurs="1"/>
<xs:element name="name" nillable="true" minOccurs="0" maxOccurs="1">
<xs:simpleType>
<xs:restriction base="xs:string">
Expand Down
18 changes: 12 additions & 6 deletions python/plugins/processing/tests/testdata/expected/gdal/offset_lines.gml
View file
Expand Up @@ -13,32 +13,38 @@

<gml:featureMember>
<ogr:SELECT fid="lines.0">
<ogr:geometryProperty><gml:LineString srsName="EPSG:4326"><gml:coordinates>11.3535533905933,4.64644660940673 9.5,2.79289321881345 9.5,2.0 9.4975923633361,1.95099142983522 9.49039264020162,1.90245483899194 9.4784701678661,1.85485766137277 9.46193976625564,1.80865828381746 9.44096063217418,1.764301631587 9.41573480615127,1.7222148834902 9.38650522668137,1.68280335791818 9.35355339059327,1.64644660940673 9.31719664208182,1.61349477331863 9.2777851165098,1.58426519384873 9.235698368413,1.55903936782582 9.19134171618255,1.53806023374436 9.14514233862723,1.5215298321339 9.09754516100806,1.50960735979838 9.04900857016478,1.5024076366639 9.0,1.5 6.0,1.5</gml:coordinates></gml:LineString></ogr:geometryProperty>
<ogr:geometry><gml:LineString srsName="EPSG:4326"><gml:coordinates>11.3535533905933,4.64644660940673 9.5,2.79289321881345 9.5,2.0 9.4975923633361,1.95099142983522 9.49039264020162,1.90245483899194 9.4784701678661,1.85485766137277 9.46193976625564,1.80865828381746 9.44096063217418,1.764301631587 9.41573480615127,1.7222148834902 9.38650522668137,1.68280335791818 9.35355339059327,1.64644660940673 9.31719664208182,1.61349477331863 9.2777851165098,1.58426519384873 9.235698368413,1.55903936782582 9.19134171618255,1.53806023374436 9.14514233862723,1.5215298321339 9.09754516100806,1.50960735979838 9.04900857016478,1.5024076366639 9.0,1.5 6.0,1.5</gml:coordinates></gml:LineString></ogr:geometry>
<ogr:GEOMETRY><gml:LineString srsName="EPSG:4326"><gml:coordinates>11.3535533905933,4.64644660940673 9.5,2.79289321881345 9.5,2.0 9.4975923633361,1.95099142983522 9.49039264020162,1.90245483899194 9.4784701678661,1.85485766137277 9.46193976625564,1.80865828381746 9.44096063217418,1.764301631587 9.41573480615127,1.7222148834902 9.38650522668137,1.68280335791818 9.35355339059327,1.64644660940673 9.31719664208182,1.61349477331863 9.2777851165098,1.58426519384873 9.235698368413,1.55903936782582 9.19134171618255,1.53806023374436 9.14514233862723,1.5215298321339 9.09754516100806,1.50960735979838 9.04900857016478,1.5024076366639 9.0,1.5 6.0,1.5</gml:coordinates></gml:LineString></ogr:GEOMETRY>
</ogr:SELECT>
</gml:featureMember>
<gml:featureMember>
<ogr:SELECT fid="lines.1">
<ogr:geometryProperty><gml:LineString srsName="EPSG:4326"><gml:coordinates>1.0,-1.5 -1.0,-1.5</gml:coordinates></gml:LineString></ogr:geometryProperty>
<ogr:geometry><gml:LineString srsName="EPSG:4326"><gml:coordinates>1.0,-1.5 -1.0,-1.5</gml:coordinates></gml:LineString></ogr:geometry>
<ogr:GEOMETRY><gml:LineString srsName="EPSG:4326"><gml:coordinates>1.0,-1.5 -1.0,-1.5</gml:coordinates></gml:LineString></ogr:GEOMETRY>
</ogr:SELECT>
</gml:featureMember>
<gml:featureMember>
<ogr:SELECT fid="lines.2">
<ogr:geometryProperty><gml:LineString srsName="EPSG:4326"><gml:coordinates>3.5,3.0 3.5,2.0 3.4975923633361,1.95099142983522 3.49039264020162,1.90245483899194 3.4784701678661,1.85485766137277 3.46193976625564,1.80865828381746 3.44096063217418,1.764301631587 3.41573480615127,1.7222148834902 3.38650522668137,1.68280335791818 3.35355339059327,1.64644660940673 3.31719664208182,1.61349477331863 3.2777851165098,1.58426519384873 3.235698368413,1.55903936782582 3.19134171618254,1.53806023374436 3.14514233862723,1.5215298321339 3.09754516100806,1.50960735979838 3.04900857016478,1.5024076366639 3.0,1.5 2.5,1.5 2.5,0.0</gml:coordinates></gml:LineString></ogr:geometryProperty>
<ogr:geometry><gml:LineString srsName="EPSG:4326"><gml:coordinates>3.5,3.0 3.5,2.0 3.4975923633361,1.95099142983522 3.49039264020162,1.90245483899194 3.4784701678661,1.85485766137277 3.46193976625564,1.80865828381746 3.44096063217418,1.764301631587 3.41573480615127,1.7222148834902 3.38650522668137,1.68280335791818 3.35355339059327,1.64644660940673 3.31719664208182,1.61349477331863 3.2777851165098,1.58426519384873 3.235698368413,1.55903936782582 3.19134171618254,1.53806023374436 3.14514233862723,1.5215298321339 3.09754516100806,1.50960735979838 3.04900857016478,1.5024076366639 3.0,1.5 2.5,1.5 2.5,0.0</gml:coordinates></gml:LineString></ogr:geometry>
<ogr:GEOMETRY><gml:LineString srsName="EPSG:4326"><gml:coordinates>3.5,3.0 3.5,2.0 3.4975923633361,1.95099142983522 3.49039264020162,1.90245483899194 3.4784701678661,1.85485766137277 3.46193976625564,1.80865828381746 3.44096063217418,1.764301631587 3.41573480615127,1.7222148834902 3.38650522668137,1.68280335791818 3.35355339059327,1.64644660940673 3.31719664208182,1.61349477331863 3.2777851165098,1.58426519384873 3.235698368413,1.55903936782582 3.19134171618254,1.53806023374436 3.14514233862723,1.5215298321339 3.09754516100806,1.50960735979838 3.04900857016478,1.5024076366639 3.0,1.5 2.5,1.5 2.5,0.0</gml:coordinates></gml:LineString></ogr:GEOMETRY>
</ogr:SELECT>
</gml:featureMember>
<gml:featureMember>
<ogr:SELECT fid="lines.3">
<ogr:geometryProperty><gml:LineString srsName="EPSG:4326"><gml:coordinates>5.0,0.5 3.0,0.5</gml:coordinates></gml:LineString></ogr:geometryProperty>
<ogr:geometry><gml:LineString srsName="EPSG:4326"><gml:coordinates>5.0,0.5 3.0,0.5</gml:coordinates></gml:LineString></ogr:geometry>
<ogr:GEOMETRY><gml:LineString srsName="EPSG:4326"><gml:coordinates>5.0,0.5 3.0,0.5</gml:coordinates></gml:LineString></ogr:GEOMETRY>
</ogr:SELECT>
</gml:featureMember>
<gml:featureMember>
<ogr:SELECT fid="lines.4">
<ogr:geometryProperty><gml:LineString srsName="EPSG:4326"><gml:coordinates>10.0,-3.5 7.0,-3.5</gml:coordinates></gml:LineString></ogr:geometryProperty>
<ogr:geometry><gml:LineString srsName="EPSG:4326"><gml:coordinates>10.0,-3.5 7.0,-3.5</gml:coordinates></gml:LineString></ogr:geometry>
<ogr:GEOMETRY><gml:LineString srsName="EPSG:4326"><gml:coordinates>10.0,-3.5 7.0,-3.5</gml:coordinates></gml:LineString></ogr:GEOMETRY>
</ogr:SELECT>
</gml:featureMember>
<gml:featureMember>
<ogr:SELECT fid="lines.5">
<ogr:geometryProperty><gml:LineString srsName="EPSG:4326"><gml:coordinates>10.3535533905933,0.646446609406726 6.35355339059327,-3.35355339059327</gml:coordinates></gml:LineString></ogr:geometryProperty>
<ogr:geometry><gml:LineString srsName="EPSG:4326"><gml:coordinates>10.3535533905933,0.646446609406726 6.35355339059327,-3.35355339059327</gml:coordinates></gml:LineString></ogr:geometry>
<ogr:GEOMETRY><gml:LineString srsName="EPSG:4326"><gml:coordinates>10.3535533905933,0.646446609406726 6.35355339059327,-3.35355339059327</gml:coordinates></gml:LineString></ogr:GEOMETRY>
</ogr:SELECT>
</gml:featureMember>
</ogr:FeatureCollection>
3 changes: 2 additions & 1 deletion python/plugins/processing/tests/testdata/expected/gdal/offset_lines.xsd
View file
Expand Up @@ -15,7 +15,8 @@
<xs:complexContent>
<xs:extension base="gml:AbstractFeatureType">
<xs:sequence>
<xs:element name="geometryProperty" type="gml:GeometryPropertyType" nillable="true" minOccurs="0" maxOccurs="1"/>
<xs:element name="geometry" type="gml:GeometryPropertyType" nillable="true" minOccurs="0" maxOccurs="1"/>
<xs:element name="GEOMETRY" type="gml:LineStringPropertyType" nillable="true" minOccurs="0" maxOccurs="1"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
Expand Down
18 changes: 12 additions & 6 deletions python/plugins/processing/tests/testdata/expected/gdal/one_side_buffer.gml
View file
Expand Up @@ -13,32 +13,38 @@

<gml:featureMember>
<ogr:SELECT fid="lines.0">
<ogr:geometryProperty><gml:Polygon srsName="EPSG:4326"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>11,5 9,3 9,2 6,2 6.0,2.5 8.5,2.5 8.5,3.0 8.5024076366639,3.04900857016478 8.50960735979838,3.09754516100806 8.5215298321339,3.14514233862723 8.53806023374436,3.19134171618255 8.55903936782582,3.235698368413 8.58426519384873,3.2777851165098 8.61349477331863,3.31719664208182 8.64644660940673,3.35355339059327 10.6464466094067,5.35355339059327 11,5</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometryProperty>
<ogr:geometry><gml:Polygon srsName="EPSG:4326"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>11,5 9,3 9,2 6,2 6.0,2.5 8.5,2.5 8.5,3.0 8.5024076366639,3.04900857016478 8.50960735979838,3.09754516100806 8.5215298321339,3.14514233862723 8.53806023374436,3.19134171618255 8.55903936782582,3.235698368413 8.58426519384873,3.2777851165098 8.61349477331863,3.31719664208182 8.64644660940673,3.35355339059327 10.6464466094067,5.35355339059327 11,5</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometry>
<ogr:GEOMETRY><gml:Polygon srsName="EPSG:4326"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>11,5 9,3 9,2 6,2 6.0,2.5 8.5,2.5 8.5,3.0 8.5024076366639,3.04900857016478 8.50960735979838,3.09754516100806 8.5215298321339,3.14514233862723 8.53806023374436,3.19134171618255 8.55903936782582,3.235698368413 8.58426519384873,3.2777851165098 8.61349477331863,3.31719664208182 8.64644660940673,3.35355339059327 10.6464466094067,5.35355339059327 11,5</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:GEOMETRY>
</ogr:SELECT>
</gml:featureMember>
<gml:featureMember>
<ogr:SELECT fid="lines.1">
<ogr:geometryProperty><gml:Polygon srsName="EPSG:4326"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>1,-1 -1,-1 -1.0,-0.5 1.0,-0.5 1,-1</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometryProperty>
<ogr:geometry><gml:Polygon srsName="EPSG:4326"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>1,-1 -1,-1 -1.0,-0.5 1.0,-0.5 1,-1</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometry>
<ogr:GEOMETRY><gml:Polygon srsName="EPSG:4326"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>1,-1 -1,-1 -1.0,-0.5 1.0,-0.5 1,-1</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:GEOMETRY>
</ogr:SELECT>
</gml:featureMember>
<gml:featureMember>
<ogr:SELECT fid="lines.2">
<ogr:geometryProperty><gml:Polygon srsName="EPSG:4326"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>3,3 3,2 2,2 2,0 1.5,0.0 1.5,2.0 1.5024076366639,2.04900857016478 1.50960735979838,2.09754516100806 1.5215298321339,2.14514233862723 1.53806023374436,2.19134171618254 1.55903936782582,2.235698368413 1.58426519384873,2.2777851165098 1.61349477331863,2.31719664208182 1.64644660940673,2.35355339059327 1.68280335791818,2.38650522668137 1.7222148834902,2.41573480615127 1.764301631587,2.44096063217418 1.80865828381746,2.46193976625564 1.85485766137277,2.4784701678661 1.90245483899194,2.49039264020162 1.95099142983522,2.4975923633361 2.0,2.5 2.5,2.5 2.5,3.0 3,3</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometryProperty>
<ogr:geometry><gml:Polygon srsName="EPSG:4326"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>3,3 3,2 2,2 2,0 1.5,0.0 1.5,2.0 1.5024076366639,2.04900857016478 1.50960735979838,2.09754516100806 1.5215298321339,2.14514233862723 1.53806023374436,2.19134171618254 1.55903936782582,2.235698368413 1.58426519384873,2.2777851165098 1.61349477331863,2.31719664208182 1.64644660940673,2.35355339059327 1.68280335791818,2.38650522668137 1.7222148834902,2.41573480615127 1.764301631587,2.44096063217418 1.80865828381746,2.46193976625564 1.85485766137277,2.4784701678661 1.90245483899194,2.49039264020162 1.95099142983522,2.4975923633361 2.0,2.5 2.5,2.5 2.5,3.0 3,3</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometry>
<ogr:GEOMETRY><gml:Polygon srsName="EPSG:4326"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>3,3 3,2 2,2 2,0 1.5,0.0 1.5,2.0 1.5024076366639,2.04900857016478 1.50960735979838,2.09754516100806 1.5215298321339,2.14514233862723 1.53806023374436,2.19134171618254 1.55903936782582,2.235698368413 1.58426519384873,2.2777851165098 1.61349477331863,2.31719664208182 1.64644660940673,2.35355339059327 1.68280335791818,2.38650522668137 1.7222148834902,2.41573480615127 1.764301631587,2.44096063217418 1.80865828381746,2.46193976625564 1.85485766137277,2.4784701678661 1.90245483899194,2.49039264020162 1.95099142983522,2.4975923633361 2.0,2.5 2.5,2.5 2.5,3.0 3,3</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:GEOMETRY>
</ogr:SELECT>
</gml:featureMember>
<gml:featureMember>
<ogr:SELECT fid="lines.3">
<ogr:geometryProperty><gml:Polygon srsName="EPSG:4326"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>5,1 3,1 3.0,1.5 5.0,1.5 5,1</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometryProperty>
<ogr:geometry><gml:Polygon srsName="EPSG:4326"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>5,1 3,1 3.0,1.5 5.0,1.5 5,1</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometry>
<ogr:GEOMETRY><gml:Polygon srsName="EPSG:4326"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>5,1 3,1 3.0,1.5 5.0,1.5 5,1</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:GEOMETRY>
</ogr:SELECT>
</gml:featureMember>
<gml:featureMember>
<ogr:SELECT fid="lines.4">
<ogr:geometryProperty><gml:Polygon srsName="EPSG:4326"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>10,-3 7,-3 7.0,-2.5 10.0,-2.5 10,-3</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometryProperty>
<ogr:geometry><gml:Polygon srsName="EPSG:4326"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>10,-3 7,-3 7.0,-2.5 10.0,-2.5 10,-3</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometry>
<ogr:GEOMETRY><gml:Polygon srsName="EPSG:4326"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>10,-3 7,-3 7.0,-2.5 10.0,-2.5 10,-3</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:GEOMETRY>
</ogr:SELECT>
</gml:featureMember>
<gml:featureMember>
<ogr:SELECT fid="lines.5">
<ogr:geometryProperty><gml:Polygon srsName="EPSG:4326"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>10,1 6,-3 5.64644660940673,-2.64644660940673 9.64644660940673,1.35355339059327 10,1</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometryProperty>
<ogr:geometry><gml:Polygon srsName="EPSG:4326"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>10,1 6,-3 5.64644660940673,-2.64644660940673 9.64644660940673,1.35355339059327 10,1</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometry>
<ogr:GEOMETRY><gml:Polygon srsName="EPSG:4326"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>10,1 6,-3 5.64644660940673,-2.64644660940673 9.64644660940673,1.35355339059327 10,1</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:GEOMETRY>
</ogr:SELECT>
</gml:featureMember>
</ogr:FeatureCollection>
3 changes: 2 additions & 1 deletion python/plugins/processing/tests/testdata/expected/gdal/one_side_buffer.xsd
View file
Expand Up @@ -15,7 +15,8 @@
<xs:complexContent>
<xs:extension base="gml:AbstractFeatureType">
<xs:sequence>
<xs:element name="geometryProperty" type="gml:GeometryPropertyType" nillable="true" minOccurs="0" maxOccurs="1"/>
<xs:element name="geometry" type="gml:GeometryPropertyType" nillable="true" minOccurs="0" maxOccurs="1"/>
<xs:element name="GEOMETRY" type="gml:LineStringPropertyType" nillable="true" minOccurs="0" maxOccurs="1"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
Expand Down

0 comments on commit bef8d6e

Please sign in to comment.