diff options
author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2019-03-07 23:24:52 +0200 |
---|---|---|
committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2019-03-08 18:37:41 +0200 |
commit | 2144e3f3b0b8f08b65c854225d7360847633f689 (patch) | |
tree | 16cadc63b1c3d438c5ddd4bf67aadb2e72e23130 /src/mbgl/style/sources/vector_source.cpp | |
parent | 2f88e8257b83b77f6c06c86c99f542976e7d5199 (diff) | |
download | qtlocation-mapboxgl-upstream/map-refactor.tar.gz |
[core] Implement platform::Factory::sharedFileSource()upstream/map-refactor
Diffstat (limited to 'src/mbgl/style/sources/vector_source.cpp')
-rw-r--r-- | src/mbgl/style/sources/vector_source.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mbgl/style/sources/vector_source.cpp b/src/mbgl/style/sources/vector_source.cpp index 6cede8fae9..b0152974da 100644 --- a/src/mbgl/style/sources/vector_source.cpp +++ b/src/mbgl/style/sources/vector_source.cpp @@ -12,8 +12,8 @@ namespace mbgl { namespace style { VectorSource::VectorSource(std::string id, variant<std::string, Tileset> urlOrTileset_) - : Source(makeMutable<Impl>(std::move(id))), - urlOrTileset(std::move(urlOrTileset_)) { + : Source(makeMutable<Impl>(std::move(id))) + , urlOrTileset(std::move(urlOrTileset_)) { } VectorSource::~VectorSource() = default; @@ -34,7 +34,7 @@ optional<std::string> VectorSource::getURL() const { return urlOrTileset.get<std::string>(); } -void VectorSource::loadDescription(FileSource& fileSource) { +void VectorSource::loadDescription(std::shared_ptr<FileSource> fileSource) { if (urlOrTileset.is<Tileset>()) { baseImpl = makeMutable<Impl>(impl(), urlOrTileset.get<Tileset>()); loaded = true; @@ -46,7 +46,7 @@ void VectorSource::loadDescription(FileSource& fileSource) { } const std::string& url = urlOrTileset.get<std::string>(); - req = fileSource.request(Resource::source(url), [this, url](Response res) { + req = fileSource->request(Resource::source(url), [this, url](Response res) { if (res.error) { observer->onSourceError(*this, std::make_exception_ptr(std::runtime_error(res.error->message))); } else if (res.notModified) { |