Skip to content
Permalink
Browse files

fix wmts (fixes #12241; followup 1e97b62)

  • Loading branch information
jef-n committed Feb 24, 2015
1 parent 06e2186 commit 251aca6dca10171be67cac245e8b37553304f042
Showing with 8 additions and 6 deletions.
  1. +8 −6 src/providers/wms/qgswmsprovider.cpp
@@ -559,8 +559,9 @@ QImage *QgsWmsProvider::draw( QgsRectangle const &viewExtent, int pixelWidth, in
//t.start();

}
else if ( mSettings.mMaxWidth != 0 && mSettings.mMaxHeight != 0 )
else
{
QgsDebugMsg( QString( "mTiled:%1 mMaxWidth:%2 mMaxHeight:%3" ).arg( mSettings.mTiled ).arg( mSettings.mMaxWidth ).arg( mSettings.mMaxHeight ) );
mTileReqNo++;

double vres = viewExtent.width() / pixelWidth;
@@ -598,7 +599,7 @@ QImage *QgsWmsProvider::draw( QgsRectangle const &viewExtent, int pixelWidth, in

tileMode = mTileLayer->tileMode;
}
else
else if ( mSettings.mMaxWidth != 0 && mSettings.mMaxHeight && != 0 )
{
static QgsWmtsTileMatrix tempTm;
tempTm.topLeft = QgsPoint( mLayerExtent.xMinimum(), mLayerExtent.yMaximum() );
@@ -610,6 +611,11 @@ QImage *QgsWmsProvider::draw( QgsRectangle const &viewExtent, int pixelWidth, in

tileMode = WMSC;
}
else
{
QgsDebugMsg( "empty tile size" );
return mCacheImage;
}

QgsDebugMsg( QString( "layer extent: %1,%2 %3x%4" )
.arg( qgsDoubleToString( mLayerExtent.xMinimum() ) )
@@ -831,10 +837,6 @@ QImage *QgsWmsProvider::draw( QgsRectangle const &viewExtent, int pixelWidth, in
);
#endif
}
else
{
QgsDebugMsg( "empty tile size" );
}

return mCachedImage;
}

0 comments on commit 251aca6

Please sign in to comment.
You can’t perform that action at this time.