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

Remove Map dependency from Source::load

Browse Source
This commit is contained in:
John Firebaugh
2015-04-03 17:10:54 -07:00
parent e72ee04482
commit 750cfb6f58
3 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/mbgl/map/source.cpp
View File

@@ -102,7 +102,9 @@ Source::Source()
// Note: This is a separate function that must be called exactly once after creation
// The reason this isn't part of the constructor is that calling shared_from_this() in
// the constructor fails.
void Source::load(Map &map, Environment &env) {
void Source::load(const std::string& accessToken,
Environment& env,
std::function<void()> callback) {
if (info.url.empty()) {
loaded = true;
return;
@@ -110,8 +112,8 @@ void Source::load(Map &map, Environment &env) {
util::ptr<Source> source = shared_from_this();
const std::string url = util::mapbox::normalizeSourceURL(info.url, map.getAccessToken());
env.request({ Resource::Kind::JSON, url }, [source, &map](const Response &res) {
const std::string url = util::mapbox::normalizeSourceURL(info.url, accessToken);
env.request({ Resource::Kind::JSON, url }, [source, callback](const Response &res) {
if (res.status != Response::Successful) {
Log::Warning(Event::General, "Failed to load source TileJSON: %s", res.message.c_str());
return;
@@ -128,7 +130,7 @@ void Source::load(Map &map, Environment &env) {
source->info.parseTileJSONProperties(d);
source->loaded = true;
map.triggerUpdate();
callback();
});
}