kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

[new downloader] Style fixes. Review fixes.

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2016-03-02 10:51:13 +03:00 • committed by Sergey Yershov
parent daac996118
commit 953f9c06c0
3 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
storage/country.hpp
View file

@ -1,8 +1,8 @@
#pragma once
#include "storage/country_decl.hpp"
#include "storage/index.hpp"
#include "storage/country_tree_facade.hpp"
#include "storage/index.hpp"
#include "storage/storage_defines.hpp"
#include "platform/local_country_file.hpp"
@ -25,7 +25,7 @@ namespace storage
{
using TMapping = map<TCountryId, TCountriesSet>;
/// This class keeps all the information about a country in countre tree (TCountriesFacade).
/// This class keeps all the information about a country in country tree (TCountriesFacade).
/// It is guaranteed that every node represent a unique region has a unique |m_name| in country tree.
/// If several nodes have the same |m_name| they represent the same region.
/// It happends in case of disputed territories.
@ -75,8 +75,8 @@ public:
TCountryId const & Name() const { return m_name; }
};
typedef CountryTree<Country> TCountriesContainer;
typedef CountryTreeFacade<Country> TCountriesFacade;
using TCountriesContainer = CountryTree<Country>;
using TCountriesFacade = CountryTreeFacade<Country>;
/// @return version of country file or -1 if error was encountered
int64_t LoadCountries(string const & jsonBuffer, TCountriesFacade & countries, TMapping * mapping = nullptr);

3
storage/country_tree.hpp
View file

@ -6,9 +6,6 @@
#include "std/shared_ptr.hpp"
#include "std/vector.hpp"
template <class T>
bool IsEqual(T const & v1, T const & v2) { return !(v1 < v2) && !(v2 < v1); }
/// This class is developed for using in Storage. It's a implementation of a tree.
/// It should be filled with AddAtDepth method.
/// This class is used in Storage and filled based on countries.txt (countries_migrate.txt).

16
storage/country_tree_facade.hpp
View file

@ -8,13 +8,17 @@
template <class K>
struct CountryTreeKeyHasher
{
size_t operator()(K const & k) const { return hash<string>()(k.Name()); }
size_t operator()(K const & k) const { return m_hash(k.Name()); }
private:
hash<string> m_hash;
};
template<>
struct CountryTreeKeyHasher<int>
{
size_t operator()(int k) const { return hash<int>()(k); }
size_t operator()(int k) const { return m_hash(k); }
private:
hash<int> m_hash;
};
/// This class is developed for using in Storage. It's a implementation of a tree.
@ -55,9 +59,6 @@ public:
/// \brief Checks all nodes in tree to find an equal one. If there're several equal nodes
/// returns the first found.
/// \returns a poiter item in the tree if found and nullptr otherwise.
/// @TODO(bykoianko) The complexity of the method is O(n). But the structure (tree) is built on the start of the program
/// and then actively used on run time. This method (and class) should be redesigned to make the function work faster.
/// A hash table is being planned to use.
void Find(T const & value, vector<CountryTree<T> const *> & found) const
{
found.clear();
@ -94,8 +95,10 @@ public:
Find(value, found);
for (auto node : found)
{
if (node->ChildrenCount() == 0)
return node;
}
return nullptr;
}
@ -132,4 +135,7 @@ public:
template <class TFunctor>
void ForEachAncestorExceptForTheRoot(TFunctor && f) const { return m_countryTree.ForEachAncestorExceptForTheRoot(f); }
private:
static bool IsEqual(T const & v1, T const & v2) { return !(v1 < v2) && !(v2 < v1); }
};