summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2016-06-14 10:57:43 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2016-06-14 11:25:45 -0700
commit5bbcca832660f80c42e8bfdb5d1836ea8113bb19 (patch)
tree08f46011d920f7abd4c86e16f2040df2355cfdb1 /platform
parent9d3c4fbbb05d37802ebc15210b041392b4d48f15 (diff)
downloadqtlocation-mapboxgl-5bbcca832660f80c42e8bfdb5d1836ea8113bb19.tar.gz
[core] Add virtual Source::getTileSize()
Diffstat (limited to 'platform')
-rw-r--r--platform/default/mbgl/storage/offline_download.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/platform/default/mbgl/storage/offline_download.cpp b/platform/default/mbgl/storage/offline_download.cpp
index 04aabeb04f..8a156dd649 100644
--- a/platform/default/mbgl/storage/offline_download.cpp
+++ b/platform/default/mbgl/storage/offline_download.cpp
@@ -108,13 +108,13 @@ OfflineRegionStatus OfflineDownload::getStatus() const {
case SourceType::Raster: {
style::TileSource* tileSource = static_cast<style::TileSource*>(source.get());
if (tileSource->getTileset()) {
- result.requiredResourceCount += tileResources(source->type, source->tileSize, *tileSource->getTileset()).size();
+ result.requiredResourceCount += tileResources(source->type, tileSource->getTileSize(), *tileSource->getTileset()).size();
} else {
result.requiredResourceCount += 1;
optional<Response> sourceResponse = offlineDatabase.get(Resource::source(tileSource->getURL()));
if (sourceResponse) {
- result.requiredResourceCount += tileResources(source->type, source->tileSize,
- *style::parseTileJSON(*sourceResponse->data, tileSource->getURL(), source->type, source->tileSize)).size();
+ result.requiredResourceCount += tileResources(source->type, tileSource->getTileSize(),
+ *style::parseTileJSON(*sourceResponse->data, tileSource->getURL(), source->type, tileSource->getTileSize())).size();
} else {
result.requiredResourceCountIsPrecise = false;
}
@@ -156,12 +156,12 @@ void OfflineDownload::activateDownload() {
for (const auto& source : parser.sources) {
SourceType type = source->type;
- uint16_t tileSize = source->tileSize;
switch (type) {
case SourceType::Vector:
case SourceType::Raster: {
- style::TileSource* tileSource = static_cast<style::TileSource*>(source.get());
+ const style::TileSource* tileSource = static_cast<style::TileSource*>(source.get());
+ const uint16_t tileSize = tileSource->getTileSize();
if (tileSource->getTileset()) {
ensureTiles(type, tileSize, *tileSource->getTileset());
} else {