diff options
author | Yuri Gorshenin <y@maps.me> | 2017-10-30 12:32:00 +0300 |
---|---|---|
committer | Vladimir Byko-Ianko <bykoianko@gmail.com> | 2017-10-30 14:19:26 +0300 |
commit | 1d028300afe2a83005e8b6602fef069984bc56ed (patch) | |
tree | a54c945d45383c0b920aaba6d20831c64667be44 | |
parent | eda43f183782407038d2dc07a0f4a13be607daf3 (diff) |
Review fixes.
-rw-r--r-- | search/processor.cpp | 6 | ||||
-rw-r--r-- | search/processor.hpp | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/search/processor.cpp b/search/processor.cpp index 0e2e2c3ba8..4faa02552b 100644 --- a/search/processor.cpp +++ b/search/processor.cpp @@ -216,10 +216,8 @@ void Processor::SetViewport(m2::RectD const & viewport) if (m_viewport.IsValid()) { - double constexpr epsMeters = 10.0; - - // Skip if viewports are equal. - if (IsEqualMercator(m_viewport, viewport, epsMeters)) + double constexpr kEpsMeters = 10.0; + if (IsEqualMercator(m_viewport, viewport, kEpsMeters)) return; } diff --git a/search/processor.hpp b/search/processor.hpp index 22679c86f9..9af3178bb7 100644 --- a/search/processor.hpp +++ b/search/processor.hpp @@ -20,12 +20,15 @@ #include "indexer/rank_table.hpp" #include "indexer/string_slice.hpp" +#include "coding/multilang_utf8_string.hpp" + #include "geometry/rect2d.hpp" #include "base/cancellable.hpp" #include "base/limited_priority_queue.hpp" #include "base/string_utils.hpp" +#include "std/cstdint.hpp" #include "std/function.hpp" #include "std/map.hpp" #include "std/shared_ptr.hpp" @@ -86,8 +89,8 @@ public: inline m2::PointD const & GetPosition() const { return m_position; } /// Suggestions language code, not the same as we use in mwm data - int8_t m_inputLocaleCode; - int8_t m_currentLocaleCode; + int8_t m_inputLocaleCode = StringUtf8Multilang::kUnsupportedLanguageCode; + int8_t m_currentLocaleCode = StringUtf8Multilang::kUnsupportedLanguageCode; inline bool IsEmptyQuery() const { return (m_prefix.empty() && m_tokens.empty()); } |