From d21f19686bad074e8ae4ef103e10191665feaaed Mon Sep 17 00:00:00 2001
From: Asheem Mamoowala <asheem.mamoowala@mapbox.com>
Date: Wed, 2 Aug 2017 15:37:31 -0700
Subject: Set Default MaxZoom to 22

---
 include/mbgl/util/constants.hpp                                     | 1 +
 include/mbgl/util/tileset.hpp                                       | 3 ++-
 .../src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java          | 6 ++++--
 platform/macos/src/MGLMapView.h                                     | 3 ++-
 src/mbgl/annotation/render_annotation_source.cpp                    | 2 +-
 src/mbgl/map/transform_state.hpp                                    | 2 +-
 6 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/include/mbgl/util/constants.hpp b/include/mbgl/util/constants.hpp
index 250c77b078..eb5c201793 100644
--- a/include/mbgl/util/constants.hpp
+++ b/include/mbgl/util/constants.hpp
@@ -38,6 +38,7 @@ constexpr double MIN_ZOOM = 0.0;
 constexpr double MAX_ZOOM = 25.5;
 constexpr float  MIN_ZOOM_F = MIN_ZOOM;
 constexpr float  MAX_ZOOM_F = MAX_ZOOM;
+constexpr uint8_t DEFAULT_MAX_ZOOM = 22;
 
 constexpr uint8_t DEFAULT_PREFETCH_ZOOM_DELTA = 4;
 
diff --git a/include/mbgl/util/tileset.hpp b/include/mbgl/util/tileset.hpp
index 2fa19d3f53..61aa47d4ea 100644
--- a/include/mbgl/util/tileset.hpp
+++ b/include/mbgl/util/tileset.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <mbgl/util/range.hpp>
+#include <mbgl/util/constants.hpp>
 
 #include <vector>
 #include <string>
@@ -18,7 +19,7 @@ public:
     Scheme scheme;
 
     Tileset(std::vector<std::string> tiles_ = std::vector<std::string>(),
-            Range<uint8_t> zoomRange_ = { 0, 22 },
+            Range<uint8_t> zoomRange_ = { 0, util::DEFAULT_MAX_ZOOM },
             std::string attribution_ = {},
             Scheme scheme_ = Scheme::XYZ)
         : tiles(std::move(tiles_)),
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
index 5389cd7e7a..0d1d0e03b5 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
@@ -495,7 +495,7 @@ public final class MapboxMap {
 
   /**
    * <p>
-   * Gets the maximum zoom level the map can be displayed at.
+   * Gets the minimum zoom level the map can be displayed at.
    * </p>
    *
    * @return The minimum zoom level.
@@ -512,7 +512,9 @@ public final class MapboxMap {
    * <p>
    * Sets the maximum zoom level the map can be displayed at.
    * </p>
-   *
+   * <p>
+   *   The default maximum zoomn level is 22. The upper bound for this value is 25.5.
+   * </p>
    * @param maxZoom The new maximum zoom level.
    */
   public void setMaxZoomPreference(@FloatRange(from = MapboxConstants.MINIMUM_ZOOM,
diff --git a/platform/macos/src/MGLMapView.h b/platform/macos/src/MGLMapView.h
index 6bfdcfd100..2fa32ae1e4 100644
--- a/platform/macos/src/MGLMapView.h
+++ b/platform/macos/src/MGLMapView.h
@@ -247,7 +247,8 @@ MGL_EXPORT IB_DESIGNABLE
  If the value of this property is smaller than that of the `minimumZoomLevel`
  property, the behavior is undefined.
 
- The default value of this property is 20.
+ The default value of this property is 22. The upper bound for this property
+ is 25.5.
  */
 @property (nonatomic) double maximumZoomLevel;
 
diff --git a/src/mbgl/annotation/render_annotation_source.cpp b/src/mbgl/annotation/render_annotation_source.cpp
index de38b596d5..c2e6191d1d 100644
--- a/src/mbgl/annotation/render_annotation_source.cpp
+++ b/src/mbgl/annotation/render_annotation_source.cpp
@@ -38,7 +38,7 @@ void RenderAnnotationSource::update(Immutable<style::Source::Impl> baseImpl_,
                        parameters,
                        SourceType::Annotations,
                        util::tileSize,
-                       { 0, 22 },
+                       { 0, util::DEFAULT_MAX_ZOOM },
                        [&] (const OverscaledTileID& tileID) {
                            return std::make_unique<AnnotationTile>(tileID, parameters);
                        });
diff --git a/src/mbgl/map/transform_state.hpp b/src/mbgl/map/transform_state.hpp
index f35f570549..4d6b89573e 100644
--- a/src/mbgl/map/transform_state.hpp
+++ b/src/mbgl/map/transform_state.hpp
@@ -96,7 +96,7 @@ private:
 
     // Limit the amount of zooming possible on the map.
     double min_scale = std::pow(2, 0);
-    double max_scale = std::pow(2, 20);
+    double max_scale = std::pow(2, util::DEFAULT_MAX_ZOOM);
     double min_pitch = 0.0;
     double max_pitch = util::PITCH_MAX;
 
-- 
cgit v1.2.1