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

Merge pull request #2488 from ygorshenin/fix-quality-tools

Browse source 
[search] Fixed features collector tool to support affiliations.
This commit is contained in:
mpimenov 2016-03-25 11:58:13 +03:00
commit 884a776252
1 changed files with 31 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
search/search_quality/features_collector_tool/features_collector_tool.cpp
View file

@ -8,6 +8,12 @@
#include "indexer/classificator_loader.hpp"
#include "indexer/feature_algo.hpp"
#include "storage/country_info_getter.hpp"
#include "storage/index.hpp"
#include "storage/storage.hpp"
#include "coding/file_name_utils.hpp"
#include "platform/local_country_file.hpp"
#include "platform/local_country_file_utils.hpp"
#include "platform/platform.hpp"
@ -21,15 +27,29 @@
#include "std/unique_ptr.hpp"
#include "std/vector.hpp"
#include "defines.hpp"
#include "3party/gflags/src/gflags/gflags.h"
using namespace search::tests_support;
using namespace search;
using namespace storage;
DEFINE_string(data_path, "", "Path to data directory (resources dir)");
DEFINE_string(mwm_path, "", "Path to mwm files (writable dir)");
DEFINE_string(json_in, "", "Path to the json file with samples (default: stdin)");
void DidDownload(TCountryId const & /* countryId */,
shared_ptr<platform::LocalCountryFile> const & /* localFile */)
{
}
bool WillDelete(TCountryId const & /* countryId */,
shared_ptr<platform::LocalCountryFile> const & /* localFile */)
{
return false;
}
struct Context
{
Context(Index & index) : m_index(index) {}
@ -113,8 +133,12 @@ int main(int argc, char * argv[])
Platform & platform = GetPlatform();
string countriesFile = COUNTRIES_FILE;
if (!FLAGS_data_path.empty())
{
platform.SetResourceDir(FLAGS_data_path);
countriesFile = my::JoinFoldersToPath(FLAGS_data_path, COUNTRIES_FILE);
}
if (!FLAGS_mwm_path.empty())
platform.SetWritableDirForTests(FLAGS_mwm_path);
@ -122,6 +146,11 @@ int main(int argc, char * argv[])
LOG(LINFO, ("writable dir =", platform.WritableDir()));
LOG(LINFO, ("resources dir =", platform.ResourcesDir()));
Storage storage(countriesFile, FLAGS_mwm_path);
storage.Init(&DidDownload, &WillDelete);
auto infoGetter = CountryInfoReader::CreateCountryInfoReader(platform);
infoGetter->InitAffiliationsInfo(&storage.GetAffiliations());
string jsonStr;
if (FLAGS_json_in.empty())
{
@ -146,7 +175,8 @@ int main(int argc, char * argv[])
}
classificator::Load();
TestSearchEngine engine(make_unique<SearchQueryFactory>(), Engine::Params{});
TestSearchEngine engine(move(infoGetter), make_unique<SearchQueryFactory>(), Engine::Params{});
vector<platform::LocalCountryFile> mwms;
platform::FindAllLocalMapsAndCleanup(numeric_limits<int64_t>::max() /* the latest version */,
mwms);