kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

Fixed checking on max zoom.

Browse source
This commit is contained in:
Daria Volvenkova 2018-07-06 18:22:54 +03:00 • committed by Vlad Mihaylenko
parent 123e15e5aa
commit 62a2f1edf7
3 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drape_frontend/screen_operations.cpp
View file

@ -260,11 +260,10 @@ bool ApplyScale(m2::PointD const & pixelScaleCenter, double factor, ScreenBase &
if (!CheckMaxScale(tmp))
{
// Set scale value slightly less than upper bound, to get closest valid zoom.
auto const correctedScale = GetScale((scales::GetUpperStyleScale() + 1) * 0.995);
tmp.SetScale(correctedScale);
if (!CheckMaxScale(tmp))
auto const maxScale = GetTileBasedScale(scales::GetUpperStyleScale() + 0.42);
if (maxScale > screen.GetScale() && CheckMaxScale(screen))
return false;
tmp.SetScale(maxScale);
}
// re-checking the borders, as we might violate them a bit (don't know why).

9
drape_frontend/visual_params.cpp
View file

@ -233,6 +233,15 @@ m2::RectD GetRectForDrawScale(double drawScale, m2::PointD const & center)
return GetRectForDrawScale(my::rounds(drawScale), center);
}
double GetTileBasedScale(double zoomLevel)
{
VisualParams const & p = VisualParams::Instance();
auto const factor = pow(2.0, zoomLevel);
auto const len = (MercatorBounds::maxX - MercatorBounds::minX) / factor;
auto const pxLen = static_cast<double>(p.GetTileSize());
return len / pxLen;
}
uint32_t CalculateTileSize(uint32_t screenWidth, uint32_t screenHeight)
{
uint32_t const maxSz = max(screenWidth, screenHeight);

1
drape_frontend/visual_params.hpp
View file

@ -92,5 +92,6 @@ float InterpolateByZoomLevels(int index, float lerpCoef, std::vector<float> cons
m2::PointF InterpolateByZoomLevels(int index, float lerpCoef, std::vector<m2::PointF> const & values);
double GetNormalizedZoomLevel(double scale, int minZoom = 1);
double GetScale(double zoomLevel);
double GetTileBasedScale(double zoomLevel);
} // namespace df