[core] Add interface to change the orientation through MapOptions

2 files changed, 18 insertions, 4 deletions

diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp
index bd0cfbc0d7..9134272ea7 100644
--- a/include/mbgl/map/map.hpp
+++ b/include/mbgl/map/map.hpp
@@ -87,11 +87,8 @@ public:
 
     /// @}
 
-    // North Orientation
-    void setNorthOrientation(NorthOrientation);
-    NorthOrientation getNorthOrientation() const;
-
     // Map Options
+    void setNorthOrientation(NorthOrientation);
     void setConstrainMode(ConstrainMode);
     void setViewportMode(ViewportMode);
     MapOptions getMapOptions() const;
diff --git a/include/mbgl/map/map_options.hpp b/include/mbgl/map/map_options.hpp
index 617a2d793a..8d5c12b96c 100644
--- a/include/mbgl/map/map_options.hpp
+++ b/include/mbgl/map/map_options.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <mbgl/map/mode.hpp>
+#include <mbgl/util/geo.hpp>
 
 #include <memory>
 
@@ -86,6 +87,22 @@ public:
      */
     bool crossSourceCollisions() const;
 
+    /**
+     * @brief Sets the orientation of the Map. By default, it is set to
+     * Upwards.
+     *
+     * @param orientation Orientation of the Map.
+     * @return reference to MapOptions for chaining options together.
+     */
+    MapOptions& withNorthOrientation(NorthOrientation orientation);
+
+    /**
+     * @brief Gets the previously set (or default) orientation.
+     *
+     * @return Map orientation.
+     */
+    NorthOrientation northOrientation() const;
+
 private:
     class Impl;
     std::unique_ptr<Impl> impl_;