Merge pull request #5030 from boundlessgeo/Win_CutAndPaste_2-18_issue…

…16870 Clipboard Cut&Paste fix when attached special field values. Fixes #16870
qgis · Aug 17, 2017 · f464aeb · f464aeb
2 parents 987f1ac + b73b25d
commit f464aeb
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 2 deletions.
diff --git a/src/app/qgsclipboard.cpp b/src/app/qgsclipboard.cpp
@@ -187,8 +187,17 @@ QgsFeatureList QgsClipboard::stringToFeatureList( const QString& string, const Q
 
   Q_FOREACH ( const QString& row, values )
   {
-    // Assume that it's just WKT for now.
-    QgsGeometry* geometry = QgsGeometry::fromWkt( row );
+    // Assume that it's just WKT for now. because GeoJSON is managed by
+    // previous QgsOgrUtils::stringToFeatureList call
+    // Get the first value of a \t separated list. WKT clipboard pasted
+    // feature has first element the WKT geom.
+    // This split is to fix te following issue: https://issues.qgis.org/issues/16870
+    // Value separators are set in generateClipboardText
+    QStringList fieldValues = row.split( '\t' );
+    if ( fieldValues.isEmpty() )
+      continue;
+
+    QgsGeometry *geometry = QgsGeometry::fromWkt( fieldValues[0] );
     if ( !geometry )
       continue;
 

diff --git a/tests/src/app/testqgisappclipboard.cpp b/tests/src/app/testqgisappclipboard.cpp
@@ -215,6 +215,31 @@ void TestQgisAppClipboard::pasteWkt()
   point = dynamic_cast< QgsPointV2* >( features.at( 1 ).constGeometry()->geometry() );
   QCOMPARE( point->x(), 111.0 );
   QCOMPARE( point->y(), 30.0 );
+
+  // be sure parsing does not consider attached parameters that
+  // can change geometryType as in https://issues.qgis.org/issues/16870
+  mQgisApp->clipboard()->setText( QStringLiteral( "POINT (111 30)\t GoodFieldValue\nPOINT (125 10)\t(WrongFieldValue)" ) );
+
+  features = mQgisApp->clipboard()->copyOf();
+  QCOMPARE( features.length(), 2 );
+
+  QVERIFY( features.at( 0 ).constGeometry() && !features.at( 0 ).constGeometry()->isEmpty() );
+  QCOMPARE( features.at( 0 ).constGeometry()->geometry()->wkbType(), QgsWKBTypes::Point );
+  const QgsGeometry *featureGeom = features.at( 0 ).constGeometry();
+  point = dynamic_cast< QgsPointV2 * >( featureGeom->geometry() );
+  QCOMPARE( point->x(), 111.0 );
+  QCOMPARE( point->y(), 30.0 );
+
+  QVERIFY( features.at( 1 ).constGeometry() && !features.at( 1 ).constGeometry()->isEmpty() );
+  QCOMPARE( features.at( 1 ).constGeometry()->geometry()->wkbType(), QgsWKBTypes::Point );
+  point = dynamic_cast< QgsPointV2 * >( features.at( 1 ).constGeometry()->geometry() );
+  QCOMPARE( point->x(), 125.0 );
+  QCOMPARE( point->y(), 10.0 );
+
+  // only fields => no geom so no feature list is returned
+  mQgisApp->clipboard()->setText( QStringLiteral( "MNL\t11\t282\tkm\t\nMNL\t11\t347.80000000000001\tkm\t" ) );
+  features = mQgisApp->clipboard()->copyOf();
+  QCOMPARE( features.length(), 0 );
 }
 
 void TestQgisAppClipboard::pasteGeoJson()