summaryrefslogtreecommitdiff
path: root/include/mbgl
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2017-06-20 17:12:58 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2017-06-22 08:04:39 -0700
commit40e47556214e999c952c1e88e026d673cdd96c72 (patch)
treee8d15795cbecc07c94908a8ebed31b73def64614 /include/mbgl
parent1520a56813f82bbe875774fdc2b3df26392278d6 (diff)
downloadqtlocation-mapboxgl-40e47556214e999c952c1e88e026d673cdd96c72.tar.gz
[core] Move setStyleJSON/URL to Style; add Map::setStyle
Diffstat (limited to 'include/mbgl')
-rw-r--r--include/mbgl/map/map.hpp8
-rw-r--r--include/mbgl/style/style.hpp6
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;