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

Merge pull request #5496 from dobriy-eeh/simplify-mwm-traits

Browse source 
small refactoring mwm traits
This commit is contained in:
Yuri Gorshenin 2017-03-02 12:04:39 +03:00 • committed by GitHub
commit db8081d072
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
platform/mwm_traits.cpp
View file

@ -8,24 +8,24 @@ MwmTraits::MwmTraits(MwmVersion const & version) : m_version(version) {}
MwmTraits::SearchIndexFormat MwmTraits::GetSearchIndexFormat() const
{
if (m_version.GetFormat() < version::Format::v7)
if (GetFormat() < version::Format::v7)
return SearchIndexFormat::FeaturesWithRankAndCenter;
return SearchIndexFormat::CompressedBitVector;
}
MwmTraits::HouseToStreetTableFormat MwmTraits::GetHouseToStreetTableFormat() const
{
if (m_version.GetFormat() < version::Format::v7)
if (GetFormat() < version::Format::v7)
return HouseToStreetTableFormat::Unknown;
return HouseToStreetTableFormat::Fixed3BitsDDVector;
}
bool MwmTraits::HasOffsetsTable() const { return m_version.GetFormat() >= version::Format::v6; }
bool MwmTraits::HasOffsetsTable() const { return GetFormat() >= version::Format::v6; }
bool MwmTraits::HasRoutingIndex() const
{
uint32_t constexpr kFirstVersionWithRoutingIndex = 161206;
return m_version.GetVersion() >= kFirstVersionWithRoutingIndex;
return GetVersion() >= kFirstVersionWithRoutingIndex;
}
string DebugPrint(MwmTraits::SearchIndexFormat format)

3
platform/mwm_traits.hpp
View file

@ -51,6 +51,9 @@ public:
bool HasRoutingIndex() const;
private:
Format GetFormat() const { return m_version.GetFormat(); }
uint32_t GetVersion() const { return m_version.GetVersion(); }
MwmVersion m_version;
};