Make QgsTileMatrix::tileRangeFromExtent() const

Because there is no reason for it not to be.
qgis · Oct 23, 2021 · 9329891 · 9329891
1 parent 496bd6f
commit 9329891
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/python/core/auto_generated/qgstiles.sip.in b/python/core/auto_generated/qgstiles.sip.in
@@ -165,7 +165,7 @@ Returns extent of the given tile in this matrix
 Returns center of the given tile in this matrix
 %End
 
-    QgsTileRange tileRangeFromExtent( const QgsRectangle &mExtent );
+    QgsTileRange tileRangeFromExtent( const QgsRectangle &mExtent ) const;
 %Docstring
 Returns tile range that fully covers the given extent
 %End

diff --git a/src/core/qgstiles.cpp b/src/core/qgstiles.cpp
@@ -93,7 +93,7 @@ QgsPointXY QgsTileMatrix::tileCenter( QgsTileXYZ id ) const
   return QgsPointXY( x, y );
 }
 
-QgsTileRange QgsTileMatrix::tileRangeFromExtent( const QgsRectangle &r )
+QgsTileRange QgsTileMatrix::tileRangeFromExtent( const QgsRectangle &r ) const
 {
   double x0 = std::clamp( r.xMinimum(), mExtent.xMinimum(), mExtent.xMaximum() );
   double y0 = std::clamp( r.yMinimum(), mExtent.yMinimum(), mExtent.yMaximum() );

diff --git a/src/core/qgstiles.h b/src/core/qgstiles.h
@@ -140,7 +140,7 @@ class CORE_EXPORT QgsTileMatrix
     QgsPointXY tileCenter( QgsTileXYZ id ) const;
 
     //! Returns tile range that fully covers the given extent
-    QgsTileRange tileRangeFromExtent( const QgsRectangle &mExtent );
+    QgsTileRange tileRangeFromExtent( const QgsRectangle &mExtent ) const;
 
     //! Returns row/column coordinates (floating point number) from the given point in map coordinates
     QPointF mapToTileCoordinates( const QgsPointXY &mapPoint ) const;

diff --git a/src/core/vectortile/qgsvectortilewriter.cpp b/src/core/vectortile/qgsvectortilewriter.cpp
@@ -106,7 +106,7 @@ bool QgsVectorTileWriter::writeTiles( QgsFeedback *feedback )
   int tilesToCreate = 0;
   for ( int zoomLevel = mMinZoom; zoomLevel <= mMaxZoom; ++zoomLevel )
   {
-    QgsTileMatrix tileMatrix = QgsTileMatrix::fromTileMatrix( zoomLevel, mRootTileMatrix );
+    const QgsTileMatrix tileMatrix = QgsTileMatrix::fromTileMatrix( zoomLevel, mRootTileMatrix );
 
     QgsTileRange tileRange = tileMatrix.tileRangeFromExtent( outputExtent );
     tilesToCreate += ( tileRange.endRow() - tileRange.startRow() + 1 ) *
@@ -168,7 +168,7 @@ bool QgsVectorTileWriter::writeTiles( QgsFeedback *feedback )
   int tilesCreated = 0;
   for ( int zoomLevel = mMinZoom; zoomLevel <= mMaxZoom; ++zoomLevel )
   {
-    QgsTileMatrix tileMatrix = QgsTileMatrix::fromTileMatrix( zoomLevel, mRootTileMatrix );
+    const QgsTileMatrix tileMatrix = QgsTileMatrix::fromTileMatrix( zoomLevel, mRootTileMatrix );
 
     QgsTileRange tileRange = tileMatrix.tileRangeFromExtent( outputExtent );
     for ( int row = tileRange.startRow(); row <= tileRange.endRow(); ++row )

diff --git a/src/gui/qgsmaptoolidentify.cpp b/src/gui/qgsmaptoolidentify.cpp
@@ -453,7 +453,7 @@ bool QgsMapToolIdentify::identifyVectorTileLayer( QList<QgsMapToolIdentify::Iden
     }
 
     int tileZoom = QgsVectorTileUtils::scaleToZoomLevel( mCanvas->scale(), layer->sourceMinZoom(), layer->sourceMaxZoom() );
-    QgsTileMatrix tileMatrix = QgsTileMatrix::fromWebMercator( tileZoom );
+    const QgsTileMatrix tileMatrix = QgsTileMatrix::fromWebMercator( tileZoom );
     QgsTileRange tileRange = tileMatrix.tileRangeFromExtent( r );
 
     for ( int row = tileRange.startRow(); row <= tileRange.endRow(); ++row )