Merge branch 'release-ios-v3.1.0'

2 files changed, 5 insertions, 0 deletions

diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp
index 8c27b1756a..688565fecb 100644
--- a/include/mbgl/map/map.hpp
+++ b/include/mbgl/map/map.hpp
@@ -138,6 +138,10 @@ public:
     // North Orientation
     void setNorthOrientation(NorthOrientation);
     NorthOrientation getNorthOrientation() const;
+    
+    // Constrain mode
+    void setConstrainMode(ConstrainMode);
+    ConstrainMode getConstrainMode() const;
 
     // Size
     uint16_t getWidth() const;
diff --git a/include/mbgl/map/mode.hpp b/include/mbgl/map/mode.hpp
index c197b28589..7fd1a7f522 100644
--- a/include/mbgl/map/mode.hpp
+++ b/include/mbgl/map/mode.hpp
@@ -24,6 +24,7 @@ enum class GLContextMode : EnumType {
 // We can choose to constrain the map both horizontally or vertically, or only
 // vertically e.g. while panning.
 enum class ConstrainMode : EnumType {
+    None,
     HeightOnly,
     WidthAndHeight,
 };