diff --git a/drape/overlay_handle.cpp b/drape/overlay_handle.cpp index 28feed320a..15f8556c7b 100644 --- a/drape/overlay_handle.cpp +++ b/drape/overlay_handle.cpp @@ -267,7 +267,7 @@ uint64_t CalculateOverlayPriority(int minZoomLevel, uint8_t rank, float depth) float const kMinDepth = -100000.0f; float const kMaxDepth = 100000.0f; float const d = my::clamp(depth, kMinDepth, kMaxDepth) - kMinDepth; - uint32_t const priority = static_cast(d); + auto const priority = static_cast(d); return (static_cast(minZoom) << 56) | (static_cast(priority) << 24) | diff --git a/drape_frontend/apply_feature_functors.cpp b/drape_frontend/apply_feature_functors.cpp index c77ebb9a8d..063bcda39d 100644 --- a/drape_frontend/apply_feature_functors.cpp +++ b/drape_frontend/apply_feature_functors.cpp @@ -445,7 +445,6 @@ void BaseApplyFeature::ExtractCaptionParams(CaptionDefProto const * primaryProto titleDecl.m_primaryOptional = primaryProto->is_optional(); titleDecl.m_secondaryOptional = true; - if (secondaryProto) { dp::FontDecl auxDecl; @@ -513,7 +512,7 @@ void ApplyPointFeature::ProcessPointRule(Stylist::TRuleWrapper const & rule) return; drule::BaseRule const * pRule = rule.first; - float const depth = static_cast(rule.second); + auto const depth = static_cast(rule.second); SymbolRuleProto const * symRule = pRule->GetSymbol(); if (symRule != nullptr) @@ -600,8 +599,15 @@ void ApplyPointFeature::Finish(ref_ptr texMng) for (auto textParams : m_textParams) { - textParams.m_specialDisplacement = specialDisplacementMode ? SpecialDisplacement::SpecialMode - : SpecialDisplacement::None; + if (m_captions.IsHouseNumberInMainText()) + { + textParams.m_specialDisplacement = SpecialDisplacement::HouseNumber; + } + else + { + textParams.m_specialDisplacement = specialDisplacementMode ? SpecialDisplacement::SpecialMode + : SpecialDisplacement::None; + } textParams.m_specialPriority = specialModePriority; textParams.m_startOverlayRank = hasPOI ? dp::OverlayRank1 : dp::OverlayRank0; m_insertShape(make_unique_dp(m_centerPoint, textParams, m_tileKey, symbolSize, @@ -1105,7 +1111,7 @@ void ApplyLineFeatureAdditional::Finish(ref_ptr texMng, if (m_clippedSplines.empty()) return; - float const vs = static_cast(df::VisualParams::Instance().GetVisualScale()); + auto const vs = static_cast(df::VisualParams::Instance().GetVisualScale()); std::vector shieldPositions; if (m_shieldRule != nullptr && !roadShields.empty()) diff --git a/drape_frontend/poi_symbol_shape.cpp b/drape_frontend/poi_symbol_shape.cpp index fb4ec6ea79..057e695d26 100644 --- a/drape_frontend/poi_symbol_shape.cpp +++ b/drape_frontend/poi_symbol_shape.cpp @@ -174,10 +174,6 @@ uint64_t PoiSymbolShape::GetOverlayPriority() const if (m_params.m_specialDisplacement == SpecialDisplacement::UserMark) return dp::CalculateUserMarkPriority(m_params.m_minVisibleScale, m_params.m_specialPriority); - // Set up minimal priority for shapes which belong to areas. - if (m_params.m_hasArea) - return 0; - return dp::CalculateOverlayPriority(m_params.m_minVisibleScale, m_params.m_rank, m_params.m_depth); } } // namespace df diff --git a/drape_frontend/shape_view_params.hpp b/drape_frontend/shape_view_params.hpp index 904d24017e..4c6308f4f5 100644 --- a/drape_frontend/shape_view_params.hpp +++ b/drape_frontend/shape_view_params.hpp @@ -32,7 +32,8 @@ enum class SpecialDisplacement { None, SpecialMode, - UserMark + UserMark, + HouseNumber }; struct CommonOverlayViewParams : public CommonViewParams diff --git a/drape_frontend/stylist.cpp b/drape_frontend/stylist.cpp index 29207996ba..4c9006447f 100644 --- a/drape_frontend/stylist.cpp +++ b/drape_frontend/stylist.cpp @@ -242,13 +242,15 @@ void CaptionDescription::ProcessMainTextType(drule::text_type_t const & mainText { m_mainText.swap(m_houseNumber); m_houseNumber.clear(); + m_isHouseNumberInMainText = true; } else if (mainTextType == drule::text_type_name) { - if (!m_houseNumber.empty()) + if (!m_houseNumber.empty() && + (m_mainText.empty() || m_houseNumber.find(m_mainText) != string::npos)) { - if (m_mainText.empty() || m_houseNumber.find(m_mainText) != string::npos) - m_houseNumber.swap(m_mainText); + m_houseNumber.swap(m_mainText); + m_isHouseNumberInMainText = true; } } } diff --git a/drape_frontend/stylist.hpp b/drape_frontend/stylist.hpp index 8622db6fca..2e89218e9f 100644 --- a/drape_frontend/stylist.hpp +++ b/drape_frontend/stylist.hpp @@ -49,6 +49,7 @@ struct CaptionDescription string const & GetAuxText() const; string const & GetRoadNumber() const; bool IsNameExists() const; + bool IsHouseNumberInMainText() const { return m_isHouseNumberInMainText; } private: /// Clear aux name on high zoom and clear long main name on low zoom. @@ -60,6 +61,7 @@ private: string m_auxText; string m_roadNumber; string m_houseNumber; + bool m_isHouseNumberInMainText = false; }; class Stylist diff --git a/drape_frontend/text_shape.cpp b/drape_frontend/text_shape.cpp index 906c617189..c9385b3263 100644 --- a/drape_frontend/text_shape.cpp +++ b/drape_frontend/text_shape.cpp @@ -428,8 +428,8 @@ uint64_t TextShape::GetOverlayPriority() const if (m_params.m_specialDisplacement == SpecialDisplacement::UserMark) return dp::CalculateUserMarkPriority(m_params.m_minVisibleScale, m_params.m_specialPriority); - // Set up minimal priority for shapes which belong to areas - if (m_params.m_hasArea) + // Set up minimal priority for house numbers. + if (m_params.m_specialDisplacement == SpecialDisplacement::HouseNumber) return 0; // Overlay priority for text shapes considers length of the primary text diff --git a/indexer/ftypes_sponsored.cpp b/indexer/ftypes_sponsored.cpp index a0018e8bc0..2a3fdedcd9 100644 --- a/indexer/ftypes_sponsored.cpp +++ b/indexer/ftypes_sponsored.cpp @@ -36,6 +36,11 @@ int SponsoredPartnerChecker::GetPartnerIndex(FeatureType const & ft) const } return -1; } + +Fc2018Checker::Fc2018Checker() +{ + m_types.push_back(classif().GetTypeByPath({"event", "fc2018"})); +} } // namespace ftypes std::string GetPartnerNameByIndex(int partnerIndex) diff --git a/indexer/ftypes_sponsored.hpp b/indexer/ftypes_sponsored.hpp index 414009c8fe..554df640c3 100644 --- a/indexer/ftypes_sponsored.hpp +++ b/indexer/ftypes_sponsored.hpp @@ -35,6 +35,13 @@ public: DECLARE_CHECKER_INSTANCE(SponsoredPartnerChecker); }; + +class Fc2018Checker : public BaseChecker +{ + Fc2018Checker(); +public: + DECLARE_CHECKER_INSTANCE(Fc2018Checker); +}; } // namespace ftypes extern std::string GetPartnerNameByIndex(int partnerIndex); diff --git a/map/framework.cpp b/map/framework.cpp index e3655e7efb..3f99f7c7bd 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -1585,6 +1585,13 @@ void Framework::FillSearchResultsMarks(bool clear, search::Results::ConstIter be mark->SetFoundFeature(r.GetFeatureID()); mark->SetMatchedName(r.GetString()); + // TODO: Remove after FC2018 finishing. + if (r.m_metadata.m_isFootballCupObject) + { + mark->SetMarkType(SearchMarkType::Fc2018); + continue; + } + if (isFeature && m_localAdsManager.Contains(r.GetFeatureID())) { mark->SetMarkType(SearchMarkType::LocalAds); diff --git a/map/search_mark.cpp b/map/search_mark.cpp index 0169f50666..9b7f8d31bb 100644 --- a/map/search_mark.cpp +++ b/map/search_mark.cpp @@ -16,6 +16,7 @@ std::vector const kSymbols = "search-result", // Default. "searchbooking-default-l", // Booking. "search-adv", // LocalAds. + "search-football", // FC 2018. "non-found-search-result", // NotFound. }; @@ -25,6 +26,7 @@ std::vector const kPreparingSymbols = "search-result", // Default. "searchbooking-inactive", // Booking. "search-adv", // LocalAds. + "search-football", // FC 2018. "non-found-search-result", // NotFound. }; diff --git a/map/search_mark.hpp b/map/search_mark.hpp index 5ff4c157b8..e3b9b04f7d 100644 --- a/map/search_mark.hpp +++ b/map/search_mark.hpp @@ -20,6 +20,7 @@ enum class SearchMarkType Default = 0, Booking, LocalAds, + Fc2018, NotFound, // Service value used in developer tools. Count }; diff --git a/search/intermediate_result.cpp b/search/intermediate_result.cpp index 2a8dcbca6e..b0e62b6d3b 100644 --- a/search/intermediate_result.cpp +++ b/search/intermediate_result.cpp @@ -198,6 +198,9 @@ void ProcessMetadata(FeatureType const & ft, Result::Metadata & meta) meta.m_isSponsoredHotel = isSponsoredHotel; meta.m_isHotel = ftypes::IsHotelChecker::Instance()(ft); + // TODO: Remove after FC2018 finishing. + meta.m_isFootballCupObject = ftypes::Fc2018Checker::Instance()(ft); + if (isSponsoredHotel) { auto const r = src.Get(feature::Metadata::FMD_RATING); diff --git a/search/result.hpp b/search/result.hpp index 877eba15c8..6a259bc2d9 100644 --- a/search/result.hpp +++ b/search/result.hpp @@ -51,6 +51,9 @@ public: bool m_isSponsoredHotel = false; bool m_isHotel = false; + // TODO: Remove after FC2018 finishing. + bool m_isFootballCupObject = false; + // Valid for any result. osm::YesNoUnknown m_isOpenNow = osm::Unknown;