Add processing test for the vector tile writer alg

qgis · May 8, 2020 · 502429a · 502429a
1 parent 299be94
commit 502429a
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 3 deletions.
diff --git a/python/plugins/processing/tests/testdata/expected/xyztiles_vector/1/0/0.pbf b/python/plugins/processing/tests/testdata/expected/xyztiles_vector/1/0/0.pbf
diff --git a/python/plugins/processing/tests/testdata/expected/xyztiles_vector/2/0/1.pbf b/python/plugins/processing/tests/testdata/expected/xyztiles_vector/2/0/1.pbf
diff --git a/python/plugins/processing/tests/testdata/expected/xyztiles_vector/2/1/1.pbf b/python/plugins/processing/tests/testdata/expected/xyztiles_vector/2/1/1.pbf
diff --git a/python/plugins/processing/tests/testdata/expected/xyztiles_vector/3/1/2.pbf b/python/plugins/processing/tests/testdata/expected/xyztiles_vector/3/1/2.pbf
diff --git a/python/plugins/processing/tests/testdata/expected/xyztiles_vector/3/1/3.pbf b/python/plugins/processing/tests/testdata/expected/xyztiles_vector/3/1/3.pbf
diff --git a/python/plugins/processing/tests/testdata/expected/xyztiles_vector/3/2/2.pbf b/python/plugins/processing/tests/testdata/expected/xyztiles_vector/3/2/2.pbf
diff --git a/python/plugins/processing/tests/testdata/expected/xyztiles_vector/3/2/3.pbf b/python/plugins/processing/tests/testdata/expected/xyztiles_vector/3/2/3.pbf
diff --git a/python/plugins/processing/tests/testdata/qgis_algorithm_tests4.yaml b/python/plugins/processing/tests/testdata/qgis_algorithm_tests4.yaml
@@ -2170,6 +2170,21 @@ tests:
         type: directory
         name: expected/xyztiles
 
+  - algorithm: native:writevectortiles_xyz
+    name: Generate vector tiles (Directory)
+    params:
+      LAYERS:
+      - layer: ../../../../../tests/testdata/lines.shp
+      - layer: ../../../../../tests/testdata/points.shp
+      - layer: ../../../../../tests/testdata/polys.shp
+      MAX_ZOOM: 3
+      MIN_ZOOM: 1
+      XYZ_TEMPLATE: '{z}/{x}/{y}.pbf'
+    results:
+      OUTPUT_DIRECTORY:
+        type: directory
+        name: expected/xyztiles_vector
+
   - algorithm: native:calculatevectoroverlaps
     name: Overlap analysis 1
     ellipsoid: GRS80

diff --git a/src/analysis/processing/qgsalgorithmwritevectortiles.cpp b/src/analysis/processing/qgsalgorithmwritevectortiles.cpp
@@ -106,15 +106,15 @@ QgsProcessingAlgorithm *QgsWriteVectorTilesXyzAlgorithm::createInstance() const
 
 void QgsWriteVectorTilesXyzAlgorithm::initAlgorithm( const QVariantMap & )
 {
-  addParameter( new QgsProcessingParameterFolderDestination( QStringLiteral( "OUTPUT_DIR" ), QObject::tr( "Output directory" ) ) );
+  addParameter( new QgsProcessingParameterFolderDestination( QStringLiteral( "OUTPUT_DIRECTORY" ), QObject::tr( "Output directory" ) ) );
   addParameter( new QgsProcessingParameterString( QStringLiteral( "XYZ_TEMPLATE" ), QObject::tr( "File template" ), QStringLiteral( "{z}/{x}/{y}.pbf" ) ) );
 
   addBaseParameters();
 }
 
 void QgsWriteVectorTilesXyzAlgorithm::prepareWriter( QgsVectorTileWriter &writer, const QVariantMap &parameters, QgsProcessingContext &context, QVariantMap &outputs )
 {
-  QString outputDir = parameterAsString( parameters, QStringLiteral( "OUTPUT_DIR" ), context );
+  QString outputDir = parameterAsString( parameters, QStringLiteral( "OUTPUT_DIRECTORY" ), context );
   QString xyzTemplate = parameterAsString( parameters, QStringLiteral( "XYZ_TEMPLATE" ), context );
   QgsDataSourceUri dsUri;
   dsUri.setParam( QStringLiteral( "type" ), QStringLiteral( "xyz" ) );
@@ -123,7 +123,7 @@ void QgsWriteVectorTilesXyzAlgorithm::prepareWriter( QgsVectorTileWriter &writer
 
   writer.setDestinationUri( uri );
 
-  outputs.insert( QStringLiteral( "OUTPUT_DIR" ), outputDir );
+  outputs.insert( QStringLiteral( "OUTPUT_DIRECTORY" ), outputDir );
 }
 
 //