From 943a8ff895e514fb5d2fb195376eb19ec90c3469 Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Fri, 10 Feb 2023 12:10:45 +0000 Subject: [PATCH] [drape] Make path_texts use minVisibleScale for rendering order Like all other overlays. Needed-for: #4314 Signed-off-by: Konstantin Pastbin --- drape_frontend/path_text_handle.cpp | 5 ----- drape_frontend/path_text_handle.hpp | 1 - drape_frontend/rule_drawer.cpp | 1 + 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/drape_frontend/path_text_handle.cpp b/drape_frontend/path_text_handle.cpp index a3aade16ae..5fc884abc6 100644 --- a/drape_frontend/path_text_handle.cpp +++ b/drape_frontend/path_text_handle.cpp @@ -348,11 +348,6 @@ void PathTextHandle::GetAttributeMutation(ref_ptr mu TextHandle::GetAttributeMutation(mutator); } -uint64_t PathTextHandle::GetPriorityMask() const -{ - return dp::kPriorityMaskManual | dp::kPriorityMaskRank; -} - bool PathTextHandle::Enable3dExtention() const { // Do not extend overlays for path texts. diff --git a/drape_frontend/path_text_handle.hpp b/drape_frontend/path_text_handle.hpp index ab3f74f164..e89d6d0950 100644 --- a/drape_frontend/path_text_handle.hpp +++ b/drape_frontend/path_text_handle.hpp @@ -60,7 +60,6 @@ public: m2::RectD GetPixelRect(ScreenBase const & screen, bool perspective) const override; void GetPixelShape(ScreenBase const & screen, bool perspective, Rects & rects) const override; void GetAttributeMutation(ref_ptr mutator) const override; - uint64_t GetPriorityMask() const override; bool Enable3dExtention() const override; bool HasLinearFeatureShape() const override; diff --git a/drape_frontend/rule_drawer.cpp b/drape_frontend/rule_drawer.cpp index c73c66115a..3519ee9225 100644 --- a/drape_frontend/rule_drawer.cpp +++ b/drape_frontend/rule_drawer.cpp @@ -363,6 +363,7 @@ void RuleDrawer::ProcessLineStyle(FeatureType & f, Stylist const & s, if (needAdditional && !clippedSplines.empty()) { + minVisibleScale = feature::GetMinDrawableScale(f); ApplyLineFeatureAdditional applyAdditional(m_context->GetTileKey(), insertShape, f.GetID(), m_currentScaleGtoP, minVisibleScale, f.GetRank(), s.GetCaptionDescription(), clippedSplines);