diff --git a/qtviewer_planetosm/osmtiles/layer_tiles.cpp b/qtviewer_planetosm/osmtiles/layer_tiles.cpp index cb28eee68b55158cb1277521932c51c65b97c2ef..7579a9da2e2cffc8254ef28eda7e7bde5335def5 100644 --- a/qtviewer_planetosm/osmtiles/layer_tiles.cpp +++ b/qtviewer_planetosm/osmtiles/layer_tiles.cpp @@ -26,7 +26,7 @@ namespace QTVOSM{ m_downloadThread->start(); //!2,init basic cache and server site.if user does not give address, default set to "http://localhost/osm/%1/%2/%3.png" this->m_strLocalCache = "/OSMCache"; - this->m_strServerURL = "http://c.tile.openstreetmap.org/%1/%2/%3.png"; + this->m_strServerURL = "http://%4.tile.openstreetmap.org/%1/%2/%3.png"; m_bconnected = false; m_propPage = 0; //!3, init the Drag position, for mouse drag and explore. @@ -137,7 +137,7 @@ namespace QTVOSM{ { this->m_nStartPosX = event->pos().x(); this->m_nStartPosY = event->pos().y(); - } + } return res; } @@ -212,7 +212,7 @@ namespace QTVOSM{ connect(m_downloader,SIGNAL(evt_all_taskFinished()),this,SLOT(updateViewer())); //Get Cache Address QSettings settings(QCoreApplication::applicationFilePath()+".ini",QSettings::IniFormat); - m_strServerURL = settings.value(QString("settings/ServerURL_%1").arg(m_name),"http://c.tile.openstreetmap.org/%1/%2/%3.png").toString(); + m_strServerURL = settings.value(QString("settings/ServerURL_%1").arg(m_name),"http://%4.tile.openstreetmap.org/%1/%2/%3.png").toString(); m_strLocalCache = settings.value(QString("settings/LocalCache_%1").arg(m_name), QCoreApplication::applicationDirPath() +"/OSMCache").toString(); m_nCacheExpireDays = settings.value(QString("settings/CacheExpireDays_%1").arg(m_name), 30).toInt(); return this; @@ -350,7 +350,11 @@ namespace QTVOSM{ LFix += ".png"; strFileName = QString::number(nY,10); strFileName += ".png"; - strSourceUrl = m_strServerURL.arg(nLevel).arg(nX).arg(nY); + QChar mirr[3] = {QChar('a'),QChar('b'),QChar('c')}; + if (m_strServerURL.contains("%4")) + strSourceUrl = m_strServerURL.arg(nLevel).arg(nX).arg(nY).arg(mirr[nY%3]); + else + strSourceUrl = m_strServerURL.arg(nLevel).arg(nX).arg(nY); this->m_downloader->addDownloadUrl(strSourceUrl,strDestinDir,strFileName); return true; diff --git a/qtviewer_planetosm/osmtiles/layer_tiles_page.cpp b/qtviewer_planetosm/osmtiles/layer_tiles_page.cpp index 9a6f98d1123ffbfcf9bac0ad2859f6cf727a86be..486ef9b165cfa93815b631ed6148421ece0936b1 100644 --- a/qtviewer_planetosm/osmtiles/layer_tiles_page.cpp +++ b/qtviewer_planetosm/osmtiles/layer_tiles_page.cpp @@ -15,7 +15,7 @@ namespace QTVOSM{ ui->setupUi(this); //Get Cache Address QSettings settings(QCoreApplication::applicationFilePath()+".ini",QSettings::IniFormat); - QString strServerURL = settings.value(QString("settings/ServerURL_%1").arg(layer->get_name()),"http://c.tile.openstreetmap.org/%1/%2/%3.png").toString(); + QString strServerURL = settings.value(QString("settings/ServerURL_%1").arg(layer->get_name()),"http://%4.tile.openstreetmap.org/%1/%2/%3.png").toString(); QString strLocalCache = settings.value(QString("settings/LocalCache_%1").arg(layer->get_name()), QCoreApplication::applicationDirPath() +"/OSMCache").toString(); int nCacheExpireDays = settings.value(QString("settings/CacheExpireDays_%1").arg(layer->get_name()), 30).toInt(); int nAutoDownload = settings.value(QString("settings/nAutoDownload_%1").arg(layer->get_name()), 0).toInt(); diff --git a/qtviewer_planetosm/qtaxviewer_planetosm.cpp b/qtviewer_planetosm/qtaxviewer_planetosm.cpp index e66c3005123562708c599fb2acc4a30851efae0d..277fee42909e01c8a018f096c1de5a8da3000239 100644 --- a/qtviewer_planetosm/qtaxviewer_planetosm.cpp +++ b/qtviewer_planetosm/qtaxviewer_planetosm.cpp @@ -73,7 +73,7 @@ void qtaxviewer_planetosm::osm_set_remote_address (QString layerName, QString ad QString qtaxviewer_planetosm::osm_get_remote_address(QString layerName) const { - QString res = "http://c.tile.openstreetmap.org/%1/%2/%3.png"; + QString res = "http://%4.tile.openstreetmap.org/%1/%2/%3.png"; tilesviewer * pv = this->ui->widget_QTV_mainMap ; layer_interface * la = pv->layer(layerName); if (la) diff --git a/qtviewer_planetosm/qtwidget_planetosm.cpp b/qtviewer_planetosm/qtwidget_planetosm.cpp index e90fd8010784e12f537f98f30d5d7c1b5cd34b93..e43e1e68ecce310d5c0eb59c1175a038e76b592c 100644 --- a/qtviewer_planetosm/qtwidget_planetosm.cpp +++ b/qtviewer_planetosm/qtwidget_planetosm.cpp @@ -96,7 +96,7 @@ void qtwidget_planetosm::osm_set_remote_address (QString layerName, QString addr QString qtwidget_planetosm::osm_get_remote_address(QString layerName) const { - QString res = "http://c.tile.openstreetmap.org/%1/%2/%3.png"; + QString res = "http://%4.tile.openstreetmap.org/%1/%2/%3.png"; osm_frame_widget * mp = qobject_cast(m_map_widget);tilesviewer * pv=mp->viewer(); layer_interface * la = pv->layer(layerName); if (la)