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

styling fixed according to review.

Browse source
This commit is contained in:
rachytski 2012-02-02 14:49:29 +04:00 • committed by Alex Zolotarev
parent 4ffe8bedaf
commit f6f50c96fe
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/jni/com/mapswithme/platform/Platform.cpp
View file

@ -32,7 +32,9 @@ public:
double rotatedScreenCircleDiameter = sqrt(screenSize * screenSize + screenSize * screenSize);
int tilesOnOneSide = ceil(rotatedScreenCircleDiameter / (m_tileSize / 1.05 / 2));
tilesOnOneSide += 1;
/// hardcoding the fact, that we are computing screen coverage
/// on slightly enlarged screen rect to produce effect of precaching.
++tilesOnOneSide;
int singleScreenTilesCount = tilesOnOneSide * tilesOnOneSide;
m_maxTilesCount = singleScreenTilesCount * 2;

16
map/tiler.cpp
View file

@ -115,22 +115,22 @@ void Tiler::seed(ScreenBase const & screen, m2::PointD const & centerPt)
double rectSizeY = (MercatorBounds::maxY - MercatorBounds::minY) / (1 << m_tileScale);
/// calculating coverage on the global rect, which corresponds to the
/// pixel rect, which is square with size of nearest power-of-two
/// pixel rect, which in ceiled to tileSize and enlarged by 1 tile on each side
/// to produce an effect of simple precaching.
m2::RectD pxRect = m_screen.PixelRect();
int tileSize = GetPlatform().TileSize();
int pxWidthInTiles = (pxRect.SizeX() + tileSize - 1) / tileSize;
int pxHeightInTiles = (pxRect.SizeY() + tileSize - 1) / tileSize;
int pxWidthInTiles = 1 + (pxRect.SizeX() + tileSize - 1) / tileSize;
int pxHeightInTiles = 1 + (pxRect.SizeY() + tileSize - 1) / tileSize;
pxWidthInTiles += 1;
pxHeightInTiles += 1;
m2::PointD pxCenter = pxRect.Center();
double glbHalfSizeX = m_screen.PtoG(pxRect.Center() - m2::PointD(pxWidthInTiles * tileSize / 2, 0)).Length(m_screen.PtoG(pxRect.Center()));
double glbHalfSizeY = m_screen.PtoG(pxRect.Center() - m2::PointD(0, pxHeightInTiles * tileSize / 2)).Length(m_screen.PtoG(pxRect.Center()));
double glbHalfSizeX = m_screen.PtoG(pxCenter - m2::PointD(pxWidthInTiles * tileSize / 2, 0)).Length(m_screen.PtoG(pxCenter));
double glbHalfSizeY = m_screen.PtoG(pxCenter - m2::PointD(0, pxHeightInTiles * tileSize / 2)).Length(m_screen.PtoG(pxCenter));
m2::AnyRectD globalRect(m_screen.PtoG(m_screen.PixelRect().Center()),
m2::AnyRectD globalRect(m_screen.PtoG(pxCenter),
m_screen.GlobalRect().angle(),
m2::RectD(-glbHalfSizeX, -glbHalfSizeY, glbHalfSizeX, glbHalfSizeY));