tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[core] #509 - Creating and using MIN_ZOOM and MAX_ZOOM constants

Browse Source
This commit is contained in:
Brad Leege
2016-02-03 18:57:22 -06:00
parent 511c01c6ca
commit 87bac32a33
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/mbgl/util/constants.hpp
View File

@@ -18,6 +18,8 @@ extern const double M2PI;
extern const double EARTH_RADIUS_M;
extern const double LATITUDE_MAX;
extern const double PITCH_MAX;
extern const double MIN_ZOOM;
extern const double MAX_ZOOM;
} // namespace util

4
src/mbgl/map/transform_state.cpp
View File

@@ -162,7 +162,7 @@ double TransformState::getScale() const {
void TransformState::setMinZoom(const double minZoom) {
if (minZoom <= getMaxZoom()) {
min_scale = zoomScale(util::clamp(minZoom, 0.0, 25.5));
min_scale = zoomScale(util::clamp(minZoom, util::MIN_ZOOM, util::MAX_ZOOM));
}
}
@@ -177,7 +177,7 @@ double TransformState::getMinZoom() const {
void TransformState::setMaxZoom(const double maxZoom) {
if (maxZoom >= getMinZoom()) {
max_scale = zoomScale(util::clamp(maxZoom, 0.0, 25.5));
max_scale = zoomScale(util::clamp(maxZoom, util::MIN_ZOOM, util::MAX_ZOOM));
}
}

2
src/mbgl/util/constants.cpp
View File

@@ -20,6 +20,8 @@ const double mbgl::util::M2PI = 2 * M_PI;
const double mbgl::util::EARTH_RADIUS_M = 6378137;
const double mbgl::util::LATITUDE_MAX = 85.05112878;
const double mbgl::util::PITCH_MAX = M_PI / 3;
const double mbgl::util::MIN_ZOOM = 0.0;
const double mbgl::util::MAX_ZOOM = 25.5;
#if defined(DEBUG)
const bool mbgl::debug::tileParseWarnings = false;