[core] Group Map LatLngBounds, min and max zoom methods

Group bounds, minimum and maximum zoom related methods together using
the new BoundOptions.

v2: Document that getBounds() initializes all optional fields.
  - Add test for getBounds() on a map with default values.

2 files changed, 28 insertions, 22 deletions

diff --git a/src/core-files.json b/src/core-files.json
index 8915ebc49d..6415f03182 100644
--- a/src/core-files.json
+++ b/src/core-files.json
@@ -328,6 +328,7 @@
         "mbgl/layermanager/line_layer_factory.hpp": "include/mbgl/layermanager/line_layer_factory.hpp",
         "mbgl/layermanager/raster_layer_factory.hpp": "include/mbgl/layermanager/raster_layer_factory.hpp",
         "mbgl/layermanager/symbol_layer_factory.hpp": "include/mbgl/layermanager/symbol_layer_factory.hpp",
+        "mbgl/map/bound_options.hpp": "include/mbgl/map/bound_options.hpp",
         "mbgl/map/camera.hpp": "include/mbgl/map/camera.hpp",
         "mbgl/map/change.hpp": "include/mbgl/map/change.hpp",
         "mbgl/map/map.hpp": "include/mbgl/map/map.hpp",
diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp
index e45d4b85f2..f545fc8095 100644
--- a/src/mbgl/map/map.cpp
+++ b/src/mbgl/map/map.cpp
@@ -275,36 +275,41 @@ LatLngBounds Map::latLngBoundsForCamera(const CameraOptions& camera) const {
 
 #pragma mark - Bounds
 
-LatLngBounds Map::getLatLngBounds() const {
-    return impl->transform.getState().getLatLngBounds();
-}
+void Map::setBounds(const BoundOptions& options) {
+    bool changeCamera = false;
+    CameraOptions cameraOptions;
 
-void Map::setLatLngBounds(LatLngBounds bounds) {
-    impl->cameraMutated = true;
-    impl->transform.setLatLngBounds(std::move(bounds));
-    impl->onUpdate();
-}
+    if (options.bounds) {
+        changeCamera = true;
+        impl->transform.setLatLngBounds(*options.bounds);
+    }
 
-void Map::setMinZoom(const double minZoom) {
-    impl->transform.setMinZoom(minZoom);
-    if (impl->transform.getZoom() < minZoom) {
-        jumpTo(CameraOptions().withZoom(minZoom));
+    if (options.minZoom) {
+        impl->transform.setMinZoom(*options.minZoom);
+        if (impl->transform.getZoom() < *options.minZoom) {
+            changeCamera = true;
+            cameraOptions.withZoom(*options.minZoom);
+        }
     }
-}
 
-double Map::getMinZoom() const {
-    return impl->transform.getState().getMinZoom();
-}
+    if (options.maxZoom) {
+        impl->transform.setMaxZoom(*options.maxZoom);
+        if (impl->transform.getZoom() > *options.maxZoom) {
+            changeCamera = true;
+            cameraOptions.withZoom(*options.maxZoom);
+        }
+    }
 
-void Map::setMaxZoom(const double maxZoom) {
-    impl->transform.setMaxZoom(maxZoom);
-    if (impl->transform.getZoom() > maxZoom) {
-        jumpTo(CameraOptions().withZoom(maxZoom));
+    if (changeCamera) {
+        jumpTo(cameraOptions);
     }
 }
 
-double Map::getMaxZoom() const {
-    return impl->transform.getState().getMaxZoom();
+BoundOptions Map::getBounds() const {
+    return BoundOptions()
+        .withLatLngBounds(impl->transform.getState().getLatLngBounds())
+        .withMinZoom(impl->transform.getState().getMinZoom())
+        .withMaxZoom(impl->transform.getState().getMaxZoom());
 }
 
 #pragma mark - Size