@@ -80,14 +80,14 @@ void TestQgsOgcUtils::testGeometryToGML()
80
80
QVERIFY ( !elemPoint.isNull () );
81
81
82
82
doc.appendChild ( elemPoint );
83
- QCOMPARE ( doc.toString ( -1 ), QString ( " <gml:Point><gml:coordinates cs=\" ,\" ts=\" \" >111.0 ,222.0 </gml:coordinates></gml:Point>" ) );
83
+ QCOMPARE ( doc.toString ( -1 ), QString ( " <gml:Point><gml:coordinates cs=\" ,\" ts=\" \" >111,222</gml:coordinates></gml:Point>" ) );
84
84
doc.removeChild ( elemPoint );
85
85
86
86
QDomElement elemLine = QgsOgcUtils::geometryToGML ( geomLine, doc );
87
87
QVERIFY ( !elemLine.isNull () );
88
88
89
89
doc.appendChild ( elemLine );
90
- QCOMPARE ( doc.toString ( -1 ), QString ( " <gml:LineString><gml:coordinates cs=\" ,\" ts=\" \" >111.0 ,222.0 222.0 ,222.0 </gml:coordinates></gml:LineString>" ) );
90
+ QCOMPARE ( doc.toString ( -1 ), QString ( " <gml:LineString><gml:coordinates cs=\" ,\" ts=\" \" >111,222 222,222</gml:coordinates></gml:LineString>" ) );
91
91
doc.removeChild ( elemLine );
92
92
93
93
// Test GML3
@@ -98,14 +98,14 @@ void TestQgsOgcUtils::testGeometryToGML()
98
98
QVERIFY ( !elemPoint.isNull () );
99
99
100
100
doc.appendChild ( elemPoint );
101
- QCOMPARE ( doc.toString ( -1 ), QString ( " <gml:Point><gml:pos srsDimension=\" 2\" >111.0 222.0 </gml:pos></gml:Point>" ) );
101
+ QCOMPARE ( doc.toString ( -1 ), QString ( " <gml:Point><gml:pos srsDimension=\" 2\" >111 222</gml:pos></gml:Point>" ) );
102
102
doc.removeChild ( elemPoint );
103
103
104
104
elemLine = QgsOgcUtils::geometryToGML ( geomLine, doc, " GML3" );
105
105
QVERIFY ( !elemLine.isNull () );
106
106
107
107
doc.appendChild ( elemLine );
108
- QCOMPARE ( doc.toString ( -1 ), QString ( " <gml:LineString><gml:posList srsDimension=\" 2\" >111.0 222.0 222.0 222.0 </gml:posList></gml:LineString>" ) );
108
+ QCOMPARE ( doc.toString ( -1 ), QString ( " <gml:LineString><gml:posList srsDimension=\" 2\" >111 222 222 222</gml:posList></gml:LineString>" ) );
109
109
doc.removeChild ( elemLine );
110
110
111
111
delete geomPoint;
@@ -315,15 +315,15 @@ void TestQgsOgcUtils::testExpressionToOgcFilter_data()
315
315
" <ogc:Filter>"
316
316
" <ogc:Intersects>"
317
317
" <ogc:PropertyName>geometry</ogc:PropertyName>"
318
- " <gml:Point><gml:coordinates cs=\" ,\" ts=\" \" >5.0,6.0 </gml:coordinates></gml:Point>"
318
+ " <gml:Point><gml:coordinates cs=\" ,\" ts=\" \" >5,6 </gml:coordinates></gml:Point>"
319
319
" </ogc:Intersects>"
320
320
" </ogc:Filter>" );
321
321
322
- QTest::newRow ( " contains + gml" ) << QString ( " contains($geometry, geomFromGML('<Point><coordinates cs=\" ,\" ts=\" \" >5.0,6.0 </coordinates></Point>'))" ) << QString (
322
+ QTest::newRow ( " contains + gml" ) << QString ( " contains($geometry, geomFromGML('<Point><coordinates cs=\" ,\" ts=\" \" >5,6 </coordinates></Point>'))" ) << QString (
323
323
" <ogc:Filter>"
324
324
" <ogc:Contains>"
325
325
" <ogc:PropertyName>geometry</ogc:PropertyName>"
326
- " <Point><coordinates cs=\" ,\" ts=\" \" >5.0,6.0 </coordinates></Point>"
326
+ " <Point><coordinates cs=\" ,\" ts=\" \" >5,6 </coordinates></Point>"
327
327
" </ogc:Contains>"
328
328
" </ogc:Filter>" );
329
329
0 commit comments