diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/mbgl/map/map.hpp | 8 | ||||
-rw-r--r-- | include/mbgl/style/style.hpp | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp index 85c95d6491..dd29d444bd 100644 --- a/include/mbgl/map/map.hpp +++ b/include/mbgl/map/map.hpp @@ -55,15 +55,11 @@ public: // Main render function. void render(View&); - // Style - void setStyleURL(const std::string&); - void setStyleJSON(const std::string&); - std::string getStyleURL() const; - std::string getStyleJSON() const; - style::Style& getStyle(); const style::Style& getStyle() const; + void setStyle(std::unique_ptr<style::Style>); + // Transition void cancelTransitions(); void setGestureInProgress(bool); diff --git a/include/mbgl/style/style.hpp b/include/mbgl/style/style.hpp index 82ff1b3078..cb84922b4d 100644 --- a/include/mbgl/style/style.hpp +++ b/include/mbgl/style/style.hpp @@ -24,6 +24,12 @@ public: Style(Scheduler&, FileSource&, float pixelRatio); ~Style(); + void loadJSON(const std::string&); + void loadURL(const std::string&); + + std::string getJSON() const; + std::string getURL() const; + // Defaults std::string getName() const; LatLng getDefaultLatLng() const; |