summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThiago Marcos P. Santos <tmpsantos@gmail.com>2019-03-04 15:51:37 +0200
committerThiago Marcos P. Santos <tmpsantos@gmail.com>2019-03-04 15:51:37 +0200
commit3d0edd64218b3589f562e79d1339a586e7045af5 (patch)
treeed0bd1bce2e953a66b5fc644a9e7c15b61ee4508
parent74538406e9e7f9444e491ea23b7dc52f63d77e73 (diff)
downloadqtlocation-mapboxgl-upstream/tmpsantos-api_base_url.tar.gz
[qt] Also use the base APU URL as key for sharing the cache.upstream/tmpsantos-api_base_url
Otherwise we will have a URL pointing to different servers and potentially different data.
-rw-r--r--platform/qt/src/qmapboxgl.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/platform/qt/src/qmapboxgl.cpp b/platform/qt/src/qmapboxgl.cpp
index 7ed8f04007..fd4a210229 100644
--- a/platform/qt/src/qmapboxgl.cpp
+++ b/platform/qt/src/qmapboxgl.cpp
@@ -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;