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

Removed/commented out old debug method for desktop.

Browse source
This commit is contained in:
Alex Zolotarev 2016-01-15 09:39:45 +03:00 • committed by Sergey Yershov
parent 9295b5c2b1
commit 6899bdc02e
3 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
map/address_finder.cpp
View file

@ -12,7 +12,7 @@
#include "platform/preferred_languages.hpp"
/*
namespace
{
class FeatureInfoT
@ -180,7 +180,6 @@ void Framework::GetFeatureTypes(m2::PointD const & pxPoint, vector<string> & typ
getTypes.GetFeatureTypes(5, types);
}
/*
namespace
{
class DoGetAddressBase : public DoGetFeatureInfoBase

5
map/framework.hpp
View file

@ -466,11 +466,6 @@ public:
/// Set correct viewport, parse API, show balloon.
bool ShowMapForURL(string const & url);
/// Get classificator types for nearest features.
/// @param[in] pxPoint Current touch point in device pixel coordinates.
void GetFeatureTypes(m2::PointD const & pxPoint, vector<string> & types) const;
//@}
private:
// TODO(vng): Uncomment when needed.
//void GetLocality(m2::PointD const & pt, search::AddressInfo & info) const;

14
qt/draw_widget.cpp
View file

@ -496,20 +496,18 @@ void DrawWidget::ShowInfoPopup(QMouseEvent * e, m2::PointD const & pt)
};
search::AddressInfo const info = m_framework->GetMercatorAddressInfo(m_framework->PtoG(pt));
// Get feature types under cursor.
vector<string> types;
m_framework->GetFeatureTypes(pt, types);
for (size_t i = 0; i < types.size(); ++i)
addStringFn(types[i]);
for (auto const & type : info.m_types)
addStringFn(type);
menu.addSeparator();
// Format address and types.
if (!info.m_name.empty())
{
addStringFn(info.m_name);
menu.addSeparator();
}
addStringFn(info.FormatAddress());
addStringFn(info.FormatTypes());
menu.exec(e->pos());
}