src/GUI/mapview.cpp

@@ -726,7 +726,7 @@ void MapView::plot(QPainter *painter, const QRectF &target, qreal scale,
   PlotFlags flags)
 {
 	QRect orig, adj;
-	qreal mapRatio, ratio, diff, q, p;
+	qreal ratio, diff, q, p;
 	QPointF scenePos, scalePos, posPos, motionPos;
 	int zoom;
 
@@ -734,6 +734,7 @@ void MapView::plot(QPainter *painter, const QRectF &target, qreal scale,
 	// Enter plot mode
 	setUpdatesEnabled(false);
 	_plot = true;
+	_map->setDevicePixelRatio(_deviceRatio, 1.0);
 
 	// Compute sizes & ratios
 	orig = viewport()->rect();
@@ -752,9 +753,6 @@ void MapView::plot(QPainter *painter, const QRectF &target, qreal scale,
 	}
 
 	// Expand the view if plotting into a bitmap
-	mapRatio = _mapRatio;
-	setDevicePixelRatio(_deviceRatio, 1.0);
-
 	if (flags & Expand) {
 		qreal xdiff = (target.width() - adj.width()) / 2.0;
 		qreal ydiff = (target.height() - adj.height()) / 2.0;
@@ -807,9 +805,6 @@ void MapView::plot(QPainter *painter, const QRectF &target, qreal scale,
 		rescale();
 		centerOn(scenePos);
 	}
-
-	setDevicePixelRatio(_deviceRatio, mapRatio);
-
 	_mapScale->setDigitalZoom(_digitalZoom);
 	_mapScale->setPos(scalePos);
 	_positionCoordinates->setDigitalZoom(_digitalZoom);
@@ -818,6 +813,7 @@ void MapView::plot(QPainter *painter, const QRectF &target, qreal scale,
 	_motionInfo->setPos(motionPos);
 
 	// Exit plot mode
+	_map->setDevicePixelRatio(_deviceRatio, _mapRatio);
 	_plot = false;
 	setUpdatesEnabled(true);
 }

src/map/mapsforgemap.cpp

@@ -164,6 +164,8 @@ void MapsforgeMap::cancelJobs()
 
 void MapsforgeMap::draw(QPainter *painter, const QRectF &rect, Flags flags)
 {
+	Q_UNUSED(flags);
+
 	QPointF tl(floor(rect.left() / _data.tileSize()) * _data.tileSize(),
 	  floor(rect.top() / _data.tileSize()) * _data.tileSize());
 	QSizeF s(rect.right() - tl.x(), rect.bottom() - tl.y());
@@ -213,20 +215,8 @@ void MapsforgeMap::draw(QPainter *painter, const QRectF &rect, Flags flags)
 		}
 	}
 
-	if (!tiles.isEmpty()) {
-		if (flags & Map::Block) {
-			QFuture<void> future = QtConcurrent::map(tiles, &RasterTile::render);
-			future.waitForFinished();
-
-			for (int i = 0; i < tiles.size(); i++) {
-				const RasterTile &mt = tiles.at(i);
-				const QPixmap &pm = mt.pixmap();
-				painter->drawPixmap(mt.xy(), pm);
-				QPixmapCache::insert(key(mt.zoom(), mt.xy()), pm);
-			}
-		} else
-			runJob(new MapsforgeMapJob(tiles));
-	}
+	if (!tiles.isEmpty())
+		runJob(new MapsforgeMapJob(tiles));
 }
 
 void MapsforgeMap::setDevicePixelRatio(qreal deviceRatio, qreal mapRatio)