summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2016-03-21 13:49:43 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2016-03-21 16:38:54 -0700
commitca8212de92737c084fda5edfacf0cdd899e03104 (patch)
treee8b9ea392557f5910ad088ab049dba77167d9042
parenta6012a1cb5661683dea30f0f2fbcd80894791d21 (diff)
downloadqtlocation-mapboxgl-ca8212de92737c084fda5edfacf0cdd899e03104.tar.gz
[all] Set maximum maxZoom to 21
Numbers greater than 21 trigger various bugs.
-rw-r--r--CHANGELOG.md1
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MapboxConstants.java2
-rw-r--r--src/mbgl/util/constants.cpp2
3 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9ecfd02009..5940999e46 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -82,6 +82,7 @@ Known issues:
- The user dot no longer lags when panning the map. ([#3683](https://github.com/mapbox/mapbox-gl-native/pull/3683))
- The Improve This Map tool now uses the same zoom level that is currently being shown in the map view. ([#4068](https://github.com/mapbox/mapbox-gl-native/pull/4068))
- Fixed a formatting issue in the documentation for `MGLCoordinateBoundsIsEmpty()`. ([#3958](https://github.com/mapbox/mapbox-gl-native/pull/3958))
+- The maximum maximum zoom level is now 21. ([#4417](https://github.com/mapbox/mapbox-gl-native/pull/4417)))
## iOS 3.1.2
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MapboxConstants.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MapboxConstants.java
index 983dd96ede..475489f621 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MapboxConstants.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MapboxConstants.java
@@ -40,7 +40,7 @@ public class MapboxConstants {
/**
* The currently supported maximum zoom level.
*/
- public static final float MAXIMUM_ZOOM = 25.5f;
+ public static final float MAXIMUM_ZOOM = 21.0f;
/**
* The currently supported maximum tilt value.
diff --git a/src/mbgl/util/constants.cpp b/src/mbgl/util/constants.cpp
index 7ff00800ae..c08e0bf453 100644
--- a/src/mbgl/util/constants.cpp
+++ b/src/mbgl/util/constants.cpp
@@ -29,7 +29,7 @@ const double LONGITUDE_MAX = 180;
const double DEGREES_MAX = 360;
const double PITCH_MAX = M_PI / 3;
const double MIN_ZOOM = 0.0;
-const double MAX_ZOOM = 25.5;
+const double MAX_ZOOM = 21.0;
const uint64_t DEFAULT_MAX_CACHE_SIZE = 50 * 1024 * 1024;