Address review

qgis · Oct 6, 2024 · 423def0 · 423def0
1 parent 35c4f1d
commit 423def0
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 4 deletions.
diff --git a/python/PyQt6/core/auto_generated/qgsmaplayerutils.sip.in b/python/PyQt6/core/auto_generated/qgsmaplayerutils.sip.in
@@ -9,6 +9,7 @@
 
 
 
+
 class QgsMapLayerUtils
 {
 %Docstring(signature="appended")

diff --git a/python/core/auto_generated/qgsmaplayerutils.sip.in b/python/core/auto_generated/qgsmaplayerutils.sip.in
@@ -9,6 +9,7 @@
 
 
 
+
 class QgsMapLayerUtils
 {
 %Docstring(signature="appended")

diff --git a/src/analysis/processing/qgsalgorithmrasterize.cpp b/src/analysis/processing/qgsalgorithmrasterize.cpp
@@ -197,7 +197,7 @@ QVariantMap QgsRasterizeAlgorithm::processAlgorithm( const QVariantMap &paramete
         }
         feedback->pushInfo( QStringLiteral( "%1" ).arg( totalTiles ) );
 
-        if ( totalTiles > 5000 )
+        if ( totalTiles > MAXIMUM_OPENSTREETMAP_TILES_FETCH )
         {
           // Prevent bulk downloading of tiles from openstreetmap.org as per OSMF tile usage policy
           feedback->pushFormattedMessage( QObject::tr( "Layer %1 will be skipped as the algorithm leads to bulk downloading behavior which is prohibited by the %2OpenStreetMap Foundation tile usage policy%3" ).arg( rasterLayer->name(), QStringLiteral( "<a href=\"https://operations.osmfoundation.org/policies/tiles/\">" ), QStringLiteral( "</a>" ) ),

diff --git a/src/analysis/processing/qgsalgorithmxyztiles.cpp b/src/analysis/processing/qgsalgorithmxyztiles.cpp
@@ -189,7 +189,7 @@ bool QgsXyzTilesBaseAlgorithm::prepareAlgorithm( const QVariantMap &parameters,
 
 void QgsXyzTilesBaseAlgorithm::checkLayersUsagePolicy( QgsProcessingFeedback *feedback )
 {
-  if ( mTotalTiles > 5000 )
+  if ( mTotalTiles > MAXIMUM_OPENSTREETMAP_TILES_FETCH )
   {
     for ( QgsMapLayer *layer : std::as_const( mLayers ) )
     {

diff --git a/src/core/qgsmaplayerutils.h b/src/core/qgsmaplayerutils.h
@@ -17,6 +17,8 @@
 #ifndef QGSMAPLAYERUTILS_H
 #define QGSMAPLAYERUTILS_H
 
+#define MAXIMUM_OPENSTREETMAP_TILES_FETCH  5000
+
 #include "qgis_sip.h"
 #include "qgis_core.h"
 #include "qgis.h"

diff --git a/src/gui/qgsrasterlayersaveasdialog.cpp b/src/gui/qgsrasterlayersaveasdialog.cpp
@@ -970,10 +970,10 @@ void QgsRasterLayerSaveAsDialog::accept()
     const int nbTilesHeight = std::ceil( nRows() / 256 );
     int64_t totalTiles = static_cast<int64_t>( nbTilesWidth ) * nbTilesHeight;
 
-    if ( totalTiles > 5000 )
+    if ( totalTiles > MAXIMUM_OPENSTREETMAP_TILES_FETCH )
     {
       QMessageBox::warning( this, tr( "Save Raster Layer" ),
-                            tr( "The number of OpenStreetMap tiles needed to produce the raster layer is too large and will leads to bulk downloading behavior which is prohibited by the %1OpenStreetMap Foundation tile usage policy%2." ).arg( QStringLiteral( "<a href=\"https://operations.osmfoundation.org/policies/tiles/\">" ), QStringLiteral( "</a>" ) ),
+                            tr( "The number of OpenStreetMap tiles needed to produce the raster layer is too large and will lead to bulk downloading behavior which is prohibited by the %1OpenStreetMap Foundation tile usage policy%2." ).arg( QStringLiteral( "<a href=\"https://operations.osmfoundation.org/policies/tiles/\">" ), QStringLiteral( "</a>" ) ),
                             QMessageBox::Ok );
       return;
     }