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

[watch] Fixed coastlines processing.

Browse source
This commit is contained in:
vng 2015-12-10 15:52:52 +03:00
parent cf4f0700b4
commit 66ab482315
2 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drape_frontend/watch/feature_processor.cpp
View file

@ -40,8 +40,9 @@ FeatureProcessor::FeatureProcessor(ref_ptr<CPUDrawer> drawer,
, m_rect(r)
, m_convertor(convertor)
, m_zoom(zoomLevel)
, m_hasNonCoast(false)
{
/// @todo This class is used for watches only where m_zoom >= 10.
// ASSERT_GREATER(m_zoom, scales::GetUpperWorldScale(), ());
}
bool FeatureProcessor::operator()(FeatureType const & f)
@ -54,14 +55,11 @@ bool FeatureProcessor::operator()(FeatureType const & f)
if (data.m_styler.IsEmpty())
return true;
// Draw coastlines features only once.
if (data.m_styler.m_isCoastline)
if (data.m_styler.m_isCoastline &&
f.GetID().m_mwmId.GetInfo()->GetType() == MwmInfo::COASTS)
{
if (!m_coasts.insert(data.m_styler.m_primaryText).second)
return true;
return true;
}
else
m_hasNonCoast = true;
bool isExist = false;

2
drape_frontend/watch/feature_processor.hpp
View file

@ -46,10 +46,8 @@ public:
private:
ref_ptr<CPUDrawer> m_drawer;
m2::RectD m_rect;
set<string> m_coasts;
ScreenBase const & m_convertor;
int m_zoom;
bool m_hasNonCoast;
bool m_hasAnyFeature;
void PreProcessKeys(vector<drule::Key> & keys) const;