Some more cosmetic optimizations

src/GUI/mapview.cpp

@@ -18,7 +18,7 @@
 
 #define MAX_DIGITAL_ZOOM 2
 #define MIN_DIGITAL_ZOOM -3
-#define MARGIN           10.0
+#define MARGIN           10
 #define SCALE_OFFSET     7
 
 MapView::MapView(Map *map, POI *poi, QWidget *parent)

src/common/coordinates.h

@@ -32,6 +32,8 @@ private:
 	double _lat, _lon;
 };
 
+Q_DECLARE_TYPEINFO(Coordinates, Q_PRIMITIVE_TYPE);
+
 inline bool operator==(const Coordinates &c1, const Coordinates &c2)
   {return (c1.lat() == c2.lat() && c1.lon() == c2.lon());}
 inline bool operator!=(const Coordinates &c1, const Coordinates &c2)

src/map/onlinemap.cpp

@@ -92,13 +92,17 @@ void OnlineMap::draw(QPainter *painter, const QRectF &rect, Flags flags)
 	QPointF tl(floor(rect.left() / tileSize())
 	  * tileSize(), floor(rect.top() / tileSize()) * tileSize());
 
-	QList<Tile> tiles;
 	QSizeF s(qMin(rect.right() - tl.x(), b.width()),
 	  qMin(rect.bottom() - tl.y(), b.height()));
-	for (int i = 0; i < ceil(s.width() / tileSize()); i++)
+	int width = ceil(s.width() / tileSize());
-		for (int j = 0; j < ceil(s.height() / tileSize()); j++)
+	int height = ceil(s.height() / tileSize());
-			tiles.append(Tile(QPoint(tile.x() + i,
+
-			  _invertY ? (1<<_zoom) - (tile.y() + j) - 1 : tile.y() + j), _zoom));
+	QVector<Tile> tiles;
+	tiles.reserve(width * height);
+	for (int i = 0; i < width; i++)
+		for (int j = 0; j < height; j++)
+			tiles.append(Tile(QPoint(tile.x() + i, _invertY ? (1<<_zoom)
+			  - (tile.y() + j) - 1 : tile.y() + j), _zoom));
 
 	if (flags & Map::Block)
 		_tileLoader->loadTilesSync(tiles);

src/map/tile.h

@@ -10,6 +10,7 @@
 class Tile
 {
 public:
+	Tile() {}
 	Tile(const QPoint &xy, const QVariant &zoom, const RectD &bbox = RectD())
 		{_xy = xy; _zoom = zoom; _bbox = bbox;}
 

src/map/tileloader.cpp

@@ -24,7 +24,7 @@ TileLoader::TileLoader(const QString &dir, QObject *parent)
 	connect(_downloader, SIGNAL(finished()), this, SIGNAL(finished()));
 }
 
-void TileLoader::loadTilesAsync(QList<Tile> &list)
+void TileLoader::loadTilesAsync(QVector<Tile> &list)
 {
 	QList<Download> dl;
 
@@ -48,7 +48,7 @@ void TileLoader::loadTilesAsync(QList<Tile> &list)
 		_downloader->get(dl, _authorization);
 }
 
-void TileLoader::loadTilesSync(QList<Tile> &list)
+void TileLoader::loadTilesSync(QVector<Tile> &list)
 {
 	QList<Download> dl;
 

src/map/tileloader.h

@@ -17,8 +17,8 @@ public:
 	void setAuthorization(const Authorization &authorization)
 	  {_authorization = authorization;}
 
-	void loadTilesAsync(QList<Tile> &list);
+	void loadTilesAsync(QVector<Tile> &list);
-	void loadTilesSync(QList<Tile> &list);
+	void loadTilesSync(QVector<Tile> &list);
 	void clearCache();
 
 signals:

src/map/wmsmap.cpp

@@ -193,7 +193,8 @@ void WMSMap::draw(QPainter *painter, const QRectF &rect, Flags flags)
 	QPoint br = QPoint((int)ceil(rect.right() / tileSize()),
 	  (int)ceil(rect.bottom() / tileSize()));
 
-	QList<Tile> tiles;
+	QVector<Tile> tiles;
+	tiles.reserve((br.x() - tl.x()) * (br.y() - tl.y()));
 	for (int i = tl.x(); i < br.x(); i++) {
 		for (int j = tl.y(); j < br.y(); j++) {
 			PointD ttl(_transform.img2proj(QPointF(i * TILE_SIZE,

src/map/wmtsmap.cpp

@@ -173,7 +173,8 @@ void WMTSMap::draw(QPainter *painter, const QRectF &rect, Flags flags)
 	QPoint br = QPoint((int)ceil(rect.right() / ts.width()),
 	  (int)ceil(rect.bottom() / ts.height()));
 
-	QList<Tile> tiles;
+	QVector<Tile> tiles;
+	tiles.reserve((br.x() - tl.x()) * (br.y() - tl.y()));
 	for (int i = tl.x(); i < br.x(); i++)
 		for (int j = tl.y(); j < br.y(); j++)
 			tiles.append(Tile(QPoint(i, j), z.id()));