1 files changed, 8 insertions, 6 deletions
diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp
index 54a95ceaeb..e609e22c97 100644
--- a/src/mbgl/map/map.cpp
+++ b/src/mbgl/map/map.cpp
@@ -337,10 +337,6 @@ void Map::setConstrainMode(mbgl::ConstrainMode mode) {
     impl->onUpdate();
 }
 
-ConstrainMode Map::getConstrainMode() const {
-    return impl->transform.getConstrainMode();
-}
-
 #pragma mark - Viewport mode
 
 void Map::setViewportMode(mbgl::ViewportMode mode) {
@@ -348,8 +344,14 @@ void Map::setViewportMode(mbgl::ViewportMode mode) {
     impl->onUpdate();
 }
 
-ViewportMode Map::getViewportMode() const {
-    return impl->transform.getViewportMode();
+#pragma mark - Map options
+
+MapOptions Map::getMapOptions() const {
+    return std::move(MapOptions()
+        .withMapMode(impl->mode)
+        .withConstrainMode(impl->transform.getConstrainMode())
+        .withViewportMode(impl->transform.getViewportMode())
+        .withCrossSourceCollisions(impl->crossSourceCollisions));
 }
 
 #pragma mark - Projection mode