Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/map
diff options
context:
space:
mode:
authorvng <viktor.govako@gmail.com>2015-08-07 14:10:07 +0300
committerAlex Zolotarev <alex@maps.me>2015-09-23 02:59:54 +0300
commitbf973b8c30031be4b8dc29b811a0a7f8d9ae1b51 (patch)
tree7e922eb0e3c2336f022de5221e1b0eae30182908 /map
parenta23a6f32577d409fbe14057ed94f488e5023efdb (diff)
[storage] Added TLocalFilePtr typedef.
Diffstat (limited to 'map')
-rw-r--r--map/framework.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/map/framework.cpp b/map/framework.cpp
index 4d7055ab65..54f0b17707 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -443,8 +443,7 @@ void Framework::ShowCountry(TIndex const & index)
void Framework::UpdateLatestCountryFile(LocalCountryFile const & localFile)
{
- // TODO (@ldragunov, @gorshenin): rewrite routing session to use MwmHandles. Thus,
- // it won' be needed to reset it after maps update.
+ // Soft reset to signal that mwm file may be out of date in routing caches.
m_routingSession.Reset();
if (!HasOptions(localFile.GetFiles(), MapOptions::Map))
@@ -455,6 +454,7 @@ void Framework::UpdateLatestCountryFile(LocalCountryFile const & localFile)
MwmSet::MwmHandle const & handle = result.first;
if (handle.IsAlive())
InvalidateRect(handle.GetInfo()->m_limitRect, true /* doForceUpdate */);
+
GetSearchEngine()->ClearViewportsCache();
}
@@ -481,9 +481,11 @@ void Framework::RegisterAllMaps()
shared_ptr<LocalCountryFile> localFile = m_storage.GetLatestLocalFile(countryFile);
if (!localFile)
continue;
+
auto p = RegisterMap(*localFile);
if (p.second != MwmSet::RegResult::Success)
continue;
+
MwmSet::MwmHandle const & handle = p.first;
ASSERT(handle.IsAlive(), ());
minFormat = min(minFormat, static_cast<int>(handle.GetInfo()->m_version.format));