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

Minor performance fixes.

Browse source
This commit is contained in:
vng 2012-06-22 18:06:23 -07:00 • committed by Alex Zolotarev
parent 733b39ccb5
commit ff55299029
4 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
storage/country.cpp
View file

@ -29,14 +29,21 @@ uint32_t CountryFile::GetFileSize() const
return 0;
}
struct CountryBoundsCalculator
class CountryBoundsCalculator
{
m2::RectD & m_bounds;
CountryBoundsCalculator(m2::RectD & bounds) : m_bounds(bounds) {}
Platform & m_platform;
public:
CountryBoundsCalculator(m2::RectD & bounds)
: m_bounds(bounds), m_platform(GetPlatform())
{
}
void operator()(CountryFile const & file)
{
feature::DataHeader h;
LoadMapHeader(GetPlatform().GetReader(file.GetFileWithExt()), h);
LoadMapHeader(m_platform.GetReader(file.GetFileWithExt()), h);
m_bounds.Add(h.GetBounds());
}
};

3
storage/country_decl.cpp
View file

@ -1,7 +1,7 @@
#include "country_decl.hpp"
string storage::CountryInfo::FileName2FullName(string fName)
void storage::CountryInfo::FileName2FullName(string & fName)
{
size_t const i = fName.find('_');
if (i != string::npos)
@ -10,7 +10,6 @@ string storage::CountryInfo::FileName2FullName(string fName)
fName[i] = ',';
fName.insert(i+1, " ");
}
return fName;
}
void storage::CountryInfo::FullName2GroupAndMap(string const & fName, string & group, string & map)

2
storage/country_decl.hpp
View file

@ -30,7 +30,7 @@ namespace storage
bool IsNotEmpty() const { return !m_flag.empty(); }
static string FileName2FullName(string fName);
static void FileName2FullName(string & fName);
static void FullName2GroupAndMap(string const & fName, string & group, string & map);
};
}

2
storage/country_info.cpp
View file

@ -108,7 +108,7 @@ namespace storage
if (info.m_name.empty())
info.m_name = id;
info.m_name = CountryInfo::FileName2FullName(info.m_name);
CountryInfo::FileName2FullName(info.m_name);
}
void CountryInfoGetter::CalcUSALimitRect(m2::RectD rects[3]) const