From a14a903f1ffb68fe5fa2ed9525109e8c340a7431 Mon Sep 17 00:00:00 2001 From: Daria Volvenkova Date: Wed, 16 May 2018 19:38:55 +0300 Subject: [PATCH] Review fixes. --- drape_frontend/drape_engine.hpp | 3 +-- drape_frontend/engine_context.hpp | 4 +++- drape_frontend/read_manager.cpp | 4 ++-- drape_frontend/read_manager.hpp | 6 ++---- map/framework.cpp | 6 +++--- map/search_mark.cpp | 13 +++++++++---- map/search_mark.hpp | 1 + 7 files changed, 21 insertions(+), 16 deletions(-) diff --git a/drape_frontend/drape_engine.hpp b/drape_frontend/drape_engine.hpp index d309cfddd0..33b5e7a081 100644 --- a/drape_frontend/drape_engine.hpp +++ b/drape_frontend/drape_engine.hpp @@ -67,8 +67,7 @@ public: bool isAutozoomEnabled, bool simplifiedTrafficColors, OverlaysShowStatsCallback && overlaysShowStatsCallback, - TIsUGCFn && isUGCFn - ) + TIsUGCFn && isUGCFn) : m_apiVersion(apiVersion) , m_factory(factory) , m_viewport(viewport) diff --git a/drape_frontend/engine_context.hpp b/drape_frontend/engine_context.hpp index 936e8838c0..7dfd19e27f 100644 --- a/drape_frontend/engine_context.hpp +++ b/drape_frontend/engine_context.hpp @@ -9,6 +9,8 @@ #include "drape/constants.hpp" #include "drape/pointers.hpp" +#include + namespace dp { class TextureManager; @@ -22,7 +24,7 @@ class MetalineManager; class EngineContext { public: - using TIsUGCFn = function; + using TIsUGCFn = std::function; EngineContext(TileKey tileKey, ref_ptr commutator, ref_ptr texMng, diff --git a/drape_frontend/read_manager.cpp b/drape_frontend/read_manager.cpp index 960542f950..af3339670a 100755 --- a/drape_frontend/read_manager.cpp +++ b/drape_frontend/read_manager.cpp @@ -44,7 +44,7 @@ bool ReadManager::LessByTileInfo::operator()(std::shared_ptr const & l } ReadManager::ReadManager(ref_ptr commutator, MapDataProvider & model, - bool allow3dBuildings, bool trafficEnabled, TIsUGCFn && isUGCFn) + bool allow3dBuildings, bool trafficEnabled, EngineContext::TIsUGCFn && isUGCFn) : m_commutator(commutator) , m_model(model) , m_have3dBuildings(false) @@ -57,7 +57,7 @@ ReadManager::ReadManager(ref_ptr commutator, MapDataProvider , m_counter(0) , m_generationCounter(0) , m_userMarksGenerationCounter(0) - , m_isUGCFn(isUGCFn) + , m_isUGCFn(std::move(isUGCFn)) { Start(); } diff --git a/drape_frontend/read_manager.hpp b/drape_frontend/read_manager.hpp index 88fd375c99..8a177b29da 100755 --- a/drape_frontend/read_manager.hpp +++ b/drape_frontend/read_manager.hpp @@ -32,10 +32,8 @@ uint8_t constexpr kReadingThreadsCount = 2; class ReadManager { public: - using TIsUGCFn = function; - ReadManager(ref_ptr commutator, MapDataProvider & model, - bool allow3dBuildings, bool trafficEnabled, TIsUGCFn && isUGCFn); + bool allow3dBuildings, bool trafficEnabled, EngineContext::TIsUGCFn && isUGCFn); void Start(); void Stop(); @@ -106,7 +104,7 @@ private: CustomFeaturesContextPtr m_customFeaturesContext; - TIsUGCFn m_isUGCFn; + EngineContext::TIsUGCFn m_isUGCFn; void CancelTileInfo(std::shared_ptr const & tileToCancel); void ClearTileInfo(std::shared_ptr const & tileToClear); diff --git a/map/framework.cpp b/map/framework.cpp index ec33aa1cee..bc111b7ec2 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -2634,18 +2634,18 @@ bool Framework::ParseDrapeDebugCommand(string const & query) true /* enabled */); return true; } - else if (query == "?no-aa" || query == "effect:no-antialiasing") + if (query == "?no-aa" || query == "effect:no-antialiasing") { m_drapeEngine->SetPosteffectEnabled(df::PostprocessRenderer::Antialiasing, false /* enabled */); return true; } - else if (query == "?ugc") + if (query == "?ugc") { m_drapeEngine->EnableUGCRendering(true /* enabled */); return true; } - else if (query == "?no-ugc") + if (query == "?no-ugc") { m_drapeEngine->EnableUGCRendering(false /* enabled */); return true; diff --git a/map/search_mark.cpp b/map/search_mark.cpp index 1a2a612a3e..1bb0808ee7 100644 --- a/map/search_mark.cpp +++ b/map/search_mark.cpp @@ -106,7 +106,7 @@ drape_ptr SearchMarkPoint::GetSymbolNames } auto symbol = make_unique_dp(); - if (IsBookingSpecialMark() || IsUGCMark()) + if (IsMarkWithRating()) { symbol->insert(std::make_pair(1 /* zoomLevel */, m_rating < kRatingThreshold ? GetBookingSmallIcon(m_type) : name)); @@ -160,7 +160,7 @@ drape_ptr SearchMarkPoint::GetSymbolOffsets() df::ColorConstant SearchMarkPoint::GetColorConstant() const { - if (!IsBookingSpecialMark() && !IsUGCMark()) + if (!IsMarkWithRating()) return {}; if (m_type == SearchMarkType::LocalAdsBooking) @@ -181,7 +181,7 @@ df::ColorConstant SearchMarkPoint::GetColorConstant() const drape_ptr SearchMarkPoint::GetTitleDecl() const { - if (!(IsBookingSpecialMark() || IsUGCMark()) || fabs(m_rating) < 1e-5) + if (!IsMarkWithRating() || fabs(m_rating) < 1e-5) return nullptr; auto titles = make_unique_dp(); @@ -191,7 +191,7 @@ drape_ptr SearchMarkPoint::GetTitleDecl() const int SearchMarkPoint::GetMinTitleZoom() const { - if ((IsBookingSpecialMark() || IsUGCMark()) && m_rating < kRatingThreshold) + if (IsMarkWithRating() && m_rating < kRatingThreshold) return 17; return 1; } @@ -243,6 +243,11 @@ bool SearchMarkPoint::IsUGCMark() const return m_type == SearchMarkType::UGC; } +bool SearchMarkPoint::IsMarkWithRating() const +{ + return IsBookingSpecialMark() || IsUGCMark(); +} + // static std::map SearchMarks::m_searchMarksSizes; diff --git a/map/search_mark.hpp b/map/search_mark.hpp index 9cfb29df94..ec1ef27843 100644 --- a/map/search_mark.hpp +++ b/map/search_mark.hpp @@ -65,6 +65,7 @@ protected: bool IsBookingSpecialMark() const; bool IsUGCMark() const; + bool IsMarkWithRating() const; SearchMarkType m_type = SearchMarkType::Default; FeatureID m_featureID;