From 738b49668c66a6b9565ae0934078dc79fb8cdfdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20T=C5=AFma?= <tumic@cbox.cz>
Date: Tue, 28 May 2019 07:26:13 +0200
Subject: [PATCH] Fixed broken WMS scale denominators -> zooms transition

---
 src/map/wmsmap.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/map/wmsmap.cpp b/src/map/wmsmap.cpp
index 7261fecf..b55a337a 100644
--- a/src/map/wmsmap.cpp
+++ b/src/map/wmsmap.cpp
@@ -11,6 +11,7 @@
 
 #define CAPABILITIES_FILE "capabilities.xml"
 #define TILE_SIZE 256
+#define EPSILON 1e-6
 
 double WMSMap::sd2res(double scaleDenominator) const
 {
@@ -50,14 +51,15 @@ void WMSMap::computeZooms(const RangeF &scaleDenominator)
 	_zooms.clear();
 
 	if (scaleDenominator.size() > 0) {
-		double ld = log2(scaleDenominator.max()) - log2(scaleDenominator.min());
+		double ld = log2(scaleDenominator.max() - EPSILON)
+		  - log2(scaleDenominator.min() + EPSILON);
 		int cld = (int)ceil(ld);
 		double step = ld / (double)cld;
-		double lmax = log2(scaleDenominator.max());
+		double lmax = log2(scaleDenominator.max() - EPSILON);
 		for (int i = 0; i <= cld; i++)
 			_zooms.append(pow(2.0, lmax - i * step));
 	} else
-		_zooms.append(scaleDenominator.min());
+		_zooms.append(scaleDenominator.min() + EPSILON);
 }
 
 void WMSMap::updateTransform()
@@ -194,8 +196,8 @@ void WMSMap::draw(QPainter *painter, const QRectF &rect, Flags flags)
 		for (int j = tl.y(); j < br.y(); j++) {
 			PointD ttl(_transform.img2proj(QPointF(i * TILE_SIZE,
 			  j * TILE_SIZE)));
-			PointD tbr(_transform.img2proj(QPointF(i * TILE_SIZE + TILE_SIZE
-			  - 1, j * TILE_SIZE + TILE_SIZE - 1)));
+			PointD tbr(_transform.img2proj(QPointF(i * TILE_SIZE + TILE_SIZE,
+			  j * TILE_SIZE + TILE_SIZE)));
 			RectD bbox = (_cs.axisOrder() == CoordinateSystem::YX)
 			  ? RectD(PointD(tbr.y(), tbr.x()), PointD(ttl.y(), ttl.x()))
 			  : RectD(ttl, tbr);