AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[drape] [Booking] Do not show big symbol for OSM hotels at low zoom levels MAPSME-14691

Browse source
This commit is contained in:
Anatoliy Tomilov 2020-09-03 21:09:59 +05:00 • committed by Maksim Andrianov
parent 7c413c1d68
commit ed8479e50e
2 changed files with 13 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
map/search_mark.cpp
View file

@ -273,7 +273,15 @@ drape_ptr<df::UserPointMark::SymbolNameZoomInfo> SearchMarkPoint::GetSymbolNames
return symbolZoomInfo;
}
symbolZoomInfo->emplace(kWorldZoomLevel, symbolName);
if (IsHotel() && !HasRating())
{
symbolZoomInfo->emplace(kWorldZoomLevel, kColoredmarkSmall);
symbolZoomInfo->emplace(kBadRatingZoomLevel, symbolName);
}
else
{
symbolZoomInfo->emplace(kWorldZoomLevel, symbolName);
}
return symbolZoomInfo;
}
@ -348,20 +356,6 @@ drape_ptr<df::UserPointMark::BageInfo> SearchMarkPoint::GetBadgeInfo() const
return nullptr;
}
drape_ptr<df::UserPointMark::SymbolOffsets> SearchMarkPoint::GetSymbolOffsets() const
{
m2::PointF offset;
if (IsUGCMark())
{
// UGC mark is not vertically centered into enclosing texture region
float constexpr kShadowOffset = -2.0f;
offset.y = kShadowOffset;
}
return make_unique_dp<SymbolOffsets>(static_cast<size_t>(scales::UPPER_STYLE_SCALE), offset);
}
bool SearchMarkPoint::IsMarkAboveText() const
{
return !IsBookingSpecialMark();
@ -391,7 +385,7 @@ df::ColorConstant SearchMarkPoint::GetColorConstant() const
return "RatingGood";
}
return "RatingUGC";
return "SearchmarkDefault";
}
drape_ptr<df::UserPointMark::TitlesInfo> SearchMarkPoint::GetTitleDecl() const
@ -586,10 +580,10 @@ bool SearchMarkPoint::IsAvailable() const { return m_isAvailable; }
std::string const & SearchMarkPoint::GetReason() const { return m_reason; }
bool SearchMarkPoint::IsUGCMark() const { return m_type != SearchMarkType::Booking; }
bool SearchMarkPoint::IsBookingSpecialMark() const { return m_type == SearchMarkType::Booking; }
bool SearchMarkPoint::IsHotel() const { return m_type == SearchMarkType::Hotel; }
bool SearchMarkPoint::HasRating() const { return m_rating > kInvalidRatingValue; }
bool SearchMarkPoint::HasGoodRating() const { return m_rating >= kRatingThreshold; }

3
map/search_mark.hpp
View file

@ -36,7 +36,6 @@ public:
int GetMinTitleZoom() const override;
df::DepthLayer GetDepthLayer() const override;
drape_ptr<BageInfo> GetBadgeInfo() const override;
drape_ptr<SymbolOffsets> GetSymbolOffsets() const override;
bool GetDepthTestEnabled() const override { return false; }
bool IsMarkAboveText() const override;
float GetSymbolOpacity() const override;
@ -77,8 +76,8 @@ protected:
dst = std::forward<U>(src);
}
bool IsUGCMark() const;
bool IsBookingSpecialMark() const;
bool IsHotel() const;
bool HasRating() const;
bool HasGoodRating() const;