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

[search] Initialize SearchEngine object on startup.

Browse source
This commit is contained in:
vng 2012-09-06 15:20:15 +03:00 • committed by Alex Zolotarev
parent 0f67cd0cf7
commit 29487ffc8d
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
map/framework.cpp
View file

@ -134,7 +134,7 @@ Framework::Framework()
m_lowestMapVersion(-1),
m_benchmarkEngine(0)
{
// checking whether we should enable benchmark
// Checking whether we should enable benchmark.
bool isBenchmarkingEnabled = false;
(void)Settings::Get("IsBenchmarking", isBenchmarkingEnabled);
if (isBenchmarkingEnabled)
@ -171,11 +171,15 @@ Framework::Framework()
m_model.InitClassificator();
// To avoid possible races - init search engine once in constructor.
(void)GetSearchEngine();
// Get all available maps.
vector<string> maps;
GetResourcesMaps(maps);
#ifndef OMIM_OS_ANDROID
// On Android, local maps are added and removed when external storage
// is connected/disconnected
// On Android, local maps are added and removed when
// external storage is connected/disconnected.
GetLocalMaps(maps);
#endif
@ -185,7 +189,9 @@ Framework::Framework()
for_each(maps.begin(), maps.end(), bind(&Framework::AddMap, this, _1));
// Init storage with needed callback.
m_storage.Init(bind(&Framework::UpdateAfterDownload, this, _1));
LOG(LDEBUG, ("Storage initialized"));
}