summaryrefslogtreecommitdiff
path: root/src/mbgl/style/style_impl.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mbgl/style/style_impl.hpp')
-rw-r--r--src/mbgl/style/style_impl.hpp16
1 files changed, 14 insertions, 2 deletions
diff --git a/src/mbgl/style/style_impl.hpp b/src/mbgl/style/style_impl.hpp
index 2bdb51a26c..76f244d5a4 100644
--- a/src/mbgl/style/style_impl.hpp
+++ b/src/mbgl/style/style_impl.hpp
@@ -25,6 +25,7 @@ namespace mbgl {
class Scheduler;
class FileSource;
+class AsyncRequest;
class SpriteLoader;
namespace style {
@@ -38,7 +39,11 @@ public:
Impl(Scheduler&, FileSource&, float pixelRatio);
~Impl() override;
- void setJSON(const std::string&);
+ void loadJSON(const std::string&);
+ void loadURL(const std::string&);
+
+ std::string getJSON() const;
+ std::string getURL() const;
void setObserver(Observer*);
@@ -92,11 +97,18 @@ public:
bool spriteLoaded = false;
private:
+ void parse(const std::string&);
+
Scheduler& scheduler;
FileSource& fileSource;
+
+ std::string url;
+ std::string json;
+
+ std::unique_ptr<AsyncRequest> styleRequest;
std::unique_ptr<SpriteLoader> spriteLoader;
- std::string glyphURL;
+ std::string glyphURL;
Collection<style::Image> images;
Collection<Source> sources;
Collection<Layer> layers;