fix MapView, so tile provider can be accessible
add MapViewTileProviderBase::maximumLevel()
This commit is contained in:
@@ -4,7 +4,7 @@
|
||||
|
||||
|
||||
MapViewTileDownloader::MapViewTileDownloader(MapView * p): QThread() {
|
||||
qRegisterMetaType<OSM::TileIndex>();
|
||||
qRegisterMetaType<MapViewTypes::TileIndex>();
|
||||
parent = p;
|
||||
start();
|
||||
}
|
||||
@@ -18,7 +18,7 @@ MapViewTileDownloader::~MapViewTileDownloader() {
|
||||
}
|
||||
|
||||
|
||||
bool MapViewTileDownloader::queueTile(OSM::TileIndex index, bool force) {
|
||||
bool MapViewTileDownloader::queueTile(MapViewTypes::TileIndex index, bool force) {
|
||||
// auto hash = tile.hash();
|
||||
bool ret = false;
|
||||
cond_mutex.lock();
|
||||
@@ -32,7 +32,7 @@ bool MapViewTileDownloader::queueTile(OSM::TileIndex index, bool force) {
|
||||
}
|
||||
|
||||
|
||||
void MapViewTileDownloader::queueTiles(QList<OSM::TileIndex> indeces) {
|
||||
void MapViewTileDownloader::queueTiles(QList<MapViewTypes::TileIndex> indeces) {
|
||||
cond_mutex.lock();
|
||||
queue << indeces;
|
||||
cond.wakeOne();
|
||||
@@ -62,13 +62,13 @@ void MapViewTileDownloader::setTileProvider(MapViewTileProviderBase * p) {
|
||||
}
|
||||
|
||||
|
||||
void MapViewTileDownloader::requestTile(OSM::TileIndex index) {
|
||||
void MapViewTileDownloader::requestTile(MapViewTypes::TileIndex index) {
|
||||
if (!provider) return;
|
||||
provider->requestTile(index);
|
||||
}
|
||||
|
||||
|
||||
void MapViewTileDownloader::tileReady(OSM::TileIndex index, QPixmap pm) {
|
||||
void MapViewTileDownloader::tileReady(MapViewTypes::TileIndex index, QPixmap pm) {
|
||||
if (!pm.isNull()) parent->cache->tileDownloaded(index, pm);
|
||||
cond_mutex.lock();
|
||||
in_progress.remove(index.hash());
|
||||
|
||||
Reference in New Issue
Block a user