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
diff options
context:
space:
mode:
authorAlex Zolotarev <alex@maps.me>2016-02-11 17:23:11 +0300
committerSergey Yershov <yershov@corp.mail.ru>2016-03-23 16:20:40 +0300
commita046daa073ad59ec1977619a32b154c207e18feb (patch)
tree2fb6c87b792210ddb4e92b4941fa71f7784698ec
parent35d40cd8fb0669eeefbf944251bf547312424ac2 (diff)
Minor search::Metadata processing optimization.
-rw-r--r--map/framework.cpp2
-rw-r--r--search/intermediate_result.cpp4
2 files changed, 5 insertions, 1 deletions
diff --git a/map/framework.cpp b/map/framework.cpp
index 9dfc016b3e..c04052c283 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -1178,7 +1178,7 @@ void Framework::LoadSearchResultMetadata(search::Result & res) const
FeatureID const & id = res.GetFeatureID();
if (id.IsValid())
search::ProcessMetadata(*GetFeatureByID(id), res.m_metadata);
- res.m_metadata.m_isInitialized = true;
+ // res.m_metadata.m_isInitialized is set to true in ProcessMetadata.
}
void Framework::ShowSearchResult(search::Result const & res)
diff --git a/search/intermediate_result.cpp b/search/intermediate_result.cpp
index f98e674c2e..04a8cf4804 100644
--- a/search/intermediate_result.cpp
+++ b/search/intermediate_result.cpp
@@ -28,6 +28,9 @@ double const DIST_SAME_STREET = 5000.0;
void ProcessMetadata(FeatureType const & ft, Result::Metadata & meta)
{
+ if (meta.m_isInitialized)
+ return;
+
feature::Metadata const & src = ft.GetMetadata();
meta.m_cuisine = src.Get(feature::Metadata::FMD_CUISINE);
@@ -47,6 +50,7 @@ void ProcessMetadata(FeatureType const & ft, Result::Metadata & meta)
meta.m_stars = my::clamp(meta.m_stars, 0, 5);
else
meta.m_stars = 0;
+ meta.m_isInitialized = true;
}
namespace impl