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

Fix Bookmarks_Getting test.

Browse source
This commit is contained in:
vng 2012-05-22 19:43:30 +03:00 • committed by Alex Zolotarev
parent f1c75e7de0
commit cc5e4ad665
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
map/framework.cpp
View file

@ -233,9 +233,14 @@ bool Framework::DeleteBmCategory(size_t index)
Bookmark const * Framework::GetBookmark(m2::PointD pt) const
{
if (m_renderPolicy == 0)
return 0;
return 0;
return GetBookmark(pt, m_renderPolicy->VisualScale());
}
Bookmark const * Framework::GetBookmark(m2::PointD pt, double visualScale) const
{
// Get the global rect of touching area.
int const sm = 20 * m_renderPolicy->VisualScale();
int const sm = 20 * visualScale;
m2::RectD rect(PtoG(m2::PointD(pt.x - sm, pt.y - sm)), PtoG(m2::PointD(pt.x + sm, pt.y + sm)));
Bookmark const * ret = 0;

1
map/framework.hpp
View file

@ -144,6 +144,7 @@ public:
/// @param[in] pixPt Coordinates of touch point in pixels.
/// @return NULL If not biikmark near the point.
Bookmark const * GetBookmark(m2::PointD pixPt) const;
Bookmark const * GetBookmark(m2::PointD pixPt, double visualScale) const;
void ClearBookmarks();

2
map/map_tests/bookmarks_test.cpp
View file

@ -114,7 +114,7 @@ UNIT_TEST(Bookmarks_Getting)
fm.AddBookmark("cat2", Bookmark(m2::PointD(41, 20), "2"));
fm.AddBookmark("cat3", Bookmark(m2::PointD(41, 40), "3"));
Bookmark const * bm = fm.GetBookmark(pixC);
Bookmark const * bm = fm.GetBookmark(pixC, 1.0);
TEST(bm != 0, ());
TEST_EQUAL(bm->GetName(), "2", ());