Fixed special cases scene rect computation

src/pathview.cpp

@@ -180,10 +180,13 @@ void PathView::addWaypoints(const QList<Waypoint> &waypoints)
 		wi->setVisible(_showWaypoints);
 		_scene->addItem(wi);
 
-		if (!_wr.isNull())
+		if (_wr.isNull()) {
+			if (_wp.isNull())
+				_wp = wi->coordinates();
+			else
+				_wr = qrectf(_wp, wi->coordinates());
+		} else
 			unite(_wr, wi->coordinates());
-		else if (i > 1)
-			_wr = qrectf(_waypoints.last()->coordinates(), wi->coordinates());
 
 		_waypoints.append(wi);
 	}
@@ -215,14 +218,11 @@ QList<PathItem *> PathView::loadData(const Data &data)
 	else
 		updatePOIVisibility();
 
-	qreal scale = mapScale(_zoom);
+	QRectF sr = contentsSceneRect();
-	QRectF br = scaled(_tr | _rr | _wr, 1.0/scale);
+	_scene->setSceneRect(sr);
-	QRectF ba = br.adjusted(-Tile::size(), -Tile::size(), Tile::size(),
+	centerOn(sr.center());
-	  Tile::size());
-	_scene->setSceneRect(ba);
-	centerOn(ba.center());
 
-	_mapScale->setZoom(_zoom, -(br.center().ry() * mapScale(_zoom)));
+	_mapScale->setZoom(_zoom, -(sr.center().ry() * mapScale(_zoom)));
 	if (_mapScale->scene() != _scene)
 		_scene->addItem(_mapScale);
 
@@ -242,6 +242,19 @@ qreal PathView::contentsScale() const
 	return qMax(sc.x(), sc.y());
 }
 
+QRectF PathView::contentsSceneRect() const
+{
+	qreal scale = mapScale(_zoom);
+	QRectF br = scaled(_tr | _rr | _wr, 1.0/scale);
+
+	if (br.isNull())
+		return QRectF(QPointF(_wp.x() / scale - Tile::size()/2,
+		  _wp.y() /scale - Tile::size()/2), QSizeF(Tile::size(), Tile::size()));
+	else
+		return br.adjusted(-Tile::size(), -Tile::size(), Tile::size(),
+		  Tile::size());
+}
+
 void PathView::updatePOIVisibility()
 {
 	QHash<Waypoint, WaypointItem*>::const_iterator it, jt;
@@ -395,17 +408,15 @@ void PathView::zoom(int z, const QPoint &pos)
 	_zoom = z;
 
 	rescale(_zoom);
-	qreal scale = mapScale(_zoom);
-	QRectF br = scaled(_tr | _rr | _wr, 1.0/scale);
-	QRectF ba = br.adjusted(-Tile::size(), -Tile::size(), Tile::size(),
-	  Tile::size());
-	_scene->setSceneRect(ba);
 
-	if (br.width() < viewport()->size().width()
+	QRectF sr = contentsSceneRect();
-	  && br.height() < viewport()->size().height())
+	_scene->setSceneRect(sr);
-		centerOn(br.center());
+
+	if (sr.width() < viewport()->size().width()
+	  && sr.height() < viewport()->size().height())
+		centerOn(sr.center());
 	else
-		centerOn((spos * (os/scale)) - offset);
+		centerOn((spos * (os/mapScale(_zoom))) - offset);
 
 	_mapScale->setZoom(_zoom);
 
@@ -494,6 +505,7 @@ void PathView::clear()
 
 	_zoom = ZOOM_MAX;
 	_tr = QRectF(); _rr = QRectF(); _wr = QRectF();
+	_wp = QPointF();
 
 	_scene->setSceneRect(QRectF());
 }
@@ -610,23 +622,20 @@ void PathView::resizeEvent(QResizeEvent *event)
 
 	rescale();
 
-	qreal scale = mapScale(_zoom);
+	QRectF sr = contentsSceneRect();
-	QRectF br = scaled(_tr | _rr | _wr, 1.0/scale);
-	QRectF ba = br.adjusted(-Tile::size(), -Tile::size(), Tile::size(),
-	  Tile::size());
 
-	if (ba.width() < event->size().width()) {
+	if (sr.width() < event->size().width()) {
-		qreal diff = event->size().width() - ba.width();
+		qreal diff = event->size().width() - sr.width();
-		ba.adjust(-diff/2, 0, diff/2, 0);
+		sr.adjust(-diff/2, 0, diff/2, 0);
 	}
-	if (ba.height() < event->size().height()) {
+	if (sr.height() < event->size().height()) {
-		qreal diff = event->size().height() - ba.height();
+		qreal diff = event->size().height() - sr.height();
-		ba.adjust(0, -diff/2, 0, diff/2);
+		sr.adjust(0, -diff/2, 0, diff/2);
 	}
 
-	_scene->setSceneRect(ba);
+	_scene->setSceneRect(sr);
+	centerOn(sr.center());
 
-	centerOn(br.center());
 	resetCachedContent();
 }
 

src/pathview.h

@@ -66,6 +66,7 @@ private:
 	void clearPOI();
 
 	qreal contentsScale() const;
+	QRectF contentsSceneRect() const;
 	void rescale(int zoom);
 	void rescale();
 	void zoom(int z, const QPoint &pos);
@@ -87,6 +88,7 @@ private:
 
 	int _zoom;
 	QRectF _tr, _rr, _wr;
+	QPointF _wp;
 
 	Map *_map;
 	POI *_poi;