Fix import WKT of the format MultiPoint (-20 -90, -20 -88 )

nyalldawson · nyalldawson · commit fad23dda2227 · 2017-05-09T11:56:39.000+10:00
Should technically be MultiPoint ((-20 -90), (-20 -88)), but it's nice to be forgiving and accept as wide a range of WKT formats as possible Fix #16483 (cherry-picked from ef6c8b)
diff --git a/src/core/geometry/qgsmultipointv2.cpp b/src/core/geometry/qgsmultipointv2.cpp
@@ -34,7 +34,7 @@ bool QgsMultiPointV2::fromWkt( const QString& wkt )
 {
   QString collectionWkt( wkt );
   //test for non-standard MultiPoint(x1 y1, x2 y2) format
-  QRegExp regex( "^\\s*MultiPoint\\s*[ZM]*\\s*\\(\\s*\\d" );
+  QRegExp regex( "^\\s*MultiPoint\\s*[ZM]*\\s*\\(\\s*[-\\d]" );
   regex.setCaseSensitivity( Qt::CaseInsensitive );
   if ( regex.indexIn( collectionWkt ) >= 0 )
   {
diff --git a/tests/testdata/geom_data.csv b/tests/testdata/geom_data.csv
@@ -75,6 +75,7 @@ GeometryCollection (PointZ (1 2 3)),GEOMETRYCOLLECTION Z (POINT Z (1 2 3)),1,0,0
 "MultiPoint(( 1 2 3 ),(4 5 6))","MultiPointZ(( 1 2 3 ),(4 5 6))",2,0,0,0,2,0,0,POINT(2.5 3.5),1,2,4,5,"z coordinate, but geometry not explicitly marked as such. Should be upgraded to have Z dimension"
 "MultiPoint(( 1 2 3 11),(4 5 6 12))","MultiPointZM(( 1 2 3 11),(4 5 6 12))",2,0,0,0,2,0,0,POINT(2.5 3.5),1,2,4,5,"4d coordinates, but geometry not explicitly marked as such. Should be upgraded to have ZM dimension"
 "MultiPoint (1 2, 3 4, 5 6)","MULTIPOINT((1 2),(3 4),(5 6))",3,0,0,0,3,0,0,POINT(3 4),1,2,5,6,
+"MultiPoint (-20 -90, -20 -88 )","MULTIPOINT((-20 -90),(-20 -88))",2,0,0,0,2,0,0,Point (-20 -89),-20,-90,-20,-88,
 MultiPoint (1 2),MULTIPOINT((1 2)),1,0,0,0,1,0,0,POINT(1 2),1,2,1,2,
 MultiPoint Z (1 2 3),MULTIPOINT Z ((1 2 3)),1,0,0,0,1,0,0,POINT(1 2),1,2,1,2,
 "MultiPointM (1 2 3,4 5 0)","MULTIPOINT M ((1 2 3),(4 5 0))",2,0,0,0,2,0,0,POINT(2.5 3.5),1,2,4,5,

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ bool QgsMultiPointV2::fromWkt( const QString& wkt )`
`34`	`34`	`{`
`35`	`35`	`QString collectionWkt( wkt );`
`36`	`36`	`//test for non-standard MultiPoint(x1 y1, x2 y2) format`
`37`		`- QRegExp regex( "^\\sMultiPoint\\s[ZM]\\s\\(\\s*\\d" );`
	`37`	`+ QRegExp regex( "^\\sMultiPoint\\s[ZM]\\s\\(\\s*[-\\d]" );`
`38`	`38`	`regex.setCaseSensitivity( Qt::CaseInsensitive );`
`39`	`39`	`if ( regex.indexIn( collectionWkt ) >= 0 )`
`40`	`40`	`{`