Skip to content

Commit be95458

Browse files
committed
Always show WMTS/XYZ layers in preview jobs (to pre-warm cache)
1 parent 5ee9cdd commit be95458

File tree

4 files changed

+12
-4
lines changed

4 files changed

+12
-4
lines changed

src/core/qgsdataprovider.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ void QgsDataProvider::setListening( bool isListening )
4242
Q_UNUSED( isListening );
4343
}
4444

45-
bool QgsDataProvider::renderInPreview( QgsDataProvider::PreviewContext context )
45+
bool QgsDataProvider::renderInPreview( const PreviewContext &context )
4646
{
4747
return context.lastRenderingTimeMs <= context.maxRenderingTimeMs;
4848
}

src/core/qgsdataprovider.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,7 @@ class CORE_EXPORT QgsDataProvider : public QObject
490490
*
491491
* \note not available in Python bindings
492492
*/
493-
virtual bool renderInPreview( QgsDataProvider::PreviewContext context ); // SIP_SKIP
493+
virtual bool renderInPreview( const QgsDataProvider::PreviewContext &context ); // SIP_SKIP
494494

495495
signals:
496496

src/providers/wms/qgswmsprovider.cpp

+9-2
Original file line numberDiff line numberDiff line change
@@ -3199,18 +3199,25 @@ QString QgsWmsProvider::lastErrorFormat()
31993199
QString QgsWmsProvider::name() const
32003200
{
32013201
return WMS_KEY;
3202-
} // QgsWmsProvider::name()
3202+
}
32033203

32043204

32053205
QString QgsWmsProvider::description() const
32063206
{
32073207
return WMS_DESCRIPTION;
3208-
} // QgsWmsProvider::description()
3208+
}
32093209

32103210
void QgsWmsProvider::reloadData()
32113211
{
32123212
}
32133213

3214+
bool QgsWmsProvider::renderInPreview( const QgsDataProvider::PreviewContext &context )
3215+
{
3216+
if ( mSettings.mTiled || mSettings.mXyz )
3217+
return true;
3218+
3219+
return QgsRasterDataProvider::renderInPreview( context );
3220+
}
32143221

32153222
QVector<QgsWmsSupportedFormat> QgsWmsProvider::supportedFormats()
32163223
{

src/providers/wms/qgswmsprovider.h

+1
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,7 @@ class QgsWmsProvider : public QgsRasterDataProvider
208208
QString name() const override;
209209
QString description() const override;
210210
virtual void reloadData() override;
211+
bool renderInPreview( const QgsDataProvider::PreviewContext &context ) override;
211212

212213
static QVector<QgsWmsSupportedFormat> supportedFormats();
213214

0 commit comments

Comments
 (0)