sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-03 00:02:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

indent

Browse Source
This commit is contained in:
lbartoletti 2020-05-20 14:28:53 +02:00 committed by Loïc Bartoletti
parent d32722275b
commit 5fe0ee7b77
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/geometry/qgsgeometryutils.cpp
View File

@ -1301,7 +1301,7 @@ QPair<QgsWkbTypes::Type, QString> QgsGeometryUtils::wktReadBlock( const QString
QString wktParsed = wkt;
QString contents;
if ( wktParsed.count( '(' ) != wktParsed.count( ')' ) ) // if unbalanced parenthesis will returns false
contents = QStringLiteral("NULL");
contents = QStringLiteral( "NULL" );
else if ( wkt.contains( QString( "EMPTY" ), Qt::CaseInsensitive ) )
{
QRegularExpression wktRegEx( QStringLiteral( "^\\s*(\\w+)\\s+(\\w+)\\s*$" ) );

28
tests/src/core/testqgsgeometry.cpp
View File

@ -18102,20 +18102,20 @@ void TestQgsGeometry::testRandomPointsInPolygon()
void TestQgsGeometry::wktParser()
{
// unbalanced parenthesis
QVERIFY(! QgsPoint().fromWkt("POINT((0, 1)"));
QVERIFY(! QgsPoint().fromWkt("POINT(0, 1) )"));
QVERIFY(! QgsPoint().fromWkt("POINT ((0, 1)"));
QVERIFY(! QgsPoint().fromWkt("POINT (0, 1) )"));
QVERIFY(! QgsLineString().fromWkt("LineString(0, 1) )"));
QVERIFY(! QgsLineString().fromWkt("LineString(0 1, 1 2) )"));
QVERIFY(! QgsLineString().fromWkt("LineString (0, 1) )"));
QVERIFY(! QgsLineString().fromWkt("LineString (0 1, 1 2) )"));
QVERIFY(! QgsMultiLineString().fromWkt("MULTILINESTRING ((((1 2, 2 4, 4 5))"));
QVERIFY(! QgsMultiLineString().fromWkt("MULTILINESTRING((((1 2, 2 4, 4 5))"));
QVERIFY(! QgsLineString().fromWkt("Triangle(0 1, 1 2, 3 3) )"));
QVERIFY(! QgsLineString().fromWkt("Triangle (0 1, 1 2, 3 3) )"));
QVERIFY(! QgsLineString().fromWkt("Triangle( (0 1, 1 2, 3 3) )) "));
QVERIFY(! QgsLineString().fromWkt("Triangle ( (0 1, 1 2, 3 3) )) "));
QVERIFY( ! QgsPoint().fromWkt( "POINT((0, 1)" ) );
QVERIFY( ! QgsPoint().fromWkt( "POINT(0, 1) )" ) );
QVERIFY( ! QgsPoint().fromWkt( "POINT ((0, 1)" ) );
QVERIFY( ! QgsPoint().fromWkt( "POINT (0, 1) )" ) );
QVERIFY( ! QgsLineString().fromWkt( "LineString(0, 1) )" ) );
QVERIFY( ! QgsLineString().fromWkt( "LineString(0 1, 1 2) )" ) );
QVERIFY( ! QgsLineString().fromWkt( "LineString (0, 1) )" ) );
QVERIFY( ! QgsLineString().fromWkt( "LineString (0 1, 1 2) )" ) );
QVERIFY( ! QgsMultiLineString().fromWkt( "MULTILINESTRING ((((1 2, 2 4, 4 5))" ) );
QVERIFY( ! QgsMultiLineString().fromWkt( "MULTILINESTRING((((1 2, 2 4, 4 5))" ) );
QVERIFY( ! QgsLineString().fromWkt( "Triangle(0 1, 1 2, 3 3) )" ) );
QVERIFY( ! QgsLineString().fromWkt( "Triangle (0 1, 1 2, 3 3) )" ) );
QVERIFY( ! QgsLineString().fromWkt( "Triangle( (0 1, 1 2, 3 3) )) " ) );
QVERIFY( ! QgsLineString().fromWkt( "Triangle ( (0 1, 1 2, 3 3) )) " ) );
}
QGSTEST_MAIN( TestQgsGeometry )
#include "testqgsgeometry.moc"