From 291061e176d9f38f42379e0854e5b45b4f6d1142 Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Wed, 13 Sep 2023 22:53:24 +0300 Subject: [PATCH] [drape] Simplify Stylist init invocation Signed-off-by: Konstantin Pastbin --- drape_frontend/rule_drawer.cpp | 16 +++++++--------- drape_frontend/rule_drawer.hpp | 8 +++----- drape_frontend/tile_info.cpp | 33 +++++++++++++++------------------ drape_frontend/tile_info.hpp | 3 +-- 4 files changed, 26 insertions(+), 34 deletions(-) diff --git a/drape_frontend/rule_drawer.cpp b/drape_frontend/rule_drawer.cpp index de068180c2..038bb3770f 100644 --- a/drape_frontend/rule_drawer.cpp +++ b/drape_frontend/rule_drawer.cpp @@ -160,18 +160,16 @@ void ExtractTrafficGeometry(FeatureType const & f, df::RoadClass const & roadCla } } // namespace -RuleDrawer::RuleDrawer(TDrawerCallback const & drawerFn, - TCheckCancelledCallback const & checkCancelled, +RuleDrawer::RuleDrawer(TCheckCancelledCallback const & checkCancelled, TIsCountryLoadedByNameFn const & isLoadedFn, - ref_ptr engineContext) - : m_callback(drawerFn) - , m_checkCancelled(checkCancelled) + ref_ptr engineContext, int8_t deviceLang) + : m_checkCancelled(checkCancelled) , m_isLoadedFn(isLoadedFn) , m_context(engineContext) , m_customFeaturesContext(engineContext->GetCustomFeaturesContext().lock()) + , m_deviceLang(deviceLang) , m_wasCancelled(false) { - ASSERT(m_callback != nullptr, ()); ASSERT(m_checkCancelled != nullptr, ()); m_globalRect = m_context->GetTileKey().GetGlobalRect(); @@ -452,8 +450,10 @@ void RuleDrawer::operator()(FeatureType & f) if (!m_context->IsolinesEnabled() && ftypes::IsIsolineChecker::Instance()(f)) return; + int const zoomLevel = m_context->GetTileKey().m_zoomLevel; + Stylist s; - m_callback(f, s); + df::InitStylist(f, m_deviceLang, zoomLevel, m_context->Is3dBuildingsEnabled(), s); if (s.IsEmpty()) return; @@ -461,8 +461,6 @@ void RuleDrawer::operator()(FeatureType & f) if (!CheckCoastlines(f, s)) return; - int const zoomLevel = m_context->GetTileKey().m_zoomLevel; - // FeatureType::GetLimitRect call invokes full geometry reading and decoding. // That's why this code follows after all lightweight return options. m2::RectD const limitRect = f.GetLimitRect(zoomLevel); diff --git a/drape_frontend/rule_drawer.hpp b/drape_frontend/rule_drawer.hpp index 68bc200082..574e715eba 100644 --- a/drape_frontend/rule_drawer.hpp +++ b/drape_frontend/rule_drawer.hpp @@ -29,15 +29,13 @@ class Stylist; class RuleDrawer { public: - using TDrawerCallback = std::function; using TCheckCancelledCallback = std::function; using TIsCountryLoadedByNameFn = std::function; using TInsertShapeFn = std::function && shape)>; - RuleDrawer(TDrawerCallback const & drawerFn, - TCheckCancelledCallback const & checkCancelled, + RuleDrawer(TCheckCancelledCallback const & checkCancelled, TIsCountryLoadedByNameFn const & isLoadedFn, - ref_ptr engineContext); + ref_ptr engineContext, int8_t deviceLang); ~RuleDrawer(); void operator()(FeatureType & f); @@ -57,12 +55,12 @@ private: bool IsDiscardCustomFeature(FeatureID const & id) const; - TDrawerCallback m_callback; TCheckCancelledCallback m_checkCancelled; TIsCountryLoadedByNameFn m_isLoadedFn; ref_ptr m_context; CustomFeaturesContextPtr m_customFeaturesContext; + int8_t m_deviceLang; std::unordered_set m_usedMetalines; m2::RectD m_globalRect; diff --git a/drape_frontend/tile_info.cpp b/drape_frontend/tile_info.cpp index 0fe7f43051..8ada6698f4 100644 --- a/drape_frontend/tile_info.cpp +++ b/drape_frontend/tile_info.cpp @@ -35,7 +35,7 @@ void TileInfo::ReadFeatureIndex(MapDataProvider const & model) if (!DoNeedReadIndex()) return; - CheckCanceled(); + ThrowIfCancelled(); size_t const kAverageFeaturesCount = 256; m_featureInfo.reserve(kAverageFeaturesCount); @@ -64,7 +64,7 @@ void TileInfo::ReadFeatures(MapDataProvider const & model) SCOPE_GUARD(ReleaseReadTile, std::bind(&EngineContext::EndReadTile, m_context.get())); ReadFeatureIndex(model); - CheckCanceled(); + ThrowIfCancelled(); m_context->GetMetalineManager()->Update(m_mwms); @@ -72,9 +72,8 @@ void TileInfo::ReadFeatures(MapDataProvider const & model) { std::sort(m_featureInfo.begin(), m_featureInfo.end()); auto const deviceLang = StringUtf8Multilang::GetLangIndex(languages::GetCurrentNorm()); - RuleDrawer drawer(std::bind(&TileInfo::InitStylist, this, deviceLang, _1, _2), - std::bind(&TileInfo::IsCancelled, this), model.m_isCountryLoadedByName, - make_ref(m_context)); + RuleDrawer drawer(std::bind(&TileInfo::IsCancelled, this), model.m_isCountryLoadedByName, + make_ref(m_context), deviceLang); model.ReadFeatures(std::bind(std::ref(drawer), _1), m_featureInfo); #ifdef DRAW_TILE_NET drawer.DrawTileNet(); @@ -90,29 +89,27 @@ void TileInfo::Cancel() m_isCanceled = true; } +/* + * TODO: the following check throws an exception while IsCancelled() is used in most places to quit gracefully. + * Looks like the latter was added later, so maybe the throwing version is not needed anymore. + */ +void TileInfo::ThrowIfCancelled() const +{ + // The exception is handled in ReadMWMTask::Do(). + if (m_isCanceled) + MYTHROW(ReadCanceledException, ()); +} + bool TileInfo::IsCancelled() const { return m_isCanceled; } -void TileInfo::InitStylist(int8_t deviceLang, FeatureType & f, Stylist & s) -{ - CheckCanceled(); - df::InitStylist(f, deviceLang, m_context->GetTileKey().m_zoomLevel, - m_context->Is3dBuildingsEnabled(), s); -} - bool TileInfo::DoNeedReadIndex() const { return m_featureInfo.empty(); } -void TileInfo::CheckCanceled() const -{ - if (m_isCanceled) - MYTHROW(ReadCanceledException, ()); -} - int TileInfo::GetZoomLevel() const { return ClipTileZoomByMaxDataZoom(m_context->GetTileKey().m_zoomLevel); diff --git a/drape_frontend/tile_info.hpp b/drape_frontend/tile_info.hpp index 5f48a9de10..3d2c61189c 100644 --- a/drape_frontend/tile_info.hpp +++ b/drape_frontend/tile_info.hpp @@ -37,8 +37,7 @@ public: private: void ReadFeatureIndex(MapDataProvider const & model); - void InitStylist(int8_t deviceLang, FeatureType & f, Stylist & s); - void CheckCanceled() const; + void ThrowIfCancelled() const; bool DoNeedReadIndex() const; int GetZoomLevel() const;