diff options
| author | vng <viktor.govako@gmail.com> | 2015-07-23 19:04:03 +0300 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 03:01:29 +0300 |
| commit | a19239fa847f1a5d7e95deb1aeacef80799b3ed9 (patch) | |
| tree | efded0d3e963222829d5315d050752bf71dff218 /map/feature_vec_model.cpp | |
| parent | 57921f1e7c4f2932b41d423f381bf630ff705b34 (diff) | |
Simplified routing when GetCountryName() needed.
Diffstat (limited to 'map/feature_vec_model.cpp')
| -rw-r--r-- | map/feature_vec_model.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/map/feature_vec_model.cpp b/map/feature_vec_model.cpp index fd3b1015cc..f28c8e65e1 100644 --- a/map/feature_vec_model.cpp +++ b/map/feature_vec_model.cpp @@ -47,13 +47,12 @@ void FeaturesFetcher::InitClassificator() pair<MwmSet::MwmHandle, MwmSet::RegResult> FeaturesFetcher::RegisterMap( LocalCountryFile const & localFile) { - string const countryFileName = localFile.GetCountryName(); try { auto result = m_multiIndex.RegisterMap(localFile); if (result.second != MwmSet::RegResult::Success) { - LOG(LWARNING, ("Can't add map", countryFileName, + LOG(LWARNING, ("Can't add map", localFile.GetCountryName(), "Probably it's already added or has newer data version.")); return result; } @@ -62,9 +61,9 @@ pair<MwmSet::MwmHandle, MwmSet::RegResult> FeaturesFetcher::RegisterMap( m_rect.Add(handle.GetInfo()->m_limitRect); return result; } - catch (RootException const & e) + catch (RootException const & ex) { - LOG(LERROR, ("IO error while adding ", countryFileName, " map. ", e.what())); + LOG(LERROR, ("IO error while adding ", localFile.GetCountryName(), " map. ", ex.Msg())); return make_pair(MwmSet::MwmHandle(), MwmSet::RegResult::BadFile); } } |