summaryrefslogtreecommitdiff
path: root/src/mbgl/style/style.cpp
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2016-09-05 19:03:27 +0200
committerKonstantin Käfer <mail@kkaefer.com>2016-09-05 19:03:27 +0200
commit46b73b8a2cf5748596ab6023e2cb1f2ce45d2b0d (patch)
treedb1f2b4075c076bcd1e964ddb7414b81b6808464 /src/mbgl/style/style.cpp
parent51b2033fce5ca4d016b67b94abc50c1822c139fe (diff)
downloadqtlocation-mapboxgl-46b73b8a2cf5748596ab6023e2cb1f2ce45d2b0d.tar.gz
[core] Source::update => Source::{load,parse}Tiles, Source::load => Source::loadDescription
Diffstat (limited to 'src/mbgl/style/style.cpp')
-rw-r--r--src/mbgl/style/style.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp
index ae6bc14b8b..20202cbcf4 100644
--- a/src/mbgl/style/style.cpp
+++ b/src/mbgl/style/style.cpp
@@ -197,11 +197,12 @@ double Style::getDefaultPitch() const {
return defaultPitch;
}
-void Style::update(const UpdateParameters& parameters) {
+void Style::updateTiles(const UpdateParameters& parameters) {
bool allTilesUpdated = true;
for (const auto& source : sources) {
- if (!source->baseImpl->update(parameters)) {
+ source->baseImpl->loadTiles(parameters);
+ if (!source->baseImpl->parseTiles(parameters)) {
allTilesUpdated = false;
}
}
@@ -260,7 +261,7 @@ void Style::recalculate(float z, const TimePoint& timePoint, MapMode mode) {
if (source && layer->baseImpl->needsRendering(z)) {
source->baseImpl->enabled = true;
if (!source->baseImpl->loaded) {
- source->baseImpl->load(fileSource);
+ source->baseImpl->loadDescription(fileSource);
}
}
}