[all] Promote Style to public API

1 files changed, 5 insertions, 36 deletions

diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp
index 33b40a8e77..85c95d6491 100644
--- a/include/mbgl/map/map.hpp
+++ b/include/mbgl/map/map.hpp
@@ -9,7 +9,6 @@
 #include <mbgl/util/noncopyable.hpp>
 #include <mbgl/util/size.hpp>
 #include <mbgl/annotation/annotation.hpp>
-#include <mbgl/style/transition_options.hpp>
 #include <mbgl/map/camera.hpp>
 #include <mbgl/map/query.hpp>
 
@@ -28,9 +27,7 @@ class Scheduler;
 
 namespace style {
 class Image;
-class Source;
-class Layer;
-class Light;
+class Style;
 } // namespace style
 
 class Map : private util::noncopyable {
@@ -58,15 +55,15 @@ public:
     // Main render function.
     void render(View&);
 
-    // Styling
-    style::TransitionOptions getTransitionOptions() const;
-    void setTransitionOptions(const style::TransitionOptions&);
-
+    // 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;
+
     // Transition
     void cancelTransitions();
     void setGestureInProgress(bool);
@@ -156,34 +153,6 @@ public:
     void updateAnnotation(AnnotationID, const Annotation&);
     void removeAnnotation(AnnotationID);
 
-    // Sources
-    std::vector<style::Source*> getSources();
-    style::Source* getSource(const std::string& sourceID);
-    void addSource(std::unique_ptr<style::Source>);
-    std::unique_ptr<style::Source> removeSource(const std::string& sourceID);
-
-    // Layers
-    std::vector<style::Layer*> getLayers();
-    style::Layer* getLayer(const std::string& layerID);
-    void addLayer(std::unique_ptr<style::Layer>, const optional<std::string>& beforeLayerID = {});
-    std::unique_ptr<style::Layer> removeLayer(const std::string& layerID);
-
-    // Images
-    void addImage(std::unique_ptr<style::Image>);
-    void removeImage(const std::string&);
-    const style::Image* getImage(const std::string&);
-
-    // Light
-    void setLight(std::unique_ptr<style::Light>);
-    style::Light* getLight();
-
-    // Defaults
-    std::string getStyleName() const;
-    LatLng getDefaultLatLng() const;
-    double getDefaultZoom() const;
-    double getDefaultBearing() const;
-    double getDefaultPitch() const;
-
     // Feature queries
     std::vector<Feature> queryRenderedFeatures(const ScreenCoordinate&, const RenderedQueryOptions& options = {});
     std::vector<Feature> queryRenderedFeatures(const ScreenBox&,        const RenderedQueryOptions& options = {});