Tweak algorithm names, strings

qgis · Jul 30, 2018 · f119453 · f119453
1 parent 8372068
commit f119453
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/python/plugins/processing/tests/testdata/qgis_algorithm_tests.yaml b/python/plugins/processing/tests/testdata/qgis_algorithm_tests.yaml
@@ -5924,7 +5924,7 @@ tests:
         name: expected/create_parallel_lines.gml
         type: vector
 
-  - algorithm: native:drapetoz
+  - algorithm: native:setzfromraster
     name: Drape points to z
     params:
       BAND: 1
@@ -5941,7 +5941,7 @@ tests:
         name: expected/drape_points.shp
         type: vector
 
-  - algorithm: native:drapetom
+  - algorithm: native:setmfromraster
     name: Drape points to m
     params:
       BAND: 1
@@ -5958,7 +5958,7 @@ tests:
         name: expected/drape_points_m.shp
         type: vector
 
-  - algorithm: native:drapetoz
+  - algorithm: native:setzfromraster
     name: Drape lines to z
     params:
       BAND: 1
@@ -5975,7 +5975,7 @@ tests:
         name: expected/drape_lines.shp
         type: vector
 
-  - algorithm: native:drapetom
+  - algorithm: native:setmfromraster
     name: Drape lines to m
     params:
       BAND: 1

diff --git a/src/analysis/processing/qgsalgorithmdrape.cpp b/src/analysis/processing/qgsalgorithmdrape.cpp
@@ -32,7 +32,7 @@ QString QgsDrapeAlgorithmBase::groupId() const
 
 QString QgsDrapeAlgorithmBase::outputName() const
 {
-  return QObject::tr( "Draped" );
+  return QObject::tr( "Updated" );
 }
 
 void QgsDrapeAlgorithmBase::initParameters( const QVariantMap & )
@@ -165,17 +165,17 @@ QgsFeatureList QgsDrapeAlgorithmBase::processFeature( const QgsFeature &feature,
 
 QString QgsDrapeToZAlgorithm::name() const
 {
-  return QStringLiteral( "drapetoz" );
+  return QStringLiteral( "setzfromraster" );
 }
 
 QString QgsDrapeToZAlgorithm::displayName() const
 {
-  return QObject::tr( "Drape (Sample raster to z)" );
+  return QObject::tr( "Drape (set z-value from raster)" );
 }
 
 QStringList QgsDrapeToZAlgorithm::tags() const
 {
-  return QObject::tr( "3d,vertex,vertices,elevation,sample" ).split( ',' );
+  return QObject::tr( "3d,vertex,vertices,elevation,height,sample,dem,update,feature" ).split( ',' );
 }
 
 QString QgsDrapeToZAlgorithm::shortHelpString() const
@@ -217,17 +217,17 @@ QgsPoint QgsDrapeToZAlgorithm::drapeVertex( const QgsPoint &p, double rasterVal
 
 QString QgsDrapeToMAlgorithm::name() const
 {
-  return QStringLiteral( "drapetom" );
+  return QStringLiteral( "setmfromraster" );
 }
 
 QString QgsDrapeToMAlgorithm::displayName() const
 {
-  return QObject::tr( "Sample raster to m-values" );
+  return QObject::tr( "Set m-value from raster" );
 }
 
 QStringList QgsDrapeToMAlgorithm::tags() const
 {
-  return QObject::tr( "vertex,vertices,sample,measure" ).split( ',' );
+  return QObject::tr( "drape,vertex,vertices,sample,dem,update,feature,measure" ).split( ',' );
 }
 
 QString QgsDrapeToMAlgorithm::shortHelpString() const