Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

increase max possible zoom from 20.5 to 25 #2344

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

increase max possible zoom from 20.5 to 25 #2344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions core/include/tangram/map.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,8 +261,8 @@ class Map {
// Get the minimum zoom level for the view.
float getMinZoom() const;

// Set the maximum zoom level for the view; values greater than 20.5 will be
// clamped to 20.5; values less than the current minimum zoom level will set
// Set the maximum zoom level for the view; values greater than 25.0 will be
// clamped to 25.0; values less than the current minimum zoom level will set
// the minimum zoom to this value.
void setMaxZoom(float _maxZoom);

Expand Down
2 changes: 1 addition & 1 deletion core/src/view/view.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ void View::setMinZoom(float minZoom) {

void View::setMaxZoom(float maxZoom) {

m_maxZoom = std::min(maxZoom, 20.5f);
m_maxZoom = std::min(maxZoom, 25.0f);
m_minZoom = std::min(maxZoom, m_minZoom);
// Set the current zoom again to validate it.
setZoom(m_zoom);
Expand Down
2 changes: 1 addition & 1 deletion core/src/view/view.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ class View {
// Get the minimum zoom level.
float getMinZoom() const { return m_minZoom; }

// Set the maximum zoom level. Clamped to <= 20.5.
// Set the maximum zoom level. Clamped to <= 25.0.
void setMaxZoom(float maxZoom);

// Get the maximum zoom level.
Expand Down
2 changes: 1 addition & 1 deletion platforms/android/tangram/src/main/java/com/mapzen/tangram/MapController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,7 +604,7 @@ public float getMaximumZoomLevel() {
/**
* Set the maximum zoom level of the map view.
*
* Values greater than the default maximum zoom will be clamped. Assigning a value less than the
* Values greater than 25.0 will be clamped. Assigning a value less than the
* current minimum zoom will set the minimum zoom to this value.
* @param maximumZoom The zoom level
*/
Expand Down