root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2024-11-30 22:51:16 +01:00
Code Issues Projects Releases Activity

Fixed broken WMS scale denominators -> zooms transition

Browse Source
This commit is contained in:
Martin Tůma 2019-05-28 07:26:13 +02:00
parent 48674bb50b
commit 738b49668c
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/map/wmsmap.cpp
View File

@ -11,6 +11,7 @@
#define CAPABILITIES_FILE "capabilities.xml" #define CAPABILITIES_FILE "capabilities.xml"
#define TILE_SIZE 256 #define TILE_SIZE 256
#define EPSILON 1e-6
double WMSMap::sd2res(double scaleDenominator) const double WMSMap::sd2res(double scaleDenominator) const
{ {
@ -50,14 +51,15 @@ void WMSMap::computeZooms(const RangeF &scaleDenominator)
_zooms.clear(); _zooms.clear();
if (scaleDenominator.size() > 0) { 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); int cld = (int)ceil(ld);
double step = ld / (double)cld; double step = ld / (double)cld;
double lmax = log2(scaleDenominator.max()); double lmax = log2(scaleDenominator.max() - EPSILON);
for (int i = 0; i <= cld; i++) for (int i = 0; i <= cld; i++)
_zooms.append(pow(2.0, lmax - i * step)); _zooms.append(pow(2.0, lmax - i * step));
} else } else
_zooms.append(scaleDenominator.min()); _zooms.append(scaleDenominator.min() + EPSILON);
} }
void WMSMap::updateTransform() 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++) { for (int j = tl.y(); j < br.y(); j++) {
PointD ttl(_transform.img2proj(QPointF(i * TILE_SIZE, PointD ttl(_transform.img2proj(QPointF(i * TILE_SIZE,
j * TILE_SIZE))); j * TILE_SIZE)));
PointD tbr(_transform.img2proj(QPointF(i * TILE_SIZE + TILE_SIZE PointD tbr(_transform.img2proj(QPointF(i * TILE_SIZE + TILE_SIZE,
- 1, j * TILE_SIZE + TILE_SIZE - 1))); j * TILE_SIZE + TILE_SIZE)));
RectD bbox = (_cs.axisOrder() == CoordinateSystem::YX) RectD bbox = (_cs.axisOrder() == CoordinateSystem::YX)
? RectD(PointD(tbr.y(), tbr.x()), PointD(ttl.y(), ttl.x())) ? RectD(PointD(tbr.y(), tbr.x()), PointD(ttl.y(), ttl.x()))
: RectD(ttl, tbr); : RectD(ttl, tbr);