testqgsgml.cpp (QGIS-final-3_10_11) | : | testqgsgml.cpp (QGIS-final-3_10_12) | ||
---|---|---|---|---|
skipping to change at line 1118 | skipping to change at line 1118 | |||
{ | { | |||
QgsFields fields; | QgsFields fields; | |||
QgsGmlStreamingParser gmlParser( QStringLiteral( "mytypename" ), QStringLitera l( "mygeom" ), fields ); | QgsGmlStreamingParser gmlParser( QStringLiteral( "mytypename" ), QStringLitera l( "mygeom" ), fields ); | |||
QCOMPARE( gmlParser.processData( QByteArray( "<myns:FeatureCollection " | QCOMPARE( gmlParser.processData( QByteArray( "<myns:FeatureCollection " | |||
"xmlns:myns='http://myns' " | "xmlns:myns='http://myns' " | |||
"xmlns:gml='http://www.opengis.net/gml'>" | "xmlns:gml='http://www.opengis.net/gml'>" | |||
"<gml:featureMember>" | "<gml:featureMember>" | |||
"<myns:mytypename fid='mytypename.1'>" | "<myns:mytypename fid='mytypename.1'>" | |||
"<myns:mygeom>" | "<myns:mygeom>" | |||
"<gml:CompositeSurface srsName='EPSG:27700'>< gml:surfaceMember>" | "<gml:CompositeSurface srsName='EPSG:27700'>< gml:surfaceMember>" | |||
"<gml:Polygon srsName='EPSG:27700'>" | "<gml:Polygon gml:id='foo' srsName='EPSG:2770 0'>" | |||
"<gml:exterior>" | "<gml:exterior>" | |||
"<gml:LinearRing>" | "<gml:LinearRing>" | |||
"<gml:posList>0 0 0 10 10 10 10 0 0 0</gml:po sList>" | "<gml:posList>0 0 0 10 10 10 10 0 0 0</gml:po sList>" | |||
"</gml:LinearRing>" | "</gml:LinearRing>" | |||
"</gml:exterior>" | "</gml:exterior>" | |||
"</gml:Polygon>" | "</gml:Polygon>" | |||
"</gml:surfaceMember></gml:CompositeSurface>" | "</gml:surfaceMember></gml:CompositeSurface>" | |||
"</myns:mygeom>" | "</myns:mygeom>" | |||
"</myns:mytypename>" | "</myns:mytypename>" | |||
"</gml:featureMember>" | "</gml:featureMember>" | |||
skipping to change at line 1149 | skipping to change at line 1149 | |||
QCOMPARE( multi[0][0].size(), 5 ); | QCOMPARE( multi[0][0].size(), 5 ); | |||
delete features[0].first; | delete features[0].first; | |||
} | } | |||
void TestQgsGML::testThroughOGRGeometry_urn_EPSG_4326() | void TestQgsGML::testThroughOGRGeometry_urn_EPSG_4326() | |||
{ | { | |||
QgsFields fields; | QgsFields fields; | |||
QgsGmlStreamingParser gmlParser( QStringLiteral( "mytypename" ), QStringLitera l( "mygeom" ), fields ); | QgsGmlStreamingParser gmlParser( QStringLiteral( "mytypename" ), QStringLitera l( "mygeom" ), fields ); | |||
QCOMPARE( gmlParser.processData( QByteArray( "<myns:FeatureCollection " | QCOMPARE( gmlParser.processData( QByteArray( "<myns:FeatureCollection " | |||
"xmlns:myns='http://myns' " | "xmlns:myns='http://myns' " | |||
"xmlns:gml='http://www.opengis.net/gml'>" | "xmlns:gml='http://www.opengis.net/gml/3.2'>" | |||
"<gml:featureMember>" | "<gml:featureMember>" | |||
"<myns:mytypename fid='mytypename.1'>" | "<myns:mytypename fid='mytypename.1'>" | |||
"<myns:mygeom>" | "<myns:mygeom>" | |||
"<gml:CompositeSurface srsName='urn:ogc:def:c rs:EPSG::4326'><gml:surfaceMember>" | "<gml:CompositeSurface srsName='urn:ogc:def:c rs:EPSG::4326'><gml:surfaceMember>" | |||
"<gml:Polygon srsName='urn:ogc:def:crs:EPSG:: 4326'>" | "<gml:Polygon gml:id='foo' srsName='urn:ogc:d ef:crs:EPSG::4326'>" | |||
"<gml:exterior>" | "<gml:exterior>" | |||
"<gml:LinearRing>" | "<gml:LinearRing>" | |||
"<gml:posList>49 2 49 3 59 3 49 2</gml:posLis t>" | "<gml:posList>49 2 49 3 59 3 49 2</gml:posLis t>" | |||
"</gml:LinearRing>" | "</gml:LinearRing>" | |||
"</gml:exterior>" | "</gml:exterior>" | |||
"</gml:Polygon>" | "</gml:Polygon>" | |||
"</gml:surfaceMember></gml:CompositeSurface>" | "</gml:surfaceMember></gml:CompositeSurface>" | |||
"</myns:mygeom>" | "</myns:mygeom>" | |||
"</myns:mytypename>" | "</myns:mytypename>" | |||
"</gml:featureMember>" | "</gml:featureMember>" | |||
End of changes. 3 change blocks. | ||||
3 lines changed or deleted | 3 lines changed or added |