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

[bookmarks] Always return name in GetVisiblePOI for success (countries, cities, …).

Browse source
This commit is contained in:
vng 2013-02-13 00:32:07 +03:00 • committed by Alex Zolotarev
parent 4da118bd5e
commit b49a6c1588
5 changed files with 55 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

88
android/jni/com/mapswithme/maps/Framework.cpp
View file

@ -22,9 +22,6 @@
#include "../../../../../base/math.hpp"
#include "../../../../../base/logging.hpp"
#include "../../../../../std/shared_ptr.hpp"
#include "../../../../../std/bind.hpp"
#define LONG_CLICK_LENGTH_SEC 1.0
#define SHORT_CLICK_LENGTH_SEC 0.5
@ -567,28 +564,25 @@ namespace android
void Framework::CallLongClickListener(double x, double y)
{
if (!HandleOnSmthClick(x, y))
{
AdditionalHandlingForLongClick(x, y);
}
}
bool Framework::HandleOnSmthClick(double x, double y)
{
BookmarkAndCategory bac = m_work.GetBookmark(m2::PointD(x, y));
if (ValidateBookmarkAndCategory(bac))
{
Bookmark b = *(m_work.GetBmCategory(bac.first)->GetBookmark(bac.second));
ActivatePopup(b.GetOrg(), b.GetName(), "right-arrow.png");
Bookmark const * pBM = m_work.GetBmCategory(bac.first)->GetBookmark(bac.second);
ActivatePopup(pBM->GetOrg(), pBM->GetName(), "right-arrow.png");
return true;
}
else
{
::Framework::AddressInfo adInfo;
::Framework::AddressInfo addrInfo;
m2::PointD pxPivot;
if (m_work.GetVisiblePOI(m2::PointD(x, y), pxPivot, adInfo))
if (m_work.GetVisiblePOI(m2::PointD(x, y), pxPivot, addrInfo))
{
ActivatePopupWithAddressInfo(m_work.PtoG(pxPivot), adInfo);
ActivatePopupWithAddressInfo(m_work.PtoG(pxPivot), addrInfo);
return true;
}
else
@ -599,9 +593,9 @@ namespace android
bool Framework::AdditionalHandlingForLongClick(double x, double y)
{
m2::PointD point(x, y);
::Framework::AddressInfo adInfo;
m_work.GetAddressInfo(point, adInfo);
ActivatePopupWithAddressInfo(m_work.PtoG(point), adInfo);
::Framework::AddressInfo addrInfo;
m_work.GetAddressInfo(point, addrInfo);
ActivatePopupWithAddressInfo(m_work.PtoG(point), addrInfo);
}
/*
@ -622,40 +616,19 @@ namespace android
}
*/
void Framework::ActivatePopupWithAddressInfo(m2::PointD const & bmkPosition, ::Framework::AddressInfo const & adInfo)
void Framework::ActivatePopupWithAddressInfo(m2::PointD const & pos, ::Framework::AddressInfo const & addrInfo)
{
string name = adInfo.m_name;
string type = "";
if (adInfo.GetBestType() != 0)
type = adInfo.GetBestType();
string bmkname;
if (name.empty() && type.empty())
{
bmkname = m_work.GetStringsBundle().GetString("dropped_pin");
}
else
if (!name.empty())
{
bmkname = name;
}
else
if (!type.empty())
{
bmkname = type;
}
else
{
std::stringstream cstream;
cstream << name << " (" << type << ")";
bmkname = cstream.str();
}
string name = addrInfo.FormatPinText();
if (name.empty())
name = m_work.GetStringsBundle().GetString("dropped_pin");
ActivatePopup(bmkPosition, bmkname, "plus.png");
m_work.DrawPlacemark(bmkPosition);
ActivatePopup(pos, name);
m_work.DrawPlacemark(pos);
m_work.Invalidate();
}
void Framework::ActivatePopup(m2::PointD const & bmkPosition, string const & name, string const & imageName)
void Framework::ActivatePopup(m2::PointD const & pos, string const & name, string const & imageName)
{
BookmarkBalloon * b = GetBookmarkBalloon();
@ -669,7 +642,7 @@ namespace android
void Framework::DeactivatePopup()
{
BookmarkBalloon * b = GetBookmarkBalloon();
BookmarkBalloon * b = GetBookmarkBalloon();
b->setIsVisible(false);
m_work.DisablePlacemark();
m_work.Invalidate();
@ -680,34 +653,15 @@ namespace android
BookmarkBalloon * balloon = GetBookmarkBalloon();
BookmarkAndCategory bac = m_work.GetBookmark(m_work.GtoP(balloon->getBookmarkPivot()));
if (ValidateBookmarkAndCategory(bac))
if (!ValidateBookmarkAndCategory(bac))
{
// add new bookmark
Bookmark bm(balloon->glbPivot(), balloon->bookmarkName(), m_bmType);
bac = AddBookmark(bm);
}
else
{
BookmarkCategory * cat;
if (m_work.GetBmCategoriesCount() == 0)
{
m_work.AddBookmark(m_work.GetStringsBundle().GetString("my_places"), Bookmark(balloon->getBookmarkPivot(), balloon->getBookmarkName(), "placemark-red"));
cat = m_work.GetBmCategory(m_work.GetBmCategoriesCount()-1);
}
else
{
cat = m_work.GetBmCategory(m_work.GetBmCategoriesCount()-1);
LOG(LDEBUG,("Paladin", (balloon->getBookmarkPivot(), balloon->getBookmarkName(), "placemark-red")));
m_work.AddBookmark(cat->GetName(), Bookmark(balloon->getBookmarkPivot(), balloon->getBookmarkName(), "placemark-red"));
}
cat->SaveToKMLFile();
int catSize = cat->GetBookmarksCount() - 1;
if (catSize > 0)
{
bac = BookmarkAndCategory(m_work.GetBmCategoriesCount()-1, catSize);
m_balloonClickListener(bac);
}
}
// start edit an existing bookmark
m_balloonClickListener(bac);
}
void Framework::AddBalloonClickListener(TOnBalloonClickListener const & l)

4
android/jni/com/mapswithme/maps/Framework.hpp
View file

@ -65,8 +65,8 @@ namespace android
bool HandleOnSmthClick(double x, double y);
bool AdditionalHandlingForLongClick(double x, double y);
void ActivatePopup(m2::PointD const & bmkPosition, string const & name, string const & imageName);
void ActivatePopupWithAddressInfo(m2::PointD const & bmkPosition, ::Framework::AddressInfo const & adInfo);
void ActivatePopup(m2::PointD const & pos, string const & name, string const & imageName);
void ActivatePopupWithAddressInfo(m2::PointD const & pos, ::Framework::AddressInfo const & addrInfo);
void ToCamelCase(string & c);

33
map/address_finder.cpp
View file

@ -319,9 +319,15 @@ namespace
virtual double NeedProcess(feature::TypesHolder const & types) const
{
using namespace feature;
// we need features with texts for address lookup
pair<int, int> const r = GetDrawableScaleRangeForRules(types, RULE_TEXT | RULE_SYMBOL);
return my::between_s(r.first, r.second, m_scale);
if (m_scale > -1)
{
// we need features with texts for address lookup
pair<int, int> const r = GetDrawableScaleRangeForRules(types, RULE_TEXT | RULE_SYMBOL);
return my::between_s(r.first, r.second, m_scale);
}
else
return true;
}
static void GetReadableTypes(search::Engine const * eng, int8_t lang,
@ -487,7 +493,9 @@ void Framework::GetAddressInfo(m2::PointD const & pxPoint, AddressInfo & info) c
return;
}
// use upper scale to get address by point (buildings, streets and POIs are visible).
int const scale = scales::GetUpperScale();
double addressR[] = {
15.0, // radius to search point POI's
100.0, // radius to search street names
@ -520,7 +528,8 @@ void Framework::GetAddressInfo(FeatureType const & ft, m2::PointD const & pt, Ad
double const inf = numeric_limits<double>::max();
double addressR[] = { inf, inf, inf };
DoGetAddressInfo getAddress(pt, scales::GetUpperScale(), GetChecker(), addressR);
// FeatureType::WORST_GEOMETRY - no need to check on visibility
DoGetAddressInfo getAddress(pt, FeatureType::WORST_GEOMETRY, GetChecker(), addressR);
getAddress(ft);
getAddress.FillAddress(GetSearchEngine(), info);
@ -556,6 +565,8 @@ void Framework::AddressInfo::MakeFrom(search::Result const & res)
string const type = res.GetFeatureType();
if (!type.empty())
m_types.push_back(type);
else
ASSERT ( false, ("Search result with empty type") );
// assign name if it's not equal with type
string name = res.GetString();
@ -563,6 +574,20 @@ void Framework::AddressInfo::MakeFrom(search::Result const & res)
m_name.swap(name);
}
string Framework::AddressInfo::FormatPinText() const
{
char const * type = GetBestType();
if (type)
{
if (m_name.empty())
return type;
else
return m_name + " (" + string(type) + ')';
}
else
return m_name;
}
string Framework::AddressInfo::FormatAddress() const
{
string result = m_house;

1
map/framework.hpp
View file

@ -340,6 +340,7 @@ public:
void MakeFrom(search::Result const & res);
string FormatPinText() const;
string FormatAddress() const;
string FormatTypes() const;
char const * GetBestType() const;

3
map/map_tests/bookmarks_test.cpp
View file

@ -313,7 +313,8 @@ UNIT_TEST(Bookmarks_AddressInfo)
TEST_EQUAL(info.m_types.size(), 1, ());
// assume that developers have English or Russian system language :)
TEST(info.m_types[0] == "cafe" || info.m_types[0] == "кафе", (info.m_types[0]));
char const * type = info.GetBestType();
TEST(type && (strcmp(type, "cafe") == 0 || strcmp(type, "кафе")), (type));
}
UNIT_TEST(Bookmarks_IllegalFileName)