diff --git a/src/map/onlinemap.cpp b/src/map/onlinemap.cpp index 752189d3..aa9da20a 100644 --- a/src/map/onlinemap.cpp +++ b/src/map/onlinemap.cpp @@ -15,7 +15,7 @@ OnlineMap::OnlineMap(const QString &fileName, const QString &name, const QList &headers, int tileSize, bool scalable, bool invertY, bool quadTiles, QObject *parent) : Map(fileName, parent), _name(name), _zooms(zooms), _bounds(bounds), - _zoom(_zooms.max()), _tileSize(tileSize), _base(0), _mapRatio(1.0), + _zoom(_zooms.max()), _tileSize(tileSize), _baseZoom(0), _mapRatio(1.0), _tileRatio(tileRatio), _scalable(scalable), _scaledSize(0), _invertY(invertY) { _tileLoader = new TileLoader(QDir(ProgramPaths::tilesDir()).filePath(_name), @@ -25,7 +25,7 @@ OnlineMap::OnlineMap(const QString &fileName, const QString &name, connect(_tileLoader, &TileLoader::finished, this, &OnlineMap::tilesLoaded); if (_scalable) { - _base = _zooms.max(); + _baseZoom = _zooms.max(); _zooms.setMax(qMin(_zooms.max() + MAX_OVERZOOM, OSM::ZOOMS.max())); } } @@ -168,14 +168,14 @@ void OnlineMap::cancelJobs(bool wait) void OnlineMap::draw(QPainter *painter, const QRectF &rect, Flags flags) { - int base = _scalable ? qMin(_base, _zoom) : _zoom; - unsigned overzoom = _zoom - base; + int baseZoom = _scalable ? qMin(_baseZoom, _zoom) : _zoom; + unsigned overzoom = _zoom - baseZoom; unsigned f = 1U<