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

[indexer] Move Classificator private methods to the bottom.

Browse source
This commit is contained in:
tatiana-yan 2018-10-12 17:50:40 +03:00 • committed by mpimenov
parent f3a5ddff9c
commit 5b3b8c470c
1 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
indexer/classificator.hpp
View file

@ -157,16 +157,6 @@ inline void swap(ClassifObject & r1, ClassifObject & r2)
class Classificator
{
DISALLOW_COPY_AND_MOVE(Classificator);
ClassifObject m_root;
IndexAndTypeMapping m_mapping;
uint32_t m_coastType;
static ClassifObject * AddV(ClassifObject * parent, std::string const & key, std::string const & value);
public:
Classificator() : m_root("world") {}
@ -184,14 +174,6 @@ public:
bool HasTypesMapping() const { return m_mapping.IsLoaded(); }
/// Return type by path in classificator tree, for example
/// path = ["natural", "caostline"].
//@{
private:
template <typename Iter>
uint32_t GetTypeByPathImpl(Iter beg, Iter end) const;
public:
/// @return 0 in case of nonexisting type
uint32_t GetTypeByPathSafe(std::vector<std::string> const & path) const;
/// Invokes ASSERT in case of nonexisting type
@ -242,6 +224,22 @@ public:
/// @return Object name to show in UI (not for debug purposes).
std::string GetReadableObjectName(uint32_t type) const;
private:
static ClassifObject * AddV(ClassifObject * parent, std::string const & key,
std::string const & value);
/// Return type by path in classificator tree, for example
/// path = ["natural", "caostline"].
//@{
template <typename Iter>
uint32_t GetTypeByPathImpl(Iter beg, Iter end) const;
ClassifObject m_root;
IndexAndTypeMapping m_mapping;
uint32_t m_coastType;
DISALLOW_COPY_AND_MOVE(Classificator);
};
Classificator & classif();