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

[search] ReverseGeocoder style fixes.

Browse source
This commit is contained in:
tatiana-yan 2018-12-26 18:03:02 +03:00 • committed by mpimenov
parent 903ecc5689
commit 9c62284c6a
2 changed files with 31 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
search/reverse_geocoder.cpp
View file

@ -13,8 +13,10 @@
#include "base/stl_helpers.hpp"
#include "std/function.hpp"
#include "std/limits.hpp"
#include <functional>
#include <limits>
using namespace std;
namespace search
{

49
search/reverse_geocoder.hpp
View file

@ -6,10 +6,12 @@
#include "base/string_utils.hpp"
#include "std/string.hpp"
#include "std/utility.hpp"
#include "std/vector.hpp"
#include <cstddef>
#include <cstdint>
#include <memory>
#include <string>
#include <utility>
#include <vector>
class FeatureType;
class DataSource;
@ -26,10 +28,10 @@ class ReverseGeocoder
{
FeatureID m_id;
double m_distanceMeters;
string m_name;
std::string m_name;
Object() : m_distanceMeters(-1.0) {}
Object(FeatureID const & id, double dist, string const & name)
Object(FeatureID const & id, double dist, std::string const & name)
: m_id(id), m_distanceMeters(dist), m_name(name)
{
}
@ -37,7 +39,7 @@ class ReverseGeocoder
inline bool IsValid() const { return m_id.IsValid(); }
};
friend string DebugPrint(Object const & obj);
friend std::string DebugPrint(Object const & obj);
public:
/// All "Nearby" functions work in this lookup radius.
@ -55,43 +57,44 @@ public:
// There are no houses in (0, 0) coordinates.
Building() : m_center(0, 0) {}
Building(FeatureID const & id, double dist, string const & number, m2::PointD const & center)
Building(FeatureID const & id, double dist, std::string const & number,
m2::PointD const & center)
: Object(id, dist, number), m_center(center)
{
}
};
static size_t GetMatchedStreetIndex(strings::UniString const & keyName,
vector<Street> const & streets);
std::vector<Street> const & streets);
struct Address
{
Building m_building;
Street m_street;
string const & GetHouseNumber() const { return m_building.m_name; }
string const & GetStreetName() const { return m_street.m_name; }
std::string const & GetHouseNumber() const { return m_building.m_name; }
std::string const & GetStreetName() const { return m_street.m_name; }
double GetDistance() const { return m_building.m_distanceMeters; }
bool IsValid() const { return m_building.IsValid() && m_street.IsValid(); }
};
friend string DebugPrint(Address const & addr);
friend std::string DebugPrint(Address const & addr);
/// @return Sorted by distance streets vector for the specified MwmId.
static void GetNearbyStreets(search::MwmContext & context, m2::PointD const & center,
vector<Street> & streets);
std::vector<Street> & streets);
void GetNearbyStreets(MwmSet::MwmId const & id, m2::PointD const & center,
vector<Street> & streets) const;
void GetNearbyStreets(FeatureType & ft, vector<Street> & streets) const;
std::vector<Street> & streets) const;
void GetNearbyStreets(FeatureType & ft, std::vector<Street> & streets) const;
void GetNearbyOriginalStreets(MwmSet::MwmId const & id, m2::PointD const & center,
vector<Street> & streets) const;
std::vector<Street> & streets) const;
/// @returns [a lot of] nearby feature's streets and an index of a feature's street.
/// Returns a value greater than vector size when there are no Street the feature belongs to.
/// @note returned vector can contain duplicated street segments.
pair<vector<Street>, uint32_t> GetNearbyFeatureStreets(FeatureType & ft) const;
std::pair<std::vector<Street>, uint32_t> GetNearbyFeatureStreets(FeatureType & ft) const;
/// Same as GetNearbyFeatureStreets but returns streets from MWM only.
pair<vector<Street>, uint32_t> GetNearbyOriginalFeatureStreets(FeatureType & ft) const;
std::pair<std::vector<Street>, uint32_t> GetNearbyOriginalFeatureStreets(FeatureType & ft) const;
/// @return The nearest exact address where building has house number and valid street match.
void GetNearbyAddress(m2::PointD const & center, Address & addr) const;
@ -107,19 +110,21 @@ private:
/// Helper class to incapsulate house 2 street table reloading.
class HouseTable
{
DataSource const & m_dataSource;
unique_ptr<search::HouseToStreetTable> m_table;
MwmSet::MwmHandle m_handle;
public:
explicit HouseTable(DataSource const & dataSource) : m_dataSource(dataSource) {}
bool Get(FeatureID const & fid, uint32_t & streetIndex);
private:
DataSource const & m_dataSource;
std::unique_ptr<search::HouseToStreetTable> m_table;
MwmSet::MwmHandle m_handle;
};
bool GetNearbyAddress(HouseTable & table, Building const & bld, Address & addr) const;
/// @return Sorted by distance houses vector with valid house number.
void GetNearbyBuildings(m2::PointD const & center, double maxDistanceM,
vector<Building> & buildings) const;
std::vector<Building> & buildings) const;
static Building FromFeature(FeatureType & ft, double distMeters);
};