From a458b82e374985f8595c8ab24298af499f8a31db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20T=C5=AFma?= <tumic@cbox.cz>
Date: Wed, 11 Jan 2017 22:14:01 +0100
Subject: [PATCH] Code cleanup

---
 src/pathview.cpp  | 19 ++++++++-----------
 src/scaleitem.cpp |  2 +-
 src/trackitem.cpp |  1 -
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/pathview.cpp b/src/pathview.cpp
index 5001da40..144cf4de 100644
--- a/src/pathview.cpp
+++ b/src/pathview.cpp
@@ -31,13 +31,12 @@ static QPoint mercator2tile(const QPointF &m, int z)
 
 static QPointF tile2mercator(const QPoint &tile, int z)
 {
-	Coordinates m;
+	QPointF m;
 
-	m.setLon(tile.x() / (qreal)(1<<z) * 360.0 - 180.0);
-	qreal n = M_PI - 2.0 * M_PI * tile.y() / (qreal)(1<<z);
-	m.setLat(rad2deg(atan(0.5 * (exp(n) - exp(-n)))));
+	m.setX(((360.0 * tile.x()) / (qreal)(1<<z)) - 180.0);
+	m.setY((1.0 - (2.0 * tile.y()) / (qreal)(1<<z)) * 180.0);
 
-	return m.toMercator();
+	return m;
 }
 
 static int scale2zoom(qreal scale)
@@ -660,15 +659,13 @@ void PathView::drawBackground(QPainter *painter, const QRectF &rect)
 	QPoint tile = mercator2tile(QPointF(rr.topLeft().x(), -rr.topLeft().y()),
 	  _zoom);
 	QPointF tm = tile2mercator(tile, _zoom);
-	QPoint tl = mapToScene(mapFromScene(QPointF(tm.x() / scale,
-	  -tm.y() / scale))).toPoint();
+	QPoint tl = QPoint((int)(tm.x() / scale), (int)(-tm.y() / scale));
+
 
 	QList<Tile> tiles;
-	for (int i = 0; i <= rr.size().width() / Tile::size() + 1; i++) {
-		for (int j = 0; j <= rr.size().height() / Tile::size() + 1; j++) {
+	for (int i = 0; i <= rr.size().width() / Tile::size() + 1; i++)
+		for (int j = 0; j <= rr.size().height() / Tile::size() + 1; j++)
 			tiles.append(Tile(QPoint(tile.x() + i, tile.y() + j), _zoom));
-		}
-	}
 
 	_map->loadTiles(tiles, _plot);
 
diff --git a/src/scaleitem.cpp b/src/scaleitem.cpp
index 118ca14e..8299c09b 100644
--- a/src/scaleitem.cpp
+++ b/src/scaleitem.cpp
@@ -16,7 +16,7 @@
 static qreal zoom2resolution(int zoom, qreal y)
 {
 	return (WGS84_RADIUS * 2 * M_PI / Tile::size()
-	  * cos(2 * atan(exp(deg2rad(y))) - M_PI/2)) / (qreal)(1<<zoom);
+	  * cos(2.0 * atan(exp(deg2rad(y))) - M_PI/2)) / (qreal)(1<<zoom);
 }
 
 ScaleItem::ScaleItem(QGraphicsItem *parent) : QGraphicsItem(parent)
diff --git a/src/trackitem.cpp b/src/trackitem.cpp
index 730522a0..1bead141 100644
--- a/src/trackitem.cpp
+++ b/src/trackitem.cpp
@@ -1,4 +1,3 @@
-#include <QCursor>
 #include <QPainter>
 #include "format.h"
 #include "tooltip.h"