src/map/atlas.cpp

@@ -7,7 +7,7 @@
 #include "atlas.h"
 
 
-#define ZOOM_THRESHOLD 0.8
+#define ZOOM_THRESHOLD 0.9
 
 #define TL(m) ((m)->xy2pp((m)->bounds().topLeft()))
 #define BR(m) ((m)->xy2pp((m)->bounds().bottomRight()))

src/map/map.cpp

@@ -62,17 +62,9 @@ RectC Map::llBounds()
 
 qreal Map::resolution(const QRectF &rect)
 {
-	/* The haversine formula used in Coordinates::distanceTo() only gives
+	qreal cy = rect.center().y();
-	   "half world" distances and shorter so we have to use only the center
+	QPointF cl(rect.left(), cy);
-	   "half rectangle" in case e.g. world map bounds are on the input */
+	QPointF cr(rect.right(), cy);
-	QRectF halfRect(QPointF(rect.left() + (rect.width() / 4.0),
-	  rect.top() + (rect.height() / 4.0)),
-	  QPointF(rect.right() - (rect.width() / 4.0),
-	  rect.bottom() - (rect.height() / 4.0)));
-
-	qreal cy = halfRect.center().y();
-	QPointF cl(halfRect.left(), cy);
-	QPointF cr(halfRect.right(), cy);
 
 	qreal ds = xy2ll(cl).distanceTo(xy2ll(cr));
 	qreal ps = QLineF(cl, cr).length();