summaryrefslogtreecommitdiff
path: root/src/mbgl/style/source.cpp
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2016-06-06 17:06:51 -0700
committerKonstantin Käfer <mail@kkaefer.com>2016-06-10 12:42:14 +0200
commitdbf16440a6ae8dedc408d8345e1527a516a42a1d (patch)
treedf641cd7cb77194771439bf85d0eb7534df79d15 /src/mbgl/style/source.cpp
parentc3a8534a4308474a4b6cad09785d53ab43cb6f6a (diff)
downloadqtlocation-mapboxgl-dbf16440a6ae8dedc408d8345e1527a516a42a1d.tar.gz
[core] Eliminate Source dependency on TileSource
Diffstat (limited to 'src/mbgl/style/source.cpp')
-rw-r--r--src/mbgl/style/source.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/mbgl/style/source.cpp b/src/mbgl/style/source.cpp
index 7e012727dd..d7752ed371 100644
--- a/src/mbgl/style/source.cpp
+++ b/src/mbgl/style/source.cpp
@@ -2,7 +2,6 @@
#include <mbgl/style/source_observer.hpp>
#include <mbgl/map/transform.hpp>
#include <mbgl/tile/tile.hpp>
-#include <mbgl/tile/tile_source.hpp>
#include <mbgl/renderer/painter.hpp>
#include <mbgl/util/exception.hpp>
#include <mbgl/util/constants.hpp>
@@ -244,8 +243,8 @@ bool Source::update(const UpdateParameters& parameters) {
auto retainTileDataFn = [&retain](TileData& tileData, bool required) -> void {
retain.emplace(tileData.id);
- tileData.getTileSource()->setNecessity(required ? TileSource::Necessity::Required
- : TileSource::Necessity::Optional);
+ tileData.setNecessity(required ? TileData::Necessity::Required
+ : TileData::Necessity::Optional);
};
auto getTileDataFn = [this](const OverscaledTileID& dataTileID) -> TileData* {
return getTileData(dataTileID);
@@ -288,7 +287,7 @@ bool Source::update(const UpdateParameters& parameters) {
auto retainIt = retain.begin();
while (dataIt != tileDataMap.end()) {
if (retainIt == retain.end() || dataIt->first < *retainIt) {
- dataIt->second->getTileSource()->setNecessity(TileSource::Necessity::Optional);
+ dataIt->second->setNecessity(TileData::Necessity::Optional);
cache.add(dataIt->first, std::move(dataIt->second));
tileDataMap.erase(dataIt++);
} else {