pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Minor changes.

Browse source
This commit is contained in:
vng 2012-07-30 15:54:30 -07:00 • committed by Alex Zolotarev
parent 1e1ed936d6
commit d9cdcfcb6f
3 changed files with 7 additions and 8 deletions
android/jni/com/mapswithme/maps
Framework.hpp
map
address_finder.cppscreen_coverage.cpp

4
android/jni/com/mapswithme/maps/Framework.hpp
View file

@ -27,10 +27,6 @@ namespace android
void CallRepaint();
void CreateDrawer();
void CreateResourceManager();
NVMultiTouchEventType m_eventType; //< multitouch action
double m_x1;

3
map/address_finder.cpp
View file

@ -305,6 +305,7 @@ namespace
protected:
virtual bool IsInclude(double dist, feature::TypesHolder const & types) const
{
// 0 - point, 1 - linear, 2 - area;
return (dist <= m_arrEps[types.GetGeoType()]);
}
@ -327,6 +328,7 @@ namespace
{
for (size_t i = 0; i < 3; ++i)
{
// use average value to convert meters to degrees
m2::RectD const r = MercatorBounds::RectByCenterXYAndSizeInMeters(pt, arrRadius[i]);
m_arrEps[i] = (r.SizeX() + r.SizeY()) / 2.0;
}
@ -399,6 +401,7 @@ namespace
m2::RectD const & rect)
: DoGetAddressBase(pt, scale, checker)
{
// use maximum value to convert meters to degrees
m_eps = max(rect.SizeX(), rect.SizeY());
}

8
map/screen_coverage.cpp
View file

@ -219,10 +219,10 @@ void ScreenCoverage::SetScreen(ScreenBase const & screen)
m_isEmptyModelAtCoverageCenter = true;
m_leafTilesToRender = 0;
for (unsigned i = 0; i < allRects.size(); ++i)
for (size_t i = 0; i < allRects.size(); ++i)
{
m_tileRects.insert(allRects[i]);
Tiler::RectInfo ri = allRects[i];
Tiler::RectInfo const & ri = allRects[i];
m_tileRects.insert(ri);
if (tileCache->HasTile(ri))
{
@ -230,7 +230,7 @@ void ScreenCoverage::SetScreen(ScreenBase const & screen)
Tile const * tile = &tileCache->GetTile(ri);
ASSERT(tiles.find(tile) == tiles.end(), ());
if (m_tiler.isLeaf(allRects[i]))
if (m_tiler.isLeaf(ri))
m_isEmptyDrawingCoverage &= tile->m_isEmptyDrawing;
tiles.insert(tile);