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

Removed unused code

Browse source
This commit is contained in:
Constantin Shalnev 2015-10-07 16:50:54 +03:00 • committed by r.kuznetsov
parent 029197965a
commit 7d552d5068
2 changed files with 0 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
drape_frontend/stylist.cpp
View file

@ -67,18 +67,6 @@ bool IsMiddleTunnel(int const layer, double const depth)
return layer != feature::LAYER_EMPTY && depth < 19000;
}
double CalcPopulationRank(FeatureType const & f)
{
uint32_t population = f.GetPopulation();
if (population != 1)
{
double const maxPopulation = 3.0E6;
return min(maxPopulation, (double)population) / (maxPopulation * 4);
}
return 0.0;
}
void FilterRulesByRuntimeSelector(FeatureType const & f, int zoomLevel, drule::KeysT & keys)
{
keys.erase_if([&f, zoomLevel](drule::Key const & key)->bool
@ -180,9 +168,6 @@ const uint8_t PointStyleFlag = 1 << 3;
// ==================================== //
CaptionDescription::CaptionDescription()
: m_populationRank(0.0) {}
void CaptionDescription::Init(FeatureType const & f,
int const zoomLevel)
{
@ -190,7 +175,6 @@ void CaptionDescription::Init(FeatureType const & f,
m_roadNumber = f.GetRoadNumber();
m_houseNumber = f.GetHouseNumber();
m_populationRank = CalcPopulationRank(f);
if (ftypes::IsBuildingChecker::Instance()(f))
{
@ -247,11 +231,6 @@ string CaptionDescription::GetPathName() const
return m_mainText + " " + m_auxText;
}
double CaptionDescription::GetPopulationRank() const
{
return m_populationRank;
}
bool CaptionDescription::IsNameExists() const
{
return !m_mainText.empty() || !m_houseNumber.empty();

4
drape_frontend/stylist.hpp
View file

@ -16,8 +16,6 @@ namespace df
struct CaptionDescription
{
CaptionDescription();
void Init(FeatureType const & f,
int const zoomLevel);
@ -29,7 +27,6 @@ struct CaptionDescription
string const & GetAuxText() const;
string const & GetRoadNumber() const;
string GetPathName() const;
double GetPopulationRank() const;
bool IsNameExists() const;
private:
@ -41,7 +38,6 @@ private:
string m_auxText;
string m_roadNumber;
string m_houseNumber;
double m_populationRank;
};
class Stylist