tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[qt] Also use the base API URL as key for sharing the cache.

Browse Source 
Otherwise we will have a URL pointing to different servers and
potentially different data.
This commit is contained in:
Thiago Marcos P. Santos
2019-03-04 15:51:37 +02:00
parent 4bc56cc576
commit 7b7ad9d39b
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
platform/qt/src/qmapboxgl.cpp
View File

@@ -97,6 +97,7 @@ std::shared_ptr<mbgl::DefaultFileSource> sharedDefaultFileSource(const QMapboxGL
const std::string cachePath = settings.cacheDatabasePath().toStdString();
const std::string accessToken = settings.accessToken().toStdString();
const std::string apiBaseUrl = settings.apiBaseUrl().toStdString();
std::lock_guard<std::mutex> lock(mutex);
@@ -109,7 +110,7 @@ std::shared_ptr<mbgl::DefaultFileSource> sharedDefaultFileSource(const QMapboxGL
}
}
const auto key = cachePath + "|" + accessToken;
const auto key = cachePath + "|" + accessToken + "|" + apiBaseUrl;
// Return an existing FileSource if available.
auto sharedFileSource = fileSources.find(key);
@@ -123,7 +124,7 @@ std::shared_ptr<mbgl::DefaultFileSource> sharedDefaultFileSource(const QMapboxGL
// Setup the FileSource
newFileSource->setAccessToken(accessToken);
newFileSource->setAPIBaseURL(settings.apiBaseUrl().toStdString());
newFileSource->setAPIBaseURL(apiBaseUrl);
fileSources[key] = newFileSource;